Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
bc624583
Commit
bc624583
authored
Jan 18, 2004
by
Marcus Meissner
Committed by
Alexandre Julliard
Jan 18, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not cache results of checks with side effects.
parent
92f5c9b2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
107 deletions
+50
-107
configure
configure
+31
-67
configure.ac
configure.ac
+19
-40
No files found.
configure
View file @
bc624583
...
@@ -10007,17 +10007,12 @@ done
...
@@ -10007,17 +10007,12 @@ done
if
test
"
$ac_cv_header_unicode_ubidi_h
"
=
"yes"
if
test
"
$ac_cv_header_unicode_ubidi_h
"
=
"yes"
then
then
echo
"
$as_me
:
$LINENO
: checking whether we can statically link the ICU libraries"
>
&5
saved_libs
=
"
$LIBS
"
echo
$ECHO_N
"checking whether we can statically link the ICU libraries...
$ECHO_C
"
>
&6
ICU_LIB_DIR
=
"
${
ICU_LIB_DIR
-/usr/lib
}
"
if
test
"
${
ac_cv_lib_icu
+set
}
"
=
set
;
then
ICUUC_LIB
=
"
${
ICUUC_LIB
-
$ICU_LIB_DIR
/libicuuc.a
}
"
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
ICUDATA_LIB
=
"
${
ICUDATA_LIB
-
$ICU_LIB_DIR
/libicudata.a
}
"
else
LIBS
=
"
$LIBS
$ICUUC_LIB
$ICUDATA_LIB
-lstdc++ -lgcc_s"
saved_libs
=
"
$LIBS
"
cat
>
conftest.
$ac_ext
<<
_ACEOF
ICU_LIB_DIR
=
"
${
ICU_LIB_DIR
-/usr/lib
}
"
ICUUC_LIB
=
"
${
ICUUC_LIB
-
$ICU_LIB_DIR
/libicuuc.a
}
"
ICUDATA_LIB
=
"
${
ICUDATA_LIB
-
$ICU_LIB_DIR
/libicudata.a
}
"
LIBS
=
"
$LIBS
$ICUUC_LIB
$ICUDATA_LIB
-lstdc++ -lgcc_s"
cat
>
conftest.
$ac_ext
<<
_ACEOF
/* confdefs.h. */
/* confdefs.h. */
_ACEOF
_ACEOF
cat
confdefs.h
>>
conftest.
$ac_ext
cat
confdefs.h
>>
conftest.
$ac_ext
...
@@ -10053,29 +10048,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
...
@@ -10053,29 +10048,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status
=
$?
ac_status
=
$?
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
;
}
;
then
(
exit
$ac_status
)
;
}
;
}
;
then
ac_cv_lib_icu
=
"yes"
cat
>>
confdefs.h
<<
\
_ACEOF
#define HAVE_ICU 1
_ACEOF
ICULIBS
=
"
$ICUUC_LIB
$ICUDATA_LIB
-lstdc++ -lgcc_s"
else
else
echo
"
$as_me
: failed program was:"
>
&5
echo
"
$as_me
: failed program was:"
>
&5
sed
's/^/| /'
conftest.
$ac_ext
>
&5
sed
's/^/| /'
conftest.
$ac_ext
>
&5
ac_cv_lib_icu
=
"no"
fi
fi
rm
-f
conftest.err conftest.
$ac_objext
\
rm
-f
conftest.err conftest.
$ac_objext
\
conftest
$ac_exeext
conftest.
$ac_ext
conftest
$ac_exeext
conftest.
$ac_ext
LIBS
=
"
$saved_libs
"
LIBS
=
"
$saved_libs
"
fi
echo
"
$as_me
:
$LINENO
: result:
$ac_cv_lib_icu
"
>
&5
echo
"
${
ECHO_T
}
$ac_cv_lib_icu
"
>
&6
if
test
"
$ac_cv_lib_icu
"
=
"yes"
then
cat
>>
confdefs.h
<<
\
_ACEOF
#define HAVE_ICU 1
_ACEOF
ICULIBS
=
"
$ICUUC_LIB
$ICUDATA_LIB
-lstdc++ -lgcc_s"
fi
fi
fi
echo
"
$as_me
:
$LINENO
: checking for FT_Init_FreeType in -lfreetype"
>
&5
echo
"
$as_me
:
$LINENO
: checking for FT_Init_FreeType in -lfreetype"
>
&5
...
@@ -11210,35 +11197,23 @@ else
...
@@ -11210,35 +11197,23 @@ else
echo
"
${
ECHO_T
}
no"
>
&6
echo
"
${
ECHO_T
}
no"
>
&6
fi
fi
echo
"
$as_me
:
$LINENO
: checking for aRts Sound server"
>
&5
if
test
x
$ARTSCCONFIG
!=
x
-a
x
$ARTSCCONFIG
!=
x
'"$ARTSCCONFIG"'
;
echo
$ECHO_N
"checking for aRts Sound server...
$ECHO_C
"
>
&6
then
if
test
"
${
ac_cv_c_artsserver
+set
}
"
=
set
;
then
ARTSC_CFLAGS
=
`
$ARTSCCONFIG
--cflags
`
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
ARTSC_LIBS
=
`
$ARTSCCONFIG
--libs
`
else
save_CFLAGS
=
"
$CFLAGS
"
if
test
x
$ARTSCCONFIG
=
x
-o
x
$ARTSCCONFIG
=
x
'"$ARTSCCONFIG"'
;
CFLAGS
=
"
$CFLAGS
$ARTSC_CFLAGS
"
then
cat
>
conftest.
$ac_ext
<<
_ACEOF
ac_cv_c_artsserver
=
no
else
ARTSC_CFLAGS
=
`
$ARTSCCONFIG
--cflags
`
ARTSC_LIBS
=
`
$ARTSCCONFIG
--libs
`
ac_cv_c_artsserver
=
no
save_CFLAGS
=
"
$CFLAGS
"
CFLAGS
=
"
$CFLAGS
$ARTSC_CFLAGS
"
cat
>
conftest.
$ac_ext
<<
_ACEOF
/* confdefs.h. */
/* confdefs.h. */
_ACEOF
_ACEOF
cat
confdefs.h
>>
conftest.
$ac_ext
cat
confdefs.h
>>
conftest.
$ac_ext
cat
>>
conftest.
$ac_ext
<<
_ACEOF
cat
>>
conftest.
$ac_ext
<<
_ACEOF
/* end confdefs.h. */
/* end confdefs.h. */
#include <artsc.h>
#include <artsc.h>
int
int
main ()
main ()
{
{
arts_stream_t stream;
arts_stream_t stream;
;
;
return 0;
return 0;
}
}
...
@@ -11264,8 +11239,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
...
@@ -11264,8 +11239,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
ac_status
=
$?
ac_status
=
$?
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
;
}
;
then
(
exit
$ac_status
)
;
}
;
}
;
then
ARTSLIBS
=
$ARTSC_LIBS
ac_cv_c_artsserver
=
yes
ARTSINCL
=
$ARTSC_CFLAGS
cat
>>
confdefs.h
<<
\
_ACEOF
#define HAVE_ARTS 1
_ACEOF
else
else
echo
"
$as_me
: failed program was:"
>
&5
echo
"
$as_me
: failed program was:"
>
&5
...
@@ -11273,24 +11254,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
...
@@ -11273,24 +11254,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
fi
rm
-f
conftest.err conftest.
$ac_objext
conftest.
$ac_ext
rm
-f
conftest.err conftest.
$ac_objext
conftest.
$ac_ext
CFLAGS
=
"
$save_CFLAGS
"
CFLAGS
=
"
$save_CFLAGS
"
fi
fi
echo
"
$as_me
:
$LINENO
: result:
$ac_cv_c_artsserver
"
>
&5
echo
"
${
ECHO_T
}
$ac_cv_c_artsserver
"
>
&6
if
test
"
$ac_cv_c_artsserver
"
=
"yes"
then
ARTSLIBS
=
$ARTSC_LIBS
ARTSINCL
=
$ARTSC_CFLAGS
cat
>>
confdefs.h
<<
\
_ACEOF
#define HAVE_ARTS 1
_ACEOF
fi
fi
ALSALIBS
=
""
ALSALIBS
=
""
...
...
configure.ac
View file @
bc624583
...
@@ -416,20 +416,15 @@ dnl **** Check for the ICU library ****
...
@@ -416,20 +416,15 @@ dnl **** Check for the ICU library ****
AC_CHECK_HEADERS(unicode/ubidi.h)
AC_CHECK_HEADERS(unicode/ubidi.h)
if test "$ac_cv_header_unicode_ubidi_h" = "yes"
if test "$ac_cv_header_unicode_ubidi_h" = "yes"
then
then
AC_CACHE_CHECK([whether we can statically link the ICU libraries], ac_cv_lib_icu,
saved_libs="$LIBS"
[saved_libs="$LIBS"
ICU_LIB_DIR="${ICU_LIB_DIR-/usr/lib}"
ICU_LIB_DIR="${ICU_LIB_DIR-/usr/lib}"
ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libicuuc.a}"
ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libicuuc.a}"
ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libicudata.a}"
ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libicudata.a}"
LIBS="$LIBS $ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s"
LIBS="$LIBS $ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s"
AC_TRY_LINK([#include <unicode/ubidi.h>],[ubidi_open()],
AC_TRY_LINK([#include <unicode/ubidi.h>],[ubidi_open()],
[AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed])
[ac_cv_lib_icu="yes"],[ac_cv_lib_icu="no"])
AC_SUBST(ICULIBS,"$ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s")])
LIBS="$saved_libs"])
LIBS="$saved_libs"
if test "$ac_cv_lib_icu" = "yes"
then
AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed])
AC_SUBST(ICULIBS,"$ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s")
fi
fi
fi
dnl **** Check for FreeType 2 ****
dnl **** Check for FreeType 2 ****
...
@@ -605,33 +600,17 @@ fi
...
@@ -605,33 +600,17 @@ fi
dnl **** Check for aRts Sound Server ****
dnl **** Check for aRts Sound Server ****
AC_PATH_PROG(ARTSCCONFIG, artsc-config)
AC_PATH_PROG(ARTSCCONFIG, artsc-config)
AC_CACHE_CHECK([for aRts Sound server],
if test x$ARTSCCONFIG != x -a x$ARTSCCONFIG != x'"$ARTSCCONFIG"';
ac_cv_c_artsserver,
if test x$ARTSCCONFIG = x -o x$ARTSCCONFIG = x'"$ARTSCCONFIG"';
then
ac_cv_c_artsserver=no
else
ARTSC_CFLAGS=`$ARTSCCONFIG --cflags`
ARTSC_LIBS=`$ARTSCCONFIG --libs`
ac_cv_c_artsserver=no
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $ARTSC_CFLAGS"
AC_TRY_COMPILE([
#include <artsc.h>
],[
arts_stream_t stream;
],[
ac_cv_c_artsserver=yes
])
CFLAGS="$save_CFLAGS"
fi)
if test "$ac_cv_c_artsserver" = "yes"
then
then
AC_SUBST(ARTSLIBS, $ARTSC_LIBS)
ARTSC_CFLAGS=`$ARTSCCONFIG --cflags`
AC_SUBST(ARTSINCL, $ARTSC_CFLAGS)
ARTSC_LIBS=`$ARTSCCONFIG --libs`
save_CFLAGS="$CFLAGS"
AC_DEFINE(HAVE_ARTS, 1, [Define if you have ARTS sound server])
CFLAGS="$CFLAGS $ARTSC_CFLAGS"
AC_TRY_COMPILE([#include <artsc.h>],[arts_stream_t stream;],
[AC_SUBST(ARTSLIBS, $ARTSC_LIBS)
AC_SUBST(ARTSINCL, $ARTSC_CFLAGS)
AC_DEFINE(HAVE_ARTS, 1, [Define if you have ARTS sound server])])
CFLAGS="$save_CFLAGS"
fi
fi
dnl **** Check for ALSA ****
dnl **** Check for ALSA ****
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment