[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[4687] trunk

[<fr...@us...>]

Revision: 4687
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4687&view=rev
Author:   fredm
Date:     2012-03-27 11:54:34 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Add support for audiofile 0.3.x (patch #3508658) (Alberto Garcia).

Modified Paths:
--------------
    trunk/fuse-utils/configure.in
    trunk/fuse-utils/hacking/ChangeLog
    trunk/libspectrum/configure.in
    trunk/libspectrum/hacking/ChangeLog

Modified: trunk/fuse-utils/configure.in
===================================================================
--- trunk/fuse-utils/configure.in	2012-03-27 11:46:54 UTC (rev 4686)
+++ trunk/fuse-utils/configure.in	2012-03-27 11:54:34 UTC (rev 4687)
@@ -183,11 +183,17 @@
 audiofile=yes)
 AC_MSG_RESULT($audiofile)
 if test "$audiofile" = yes; then
-  AM_PATH_AUDIOFILE(
-    0.2.3,
-    AC_DEFINE([HAVE_LIB_AUDIOFILE], 1, [Defined if we've got audiofile]),
-    audiofile=no
+  PKG_CHECK_MODULES(
+    AUDIOFILE,
+    audiofile,
+    AC_DEFINE([HAVE_LIB_AUDIOFILE], 1, [Defined if we've got audiofile]), []
   )
+  if test -z "$AUDIOFILE_LIBS"; then
+    AM_PATH_AUDIOFILE(
+      0.2.3,
+      AC_DEFINE([HAVE_LIB_AUDIOFILE], 1, [Defined if we've got audiofile])
+    )
+  fi
 fi
 AM_CONDITIONAL(BUILD_AUDIOTOOLS, test "$audiofile" = yes)
 

Modified: trunk/fuse-utils/hacking/ChangeLog
===================================================================
--- trunk/fuse-utils/hacking/ChangeLog	2012-03-27 11:46:54 UTC (rev 4686)
+++ trunk/fuse-utils/hacking/ChangeLog	2012-03-27 11:54:34 UTC (rev 4687)
@@ -344,3 +344,5 @@
          man/fmfconv.1,movie_tables.h: add converter tool for fmf files
          (patch #3034770) (Gergely Szasz with contributions from Sergio Baldoví
          and Fred).
+20120327 configure.in: add support for audiofile 0.3.x (patch #3508658) (Alberto
+         Garcia).

Modified: trunk/libspectrum/configure.in
===================================================================
--- trunk/libspectrum/configure.in	2012-03-27 11:46:54 UTC (rev 4686)
+++ trunk/libspectrum/configure.in	2012-03-27 11:54:34 UTC (rev 4687)
@@ -174,10 +174,17 @@
 libaudiofile=yes)
 AC_MSG_RESULT($libaudiofile)
 if test "$libaudiofile" = yes; then
-  AM_PATH_AUDIOFILE(
-    0.2.3,
-    AC_DEFINE([HAVE_LIB_AUDIOFILE], 1, [Defined if we've got audiofile])
+  PKG_CHECK_MODULES(
+    AUDIOFILE,
+    audiofile,
+    AC_DEFINE([HAVE_LIB_AUDIOFILE], 1, [Defined if we've got audiofile]), []
   )
+  if test -z "$AUDIOFILE_LIBS"; then
+    AM_PATH_AUDIOFILE(
+      0.2.3,
+      AC_DEFINE([HAVE_LIB_AUDIOFILE], 1, [Defined if we've got audiofile])
+    )
+  fi
 fi
 
 AC_OUTPUT(

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2012-03-27 11:46:54 UTC (rev 4686)
+++ trunk/libspectrum/hacking/ChangeLog	2012-03-27 11:54:34 UTC (rev 4687)
@@ -877,3 +877,5 @@
          (part of patch #3413549) (Sergio Baldoví).
 20120327 configure.in,Makefile.am,acinclude.m4: simplify detection of GLib
          and drop support for version 1.x (patch #3508792) (Alberto Garcia)
+20120327 configure.in: add support for audiofile 0.3.x (patch #3508658) (Alberto
+         Garcia).

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.