ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineesd: Make use of `esd-config --libs` for the configure check. 

Also follow the naming convention for the 'xxx-config' variables.
This commit is contained in:
Francois Gouget 2008-07-21 23:41:21 +02:00 committed by Alexandre Julliard
parent 4bc03fe857
commit e9b1a40669
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -759,8 +759,8 @@ FREETYPELIBS
FREETYPEINCL FREETYPEINCL
FONTSSUBDIRS FONTSSUBDIRS
ESDCONFIG ESDCONFIG
ESDLIBS
ESDINCL ESDINCL
ESDLIBS
ALSALIBS ALSALIBS
AUDIOIOLIBS AUDIOIOLIBS
FONTCONFIGINCL FONTCONFIGINCL
@ -14633,23 +14633,23 @@ fi
if test "x$with_esd" != xno -a "x$ESDCONFIG" != x -a "x$ESDCONFIG" != x'"$ESDCONFIG"'; if test "x$with_esd" != xno -a "x$ESDCONFIG" != x -a "x$ESDCONFIG" != x'"$ESDCONFIG"';
then then
ESD_CFLAGS="" ac_esd_incl=""
for i in `$ESDCONFIG --cflags` for i in `$ESDCONFIG --cflags`
do do
case "$i" in case "$i" in
-I*) ESD_CFLAGS="$ESD_CFLAGS $i";; -I*) ac_esd_incl="$ac_esd_incl $i";;
esac esac
done done
ESD_LIBS=`$ESDCONFIG --libs` ac_esd_libs=`$ESDCONFIG --libs`
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $ESD_CFLAGS" CFLAGS="$CFLAGS $ac_esd_incl"
{ echo "$as_me:$LINENO: checking for esd_open_sound in -lesd" >&5 { echo "$as_me:$LINENO: checking for esd_open_sound in -lesd" >&5
echo $ECHO_N "checking for esd_open_sound in -lesd... $ECHO_C" >&6; } echo $ECHO_N "checking for esd_open_sound in -lesd... $ECHO_C" >&6; }
if test "${ac_cv_lib_esd_esd_open_sound+set}" = set; then if test "${ac_cv_lib_esd_esd_open_sound+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lesd $LIBS" LIBS="-lesd $ac_esd_libs $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -14705,9 +14705,9 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_esd_esd_open_sound" >&5 { echo "$as_me:$LINENO: result: $ac_cv_lib_esd_esd_open_sound" >&5
echo "${ECHO_T}$ac_cv_lib_esd_esd_open_sound" >&6; } echo "${ECHO_T}$ac_cv_lib_esd_esd_open_sound" >&6; }
if test $ac_cv_lib_esd_esd_open_sound = yes; then if test $ac_cv_lib_esd_esd_open_sound = yes; then
ESDLIBS=$ESD_LIBS ESDINCL="$ac_esd_incl"
ESDINCL=$ESD_CFLAGS ESDLIBS="$ac_esd_libs"
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
@ -23841,8 +23841,8 @@ FREETYPELIBS!$FREETYPELIBS$ac_delim
FREETYPEINCL!$FREETYPEINCL$ac_delim FREETYPEINCL!$FREETYPEINCL$ac_delim
FONTSSUBDIRS!$FONTSSUBDIRS$ac_delim FONTSSUBDIRS!$FONTSSUBDIRS$ac_delim
ESDCONFIG!$ESDCONFIG$ac_delim ESDCONFIG!$ESDCONFIG$ac_delim
ESDLIBS!$ESDLIBS$ac_delim
ESDINCL!$ESDINCL$ac_delim ESDINCL!$ESDINCL$ac_delim
ESDLIBS!$ESDLIBS$ac_delim
ALSALIBS!$ALSALIBS$ac_delim ALSALIBS!$ALSALIBS$ac_delim
AUDIOIOLIBS!$AUDIOIOLIBS$ac_delim AUDIOIOLIBS!$AUDIOIOLIBS$ac_delim
FONTCONFIGINCL!$FONTCONFIGINCL$ac_delim FONTCONFIGINCL!$FONTCONFIGINCL$ac_delim

15
configure.ac
View File

@ -1070,20 +1070,21 @@ dnl **** Check for EsounD ****
AC_PATH_PROG(ESDCONFIG, esd-config) AC_PATH_PROG(ESDCONFIG, esd-config)
if test "x$with_esd" != xno -a "x$ESDCONFIG" != x -a "x$ESDCONFIG" != x'"$ESDCONFIG"'; if test "x$with_esd" != xno -a "x$ESDCONFIG" != x -a "x$ESDCONFIG" != x'"$ESDCONFIG"';
then then
ESD_CFLAGS="" ac_esd_incl=""
for i in `$ESDCONFIG --cflags` for i in `$ESDCONFIG --cflags`
do do
case "$i" in case "$i" in
-I*) ESD_CFLAGS="$ESD_CFLAGS $i";; -I*) ac_esd_incl="$ac_esd_incl $i";;
esac esac
done done
ESD_LIBS=`$ESDCONFIG --libs` ac_esd_libs=`$ESDCONFIG --libs`
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $ESD_CFLAGS" CFLAGS="$CFLAGS $ac_esd_incl"
AC_CHECK_LIB(esd,esd_open_sound, AC_CHECK_LIB(esd,esd_open_sound,
[AC_SUBST(ESDLIBS, $ESD_LIBS) [AC_SUBST(ESDINCL, "$ac_esd_incl")
AC_SUBST(ESDINCL, $ESD_CFLAGS) AC_SUBST(ESDLIBS, "$ac_esd_libs")
AC_DEFINE(HAVE_ESD, 1, [Define if you have EsounD sound server])]) AC_DEFINE(HAVE_ESD, 1, [Define if you have EsounD sound server])],,
[$ac_esd_libs])
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
fi fi