1 11056 laca --- esound-0.2.37/configure.ac.orig 2007-02-26 16:59:11.000000000 -0500 2 11056 laca +++ esound-0.2.37/configure.ac 2007-04-05 00:30:53.388740000 -0400 3 7348 dc144907 @@ -193,7 +193,9 @@ 4 7348 dc144907 CPPFLAGS="$CPPFLAGS -I/usr/include/mme" 5 7348 dc144907 AC_CHECK_HEADERS(mme/mme_api.h) 6 7348 dc144907 CPPFLAGS="$xCPPFLAGS" 7 7348 dc144907 - AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no) 8 7348 dc144907 + dnl Comment this out as the macro is not found and we don't enable sound. 9 7348 dc144907 + dnl AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no) 10 7348 dc144907 + HAVE_ARTS=no 11 2835 bc99092 12 7348 dc144907 dnl Define the driver needed based on the first header file found 13 7348 dc144907 14 11056 laca @@ -349,6 +351,10 @@ 15 10692 dcarbery CFLAGS="$CFLAGS $AUDIOFILE_CFLAGS" 16 10692 dcarbery LIBS="$LIBS $AUDIOFILE_LIBS" 17 7348 dc144907 18 2835 bc99092 +PKG_CHECK_MODULES(REAL_AUDIOFILE, audiofile >= 0.1.5) 19 2835 bc99092 +AC_SUBST(REAL_AUDIOFILE_CFLAGS) 20 2835 bc99092 +AC_SUBST(REAL_AUDIOFILE_LIBS) 21 2835 bc99092 + 22 10692 dcarbery build_esdplay=true 23 2835 bc99092 24 10692 dcarbery AM_CONDITIONAL(BUILD_ESDPLAY, $build_esdplay) 25 11241 dcarbery @@ -424,7 +424,9 @@ 26 11241 dcarbery LIBS="$esound_save_LIBS" 27 7348 dc144907 fi 28 7348 dc144907 29 7348 dc144907 -AS_COMPILER_FLAG(-Wall, CFLAGS="$CFLAGS -Wall") 30 7348 dc144907 +dnl This macro is not in gnome-compiler-flags.m4. This option is invalid on 31 7348 dc144907 +dnl Solaris anyway. 32 7348 dc144907 +dnl AS_COMPILER_FLAG(-Wall, CFLAGS="$CFLAGS -Wall") 33 7348 dc144907 34 7348 dc144907 # set | sort; # just for double checking the script... 35 7348 dc144907 36