Commit dd6ce2d6 authored by Stéphane Loeuillet's avatar Stéphane Loeuillet

update esound, gconf, alsa and ogg m4 files from upstream versions

Original commit message from CVS:
update esound, gconf, alsa and ogg m4 files from upstream versions
parent b9172c65
common @ ded6dc51
Subproject commit 5ec931d243c53ddda5b2cbb9a2c21ce89747bcb4 Subproject commit ded6dc5186cb7f8c64cb06a8591b9f787122c6f1
...@@ -46,6 +46,8 @@ AC_ARG_ENABLE(esdtest, ...@@ -46,6 +46,8 @@ AC_ARG_ENABLE(esdtest,
if test "$ESD_CONFIG" = "no" ; then if test "$ESD_CONFIG" = "no" ; then
no_esd=yes no_esd=yes
else else
AC_LANG_SAVE
AC_LANG_C
ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
...@@ -122,6 +124,7 @@ int main () ...@@ -122,6 +124,7 @@ int main ()
],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
AC_LANG_RESTORE
fi fi
fi fi
if test "x$no_esd" = x ; then if test "x$no_esd" = x ; then
...@@ -141,6 +144,8 @@ int main () ...@@ -141,6 +144,8 @@ int main ()
echo "*** Could not run ESD test program, checking why..." echo "*** Could not run ESD test program, checking why..."
CFLAGS="$CFLAGS $ESD_CFLAGS" CFLAGS="$CFLAGS $ESD_CFLAGS"
LIBS="$LIBS $ESD_LIBS" LIBS="$LIBS $ESD_LIBS"
AC_LANG_SAVE
AC_LANG_C
AC_TRY_LINK([ AC_TRY_LINK([
#include <stdio.h> #include <stdio.h>
#include <esd.h> #include <esd.h>
...@@ -160,6 +165,7 @@ int main () ...@@ -160,6 +165,7 @@ int main ()
echo "*** may want to edit the esd-config script: $ESD_CONFIG" ]) echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
AC_LANG_RESTORE
fi fi
fi fi
ESD_CFLAGS="" ESD_CFLAGS=""
......
...@@ -20,9 +20,7 @@ AC_DEFUN([AM_GCONF_SOURCE_2], ...@@ -20,9 +20,7 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas/' GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
else
GCONF_SCHEMA_FILE_DIR=$GCONF_SCHEMA_FILE_DIR
fi fi
AC_ARG_WITH(gconf-schema-file-dir, AC_ARG_WITH(gconf-schema-file-dir,
...@@ -30,4 +28,13 @@ AC_DEFUN([AM_GCONF_SOURCE_2], ...@@ -30,4 +28,13 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
AC_SUBST(GCONF_SCHEMA_FILE_DIR) AC_SUBST(GCONF_SCHEMA_FILE_DIR)
AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
AC_ARG_ENABLE(schemas-install,
[ --disable-schemas-install Disable the schemas installation],
[case "${enableval}" in
yes) schemas_install=true ;;
no) schemas_install=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-schemas-install) ;;
esac],[schemas_install=true])
AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test x$schemas_install = xtrue)
]) ])
...@@ -2,12 +2,12 @@ dnl Configure Paths for Alsa ...@@ -2,12 +2,12 @@ dnl Configure Paths for Alsa
dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org> dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org>
dnl Christopher Lansdown <lansdoct@cs.alfred.edu> dnl Christopher Lansdown <lansdoct@cs.alfred.edu>
dnl Jaroslav Kysela <perex@suse.cz> dnl Jaroslav Kysela <perex@suse.cz>
dnl Last modification: 07/01/2001 dnl Last modification: alsa.m4,v 1.23 2004/01/16 18:14:22 tiwai Exp
dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate. dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
dnl enables arguments --with-alsa-prefix= dnl enables arguments --with-alsa-prefix=
dnl --with-alsa-enc-prefix= dnl --with-alsa-enc-prefix=
dnl --disable-alsatest (this has no effect, as yet) dnl --disable-alsatest
dnl dnl
dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified,
dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result.
...@@ -54,9 +54,10 @@ if test "$alsa_prefix" != "" ; then ...@@ -54,9 +54,10 @@ if test "$alsa_prefix" != "" ; then
fi fi
dnl add the alsa library dnl add the alsa library
ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl" ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
LIBS=`echo $LIBS | sed 's/-lm//'` LIBS=`echo $LIBS | sed 's/-lm//'`
LIBS=`echo $LIBS | sed 's/-ldl//'` LIBS=`echo $LIBS | sed 's/-ldl//'`
LIBS=`echo $LIBS | sed 's/-lpthread//'`
LIBS=`echo $LIBS | sed 's/ //'` LIBS=`echo $LIBS | sed 's/ //'`
LIBS="$ALSA_LIBS $LIBS" LIBS="$ALSA_LIBS $LIBS"
AC_MSG_RESULT($ALSA_LIBS) AC_MSG_RESULT($ALSA_LIBS)
...@@ -75,7 +76,7 @@ no_alsa="" ...@@ -75,7 +76,7 @@ no_alsa=""
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_C AC_LANG_C
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <sys/asoundlib.h> #include <alsa/asoundlib.h>
], [ ], [
void main(void) void main(void)
{ {
...@@ -120,10 +121,12 @@ exit(0); ...@@ -120,10 +121,12 @@ exit(0);
AC_LANG_RESTORE AC_LANG_RESTORE
dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
AC_CHECK_LIB([asound], [snd_seq_create_event],, if test "x$enable_alsatest" = "xyes"; then
AC_CHECK_LIB([asound], [snd_ctl_open],,
[ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)])
alsa_found=no] alsa_found=no]
) )
fi
if test "x$alsa_found" = "xyes" ; then if test "x$alsa_found" = "xyes" ; then
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
...@@ -144,3 +147,4 @@ dnl That should be it. Now just export out symbols: ...@@ -144,3 +147,4 @@ dnl That should be it. Now just export out symbols:
AC_SUBST(ALSA_CFLAGS) AC_SUBST(ALSA_CFLAGS)
AC_SUBST(ALSA_LIBS) AC_SUBST(ALSA_LIBS)
]) ])
...@@ -28,7 +28,7 @@ AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run ...@@ -28,7 +28,7 @@ AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run
OGG_CFLAGS="-I$ogg_includes" OGG_CFLAGS="-I$ogg_includes"
elif test "x$ogg_prefix" != "x" ; then elif test "x$ogg_prefix" != "x" ; then
OGG_CFLAGS="-I$ogg_prefix/include" OGG_CFLAGS="-I$ogg_prefix/include"
elif test "$prefix" != "xNONE"; then elif test "x$prefix" != "xNONE"; then
OGG_CFLAGS="-I$prefix/include" OGG_CFLAGS="-I$prefix/include"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment