Home | History | Annotate | Download | only in patches
      1 --- esound-0.2.37/configure.ac.orig	2007-02-26 16:59:11.000000000 -0500
      2 +++ esound-0.2.37/configure.ac	2007-04-05 00:30:53.388740000 -0400
      3 @@ -193,7 +193,9 @@
      4     CPPFLAGS="$CPPFLAGS -I/usr/include/mme"
      5     AC_CHECK_HEADERS(mme/mme_api.h)
      6     CPPFLAGS="$xCPPFLAGS"
      7 -   AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no)
      8 +   dnl Comment this out as the macro is not found and we don't enable sound.
      9 +   dnl AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no)
     10 +   HAVE_ARTS=no
     11  
     12     dnl Define the driver needed based on the first header file found
     13  
     14 @@ -349,6 +351,10 @@
     15  CFLAGS="$CFLAGS $AUDIOFILE_CFLAGS"
     16  LIBS="$LIBS $AUDIOFILE_LIBS"
     17  
     18 +PKG_CHECK_MODULES(REAL_AUDIOFILE, audiofile >= 0.1.5)
     19 +AC_SUBST(REAL_AUDIOFILE_CFLAGS)
     20 +AC_SUBST(REAL_AUDIOFILE_LIBS)
     21 +
     22  build_esdplay=true
     23  
     24  AM_CONDITIONAL(BUILD_ESDPLAY, $build_esdplay)
     25 @@ -424,7 +424,9 @@
     26     LIBS="$esound_save_LIBS"
     27  fi
     28  
     29 -AS_COMPILER_FLAG(-Wall, CFLAGS="$CFLAGS -Wall")
     30 +dnl This macro is not in gnome-compiler-flags.m4. This option is invalid on
     31 +dnl Solaris anyway.
     32 +dnl AS_COMPILER_FLAG(-Wall, CFLAGS="$CFLAGS -Wall")
     33  
     34  # set | sort; # just for double checking the script...
     35  
     36 --- esound-0.2.37/esd-config.in.orig	2007-01-01 18:56:06.000000000 -0500
     37 +++ esound-0.2.37/esd-config.in	2007-04-05 00:31:18.582779000 -0400
     38 @@ -1,7 +1,7 @@
     39  #!/bin/sh
     40  
     41 -audiofile_libs="@AUDIOFILE_LIBS@"
     42 -audiofile_cflags="@AUDIOFILE_CFLAGS@"
     43 +audiofile_libs="@REAL_AUDIOFILE_LIBS@"
     44 +audiofile_cflags="@REAL_AUDIOFILE_CFLAGS@"
     45  
     46  prefix=@prefix@
     47  exec_prefix=@exec_prefix@
     48 @@ -64,7 +64,7 @@
     49            fi
     50          fi
     51        done
     52 -      echo $libdirs -lesd $my_audiofile_libs @LIBS@
     53 +      echo $libdirs -lesd $my_audiofile_libs @SOUND_LIBS@
     54        ;;
     55      *)
     56        echo "${usage}" 1>&2
     57