X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=configure.in;h=4652c12f16d6bdc66e13fdbe1a6b72af8bd2d73f;hb=9d7952fa6b9fba2c118601a4e74eb2d7b32cbe7c;hp=81c18d32abec44de1e9feb1483ada0d07f7f62e4;hpb=1e11b1a8e9221aef3be45ef778a6f0ed54aac7d8;p=captive.git

diff --git a/configure.in b/configure.in
index 81c18d3..4652c12 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@
 AC_INIT(src/libcaptive/Makefile-libcaptive.am)
 dnl 2.53 for AM_GLIB_GNU_GETTEXT:
 AC_PREREQ(2.53)
-AM_INIT_AUTOMAKE(captive,0.9cvs)
+AM_INIT_AUTOMAKE(captive,1.0.1cvs)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 dnl Call AC_PROG_CC before AC_ISC_POSIX.
@@ -176,6 +176,14 @@ AH_BOTTOM([
 #include <glib/gtypes.h>	/* for 'gchar' */
 #define G_LOG_DOMAIN ((const gchar *)"Captive")
 
+/* Ensure we have proper -I options: */
+#if defined(CAPTIVE_USE_GNOME_VFS_MODULE) || defined(CAPTIVE_USE_GNOME_VFS)
+#ifndef HAVE_GNOME_VFS_READ_ENTIRE_FILE
+#include <libgnomevfs/gnome-vfs-result.h>
+GnomeVFSResult gnome_vfs_read_entire_file(const char *uri,int *file_size,char **file_contents);
+#endif
+#endif
+
 /* Supplemental definitions not possible in this file. */
 #ifdef LIBCAPTIVE
 #include "captive/config2.h"
@@ -253,9 +261,11 @@ AC_SUBST(READLINE_LIBS)
 AC_SUBST(READLINE_LDFLAGS)
 
 PKG_CHECK_MODULES(GNOME_VFS_MODULE,gnome-vfs-module-2.0)
+GNOME_VFS_MODULE_CFLAGS="$GNOME_VFS_MODULE_CFLAGS -DCAPTIVE_USE_GNOME_VFS_MODULE=1"
 AC_SUBST(GNOME_VFS_MODULE_CFLAGS)
 AC_SUBST(GNOME_VFS_MODULE_LIBS)
 PKG_CHECK_MODULES(GNOME_VFS,gnome-vfs-2.0)
+GNOME_VFS_CFLAGS="$GNOME_VFS_CFLAGS -DCAPTIVE_USE_GNOME_VFS=1"
 AC_SUBST(GNOME_VFS_CFLAGS)
 AC_SUBST(GNOME_VFS_LIBS)
 
@@ -333,25 +343,43 @@ GLADE_W_INIT([
 	],[$enable_install_pkg],[
 		AC_CHECK_LIB(ntfs,ntfs_mount,[
 			LIBNTFS_LIBS="-lntfs"
-			glade_addon=yes
+
+			captive_save_CPPFLAGS="$CPPFLAGS"
+			CPPFLAGS="$CPPFLAGS $LIBXML_CFLAGS"
+			AC_CHECK_HEADERS(libxml/xmlreader.h,
+				[ glade_addon=yes ],
+				[ AC_MSG_WARN([Captive requires libxml >= 2.4.29 for --enable-install-pkg.]) ])
+			CPPFLAGS="$captive_save_CPPFLAGS"
 			])
 		])
 AC_SUBST(GNOMEUI_CFLAGS)
 AC_SUBST(GNOMEUI_LIBS)
 AC_SUBST(LIBNTFS_LIBS)
-# Do not: AM_CONDITIONAL(HAVE_LIBNTFS,[ test -n "$LIBNTFS_LIBS" ])
-# as we do not need it as we are conditioned by ENABLE_INSTALL_PKG
+dnl Do not: AM_CONDITIONAL(HAVE_LIBNTFS,[ test -n "$LIBNTFS_LIBS" ])
+dnl as we do not need it as we are conditioned by ENABLE_INSTALL_PKG
 AM_CONDITIONAL(HAVE_GLADE_WRITESOURCE,[ test "x$PATH_GLADE" != "x" ])
-# Do not: AM_CONDITIONAL(BUILD_GLADESRC,[ test "xyes" = "x$BUILD_GLADESRC" ])
-# as we do not need it as we are conditioned by ENABLE_INSTALL_PKG
+dnl Do not: AM_CONDITIONAL(BUILD_GLADESRC,[ test "xyes" = "x$BUILD_GLADESRC" ])
+dnl as we do not need it as we are conditioned by ENABLE_INSTALL_PKG
 GNOME_ADDON_LIBS=""
 if test "x$BUILD_GLADESRC_TRUE" = "x"
 then
 	AC_CHECK_LIB(Xi,XOpenDevice,GNOME_ADDON_LIBS="$GNOME_ADDON_LIBS -lXi")
 fi
 AC_SUBST(GNOME_ADDON_LIBS)
+dnl $BUILD_GLADESRC is already conditioned by $enable_install_pkg by GLADE_W_INIT()
 AM_CONDITIONAL(ENABLE_INSTALL_PKG,[ test "xyes" = "x$BUILD_GLADESRC" ])
 
+dnl Do not use AC_REPLACE_FUNCS() as we need to link it selectively:
+GNOME_VFS_READ_ENTIRE_FILE_O=""
+captive_save_CFLAGS="$CFLAGS"
+captive_save_LIBS="$LIBS"
+CFLAGS="$CFLAGS $GNOME_VFS_MODULE_CFLAGS"
+LIBS="$LIBS $GNOME_VFS_MODULE_LIBS"
+AC_CHECK_FUNCS(gnome_vfs_read_entire_file,,
+	[ GNOME_VFS_READ_ENTIRE_FILE_O='gnome_vfs_read_entire_file.$(OBJEXT)' ])
+CFLAGS="$captive_save_CFLAGS"
+LIBS="$captive_save_LIBS"
+AC_SUBST(GNOME_VFS_READ_ENTIRE_FILE_O)
 
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)
@@ -372,6 +400,7 @@ captive.spec
 ./src/client/gnomevfs/captive.conf
 ./po/Makefile.in
 ./macros/glade-w.sh
+./debian/changelog
 Makefile
 ./macros/Makefile
 ./src/Makefile