AC_INIT(src/libcaptive/Makefile-libcaptive.am)
dnl 2.53 for AM_GLIB_GNU_GETTEXT:
AC_PREREQ(2.53)
-AM_INIT_AUTOMAKE(captive,0.9)
+AM_INIT_AUTOMAKE(captive,1.0.1cvs)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
dnl Call AC_PROG_CC before AC_ISC_POSIX.
#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"
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)
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)