Hi, Gnome-vfs fails to detect properly if the libz2 headers are installed. I made it a compile-time option with this patch. OK to apply ? Cheers -- /Bastien Nocera http://hadess.net
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-vfs/configure.in,v
retrieving revision 1.159
diff -u -r1.159 configure.in
--- configure.in 2002/02/06 22:08:38 1.159
+++ configure.in 2002/02/09 16:11:31
@@ -289,6 +289,11 @@
fi
AC_CHECK_LIB(bz2, bzCompressInit, AC_DEFINE(HAVE_OLDER_BZIP2))
+AM_CONDITIONAL(HAVE_BZ2, false);
+AC_CHECK_HEADERS(bzlib.h, [
+ BZ2_LIBS="$BZ2_LIBS -lbz2";
+ AM_CONDITIONAL(HAVE_BZ2, true);
+ ])
if test $have_socket = yes; then
AC_STRUCT_LINGER
Index: modules/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/Makefile.am,v
retrieving revision 1.80
diff -u -r1.80 Makefile.am
--- modules/Makefile.am 2002/01/21 20:26:32 1.80
+++ modules/Makefile.am 2002/02/09 16:11:33
@@ -31,11 +31,18 @@
CDDA_LTLIBS =
endif
+if HAVE_BZ2
+BZ2_LTLIBS = libbzip2.la
+else
+BZ2_LTLIBS =
+endif
+
module_flags = -export_dynamic -avoid-version
modulesdir = $(libdir)/gnome-vfs-2.0/modules
modules_LTLIBRARIES = \
$(CDDA_LTLIBS) \
+ $(BZ2_LTLIBS) \
libdesktop.la \
libvfolder-desktop.la \
libextfs.la \
@@ -43,7 +50,6 @@
libnntp.la \
libvfs-test.la \
$(HTTP_LTLIBS) \
- libbzip2.la \
libgzip.la \
libftp.la \
libvfs-pipe.la \
Attachment:
pgp4946kf6Cfk.pgp
Description: PGP signature