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

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

Revision: 3977
          http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=3977&view=rev
Author:   fredm
Date:     2009-01-28 12:52:31 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
Add --without-(bzip2 /zlib) for gentoo and similar distros (patch #2533274)
(Jos?\195?\169 Manuel Ferrer Ortiz).

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

Modified: trunk/libspectrum/configure.in
===================================================================
--- trunk/libspectrum/configure.in	2009-01-26 18:06:13 UTC (rev 3976)
+++ trunk/libspectrum/configure.in	2009-01-28 12:52:31 UTC (rev 3977)
@@ -65,11 +65,19 @@
   CPPFLAGS="$CPPFLAGS -I$prefix/include"; LDFLAGS="$LDFLAGS -L$prefix/lib"
 fi)
 
-dnl Check for zlib (the UNIX version is called z, Win32 zdll)
-AC_CHECK_HEADERS(
-  zlib.h,
-  AC_SEARCH_LIBS(compress2, z zdll)
-)
+dnl Check whether to use zlib (the UNIX version is called z, Win32 zdll)
+AC_MSG_CHECKING(whether to use zlib)
+AC_ARG_WITH(zlib,
+[  --without-zlib          don't use zlib],
+if test "$withval" = no; then zlib=no; else zlib=yes; fi,
+zlib=yes)
+AC_MSG_RESULT($zlib)
+if test "$zlib" = yes; then
+  AC_CHECK_HEADERS(
+    zlib.h,
+    AC_SEARCH_LIBS(compress2, z zdll)
+  )
+fi
 
 dnl Check whether to use libgcrypt
 AC_MSG_CHECKING(whether to use libgcrypt)
@@ -82,11 +90,19 @@
   AC_CHECK_HEADERS(gcrypt.h,LIBS="$LIBS -lgcrypt")
 fi
 
-dnl Check for libbz2 1.0 or greater
-AC_CHECK_HEADER(
-  bzlib.h,
-  AC_CHECK_LIB(bz2,BZ2_bzDecompressInit)
-)
+dnl Check whether to use libbz2 (1.0 or greater)
+AC_MSG_CHECKING(whether to use libbz2)
+AC_ARG_WITH(bzip2,
+[  --without-bzip2         don't use libbz2],
+if test "$withval" = no; then bzip2=no; else bzip2=yes; fi,
+bzip2=yes)
+AC_MSG_RESULT($bzip2)
+if test "$bzip2" = yes; then
+  AC_CHECK_HEADER(
+    bzlib.h,
+    AC_CHECK_LIB(bz2,BZ2_bzDecompressInit)
+  )
+fi
 
 dnl Either find glib or use the replacement
 AC_MSG_CHECKING(whether to use glib)

Modified: trunk/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/hacking/ChangeLog	2009-01-26 18:06:13 UTC (rev 3976)
+++ trunk/libspectrum/hacking/ChangeLog	2009-01-28 12:52:31 UTC (rev 3977)
@@ -714,3 +714,5 @@
 	 configure.in: merge libspectrum_0_5_0-branch changes onto trunk.
 20081214 libspectrum.c: loosen signature checks for .dsk files (Gergely;
 	 thanks, zx81 and Simon Owen).
+20090128 configure.in: add --without-(bzip2 /zlib) for gentoo and similar
+         distros (patch #2533274) (José Manuel Ferrer Ortiz).


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