[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[4783] trunk/libspectrum

[<sba...@us...>]

Revision: 4783
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4783&view=rev
Author:   sbaldovi
Date:     2012-12-02 22:54:24 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
Fix the macro expansion of PKG_CHECK_MODULES when using both --without-glib and --with-libaudiofile options (Sergio).

Modified Paths:
--------------
    trunk/libspectrum/configure.ac
    trunk/libspectrum/hacking/ChangeLog

Modified: trunk/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/configure.ac	2012-12-02 22:49:57 UTC (rev 4782)
+++ trunk/libspectrum/configure.ac	2012-12-02 22:54:24 UTC (rev 4783)
@@ -164,14 +164,14 @@
 if test "$withval" = no; then glib=no; else glib=yes; fi,
 glib=yes)
 AC_MSG_RESULT($glib)
-if test "$glib" = yes; then
+AS_IF([test "$glib" = yes], [
   PKG_CHECK_MODULES(
     GLIB,
     glib-2.0,
     AC_DEFINE([HAVE_LIB_GLIB], 1, [Defined if we've got glib]),
     glib="no"
   )
-fi
+])
 
 AM_CONDITIONAL(USE_MYGLIB, test "$glib" = no)
 
@@ -201,7 +201,7 @@
 if test "$withval" = no; then libaudiofile=no; else libaudiofile=yes; fi,
 libaudiofile=yes)
 AC_MSG_RESULT($libaudiofile)
-if test "$libaudiofile" = yes; then
+AS_IF([test "$libaudiofile" = yes], [
   PKG_CHECK_MODULES(
     AUDIOFILE,
     audiofile,
@@ -214,7 +214,7 @@
       AC_DEFINE([HAVE_LIB_AUDIOFILE], 1, [Defined if we've got audiofile])
     )
   fi
-fi
+])
 
 AC_CONFIG_FILES([
   Makefile

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2012-12-02 22:49:57 UTC (rev 4782)
+++ trunk/libspectrum/hacking/ChangeLog	2012-12-02 22:54:24 UTC (rev 4783)
@@ -907,3 +907,5 @@
          (Sergio).
 20121129 csw.c,rzx.c,szx.c: remove unused variables when not linking against
          external libraries (Sergio).
+20121202 configure.ac: fix the macro expansion of PKG_CHECK_MODULES when using
+         both --without-glib and --with-libaudiofile options (Sergio).

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