+Christian Kristukat - betatesting
[captive.git] / configure.in
index 4eb1d3d..f4647b8 100644 (file)
@@ -19,7 +19,9 @@
 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)
+dnl Not yet present in: Red Hat autoconf-2.57-3
+dnl AC_CONFIG_MACRO_DIR(macros)
+AM_INIT_AUTOMAKE(captive,1.0.3cvs)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 dnl Call AC_PROG_CC before AC_ISC_POSIX.
@@ -34,10 +36,15 @@ dnl Prevent "AC_TRY_COMPILE was called before AC_ISC_POSIX":
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
 AM_PROG_AS
-AM_ENABLE_STATIC
-AM_DISABLE_SHARED
+AM_DISABLE_STATIC
+AM_ENABLE_SHARED
 AM_PROG_LIBTOOL
 
+dnl Workaround for autoconf-2.57:
+m4_pattern_allow([AC_MSG_WARN])
+m4_pattern_allow([AC_CHECK_LIB])
+m4_pattern_allow([AC_CHECK_HEADERS])
+
 dnl gettext localization.
 dnl Use simpler AM_GLIB_GNU_GETTEXT instead of AM_GNU_GETTEXT
 dnl as we depend on glib and glib requires system installed gettext anyway.
@@ -50,8 +57,8 @@ AM_GLIB_GNU_GETTEXT
 
 GTK_DOC_CHECK
 dnl AM_CONDITIONAL needs to be here explicitely for doc/apiref/Makefile rebuild
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
+AM_CONDITIONAL(ENABLE_GTK_DOC,[test x$enable_gtk_doc = xyes])
+AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL,[test -n "$LIBTOOL"])
 
 dnl Do not discard 'CFLAGS' settings as they may have been passed us by rpmbuild(8)
 
@@ -64,32 +71,47 @@ dnl Some Makefiles use additional tests etc.
 AM_CONDITIONAL(MAINTAINER_MODE,[test "$USE_MAINTAINER_MODE" = "yes"])
 
 
-AC_ARG_WITH(sbin-mountdir,
-               [  --with-sbin-mountdir=dir      mount(8) 'mount.captive' directory (def.=/sbin)],,
-               [ with_sbin_mountdir="/sbin" ])
-AM_CONDITIONAL(WITH_SBIN_MOUNT,[test "$with_sbin_mount" != "no"])
-AC_SUBST(with_sbin_mountdir)
-
-AC_ARG_WITH(sbin-mount-fs,
-               [  --with-sbin-mount-fs=fs1:fs2  sbin-mount pre-installed symlinks (def.=ntfs:fastfat:cdfs:ext2fsd)],,
-               [ with_sbin_mount_fs="ntfs:fastfat:cdfs:ext2fsd" ])
-AC_SUBST(with_sbin_mount_fs)
-
-AC_ARG_WITH(sandbox-setuid,
-               [  --with-sandbox-setuid=user    non-privileged user  for captive-sandbox-server (def.=captive)],
-               [ CAPTIVE_SANDBOX_SETUID="$withval" ],[ CAPTIVE_SANDBOX_SETUID="captive" ])
+AC_ARG_ENABLE(man-pages,
+               [  --enable-man-pages=no/yes/auto   pod2man(1) required for man pages (def.=yes)],,enable_man_pages=yes)
+AC_ARG_ENABLE(sbin-mountdir,
+               [  --enable-sbin-mountdir=DIR       mount(8) 'mount.captive' directory (def.=/sbin)],,
+               [ enable_sbin_mountdir="/sbin" ])
+AC_ARG_ENABLE(sbin-mount-fs,
+               [  --enable-sbin-mount-fs=FS1:FS2   sbin-mount pre-installed symlinks (def.=ntfs:fastfat:cdfs:ext2fsd)],,
+               [ enable_sbin_mount_fs="ntfs:fastfat:cdfs:ext2fsd" ])
+AC_ARG_ENABLE(sandbox-setuid,
+               [  --enable-sandbox-setuid=USER     non-privileged user  for captive-sandbox-server (def.=captive)],
+               [ CAPTIVE_SANDBOX_SETUID="$enableval" ],[ CAPTIVE_SANDBOX_SETUID="captive" ])
+AC_ARG_ENABLE(sandbox-setgid,
+               [  --enable-sandbox-setgid=GROUP    non-privileged group for captive-sandbox-server (def.=captive)],
+               [ CAPTIVE_SANDBOX_SETGID="$enableval" ],[ CAPTIVE_SANDBOX_SETGID="captive" ])
+AC_ARG_ENABLE(sandbox-chroot,
+               [  --enable-sandbox-chroot=DIR      root-owned directory for captive-sandbox-server (def.=/var/lib/captive)],
+               [ CAPTIVE_SANDBOX_CHROOT="$enableval" ],[ CAPTIVE_SANDBOX_CHROOT="/var/lib/captive" ])
+AC_ARG_ENABLE(bug-replay,
+               [  --enable-bug-replay=no/yes/auto  compile debugging tool (def.=auto)],,enable_bug_replay=auto)
+AC_ARG_ENABLE(lufs,
+               [  --enable-lufs=no/yes/auto        compile LUFS filesystem module (def.=auto)],,enable_lufs=auto)
+AC_ARG_ENABLE(install-pkg,
+               [  --enable-install-pkg=no/yes/auto compile installation utils (def.=auto)],,enable_install_pkg=auto)
+
+
+# AC_ARG_ENABLE(sbin-mountdir,[--enable-sbin-mountdir=DIR],,[enable_sbin_mountdir="/sbin"])
+AM_CONDITIONAL(ENABLE_SBIN_MOUNT,[test "$enable_sbin_mount" != "no"])
+AC_SUBST(enable_sbin_mountdir)
+
+# AC_ARG_ENABLE(sbin-mount-fs,[--enable-sbin-mount-fs=FS1:FS2],,[enable_sbin_mount_fs="ntfs:fastfat:cdfs:ext2fsd"])
+AC_SUBST(enable_sbin_mount_fs)
+
+# AC_ARG_ENABLE(sandbox-setuid,[--enable-sandbox-setuid=USER],,[CAPTIVE_SANDBOX_SETUID="captive"])
 AC_DEFINE_UNQUOTED(CAPTIVE_SANDBOX_SETUID,"$CAPTIVE_SANDBOX_SETUID",
                [non-privileged user  for captive-sandbox-server])
 
-AC_ARG_WITH(sandbox-setgid,
-               [  --with-sandbox-setgid=group   non-privileged group for captive-sandbox-server (def.=captive)],
-               [ CAPTIVE_SANDBOX_SETGID="$withval" ],[ CAPTIVE_SANDBOX_SETGID="captive" ])
+# AC_ARG_ENABLE(sandbox-setgid,[--enable-sandbox-setgid=GROUP],,[CAPTIVE_SANDBOX_SETGID="captive"])
 AC_DEFINE_UNQUOTED(CAPTIVE_SANDBOX_SETGID,"$CAPTIVE_SANDBOX_SETGID",
                [non-privileged group for captive-sandbox-server])
 
-AC_ARG_WITH(sandbox-chroot,
-               [  --with-sandbox-chroot=dir     root-owned directory for captive-sandbox-server (def.=/var/lib/captive)],
-               [ CAPTIVE_SANDBOX_CHROOT="$withval" ],[ CAPTIVE_SANDBOX_CHROOT="/var/lib/captive" ])
+# AC_ARG_ENABLE(sandbox-chroot,[--enable-sandbox-chroot=DIR],,[CAPTIVE_SANDBOX_CHROOT="/var/lib/captive"])
 AC_DEFINE_UNQUOTED(CAPTIVE_SANDBOX_CHROOT,"$CAPTIVE_SANDBOX_CHROOT",
                [root-owned directory for captive-sandbox-server])
 AC_SUBST(CAPTIVE_SANDBOX_CHROOT)
@@ -97,6 +119,33 @@ AC_SUBST(CAPTIVE_SANDBOX_CHROOT)
 dnl Permit 'if NEVER' for Makefile.am-s; symbol 'FALSE' forbidden by automake
 AM_CONDITIONAL(NEVER,false)
 
+PERL=
+AC_PATH_PROGS(PERL,perl5 perl)
+if test '!' -f ./src/libcaptive/ke/exports.c -a -z "$PERL";then
+       AC_MSG_ERROR([perl(1) required as './src/libcaptive/ke/exports.c' is not found.])
+fi
+AM_CONDITIONAL(HAVE_PERL,test -n "$PERL")
+
+POD2MAN=
+AC_PATH_PROGS(POD2MAN,pod2man)
+AM_CONDITIONAL(HAVE_POD2MAN,[ test -n "$POD2MAN" ])
+if test x$enable_man_pages = xyes;then
+       if test -z "$POD2MAN";then
+               AC_MSG_ERROR([captive requires pod2man(1) for man pages; try --disable-man-pages.])
+       fi
+       if test -z "$PERL";then
+               AC_MSG_ERROR([captive requires perl(1) for man pages; try --disable-man-pages.])
+       fi
+elif test x$enable_man_pages != xno;then
+       if test -z "$POD2MAN";then
+               AC_MSG_WARN([captive requires pod2man(1) for man pages by --enable-man-pages; mans will not be installed.])
+       fi
+       if test -z "$PERL";then
+               AC_MSG_WARN([captive requires perl(1) for man pages by --enable-man-pages; mans will not be installed.])
+       fi
+fi
+AM_CONDITIONAL(ENABLE_MAN_PAGES,[ test x$enable_man_pages != xno -a -n "$POD2MAN" -a -n "$PERL" ])
+
 dnl Separate 'acconfig.h' is no longer recommended by autoconf
 AH_TOP([
 #ifndef _CAPTIVE_CONFIG_H
@@ -134,6 +183,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"
@@ -142,7 +199,8 @@ AH_BOTTOM([
 #endif /* !_CAPTIVE_CONFIG_H */
 ])
 
-AM_PATH_GLIB_2_0(,,[AC_MSG_ERROR([Captive requires glib-2.0 library.])],[gmodule gobject])
+dnl Do not use PKG_CHECK_MODULES() as it would not set 'GLIB_GENMARSHAL' etc.
+AM_PATH_GLIB_2_0(,,[AC_MSG_ERROR([Captive requires glib-2.0 library.])],[gmodule gobject gthread])
 dnl Force glib for the whole package
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
 LIBS="$LIBS $GLIB_LIBS"
@@ -151,7 +209,7 @@ dnl popt
 AC_CHECK_LIB(popt,poptParseArgvString,[POPT_LIBS="-lpopt"],[AC_MSG_ERROR([Captive requires popt library.])])
 AC_SUBST(POPT_LIBS)
 
-AC_ARG_WITH(readline,  [  --with-readline=[no/yes/auto]        cmdline client with line editing (def.=auto)],,with_readline=auto)
+AC_ARG_WITH(readline,[  --with-readline=[no/yes/auto]  clients with line editing (def.=auto)],,with_readline=auto)
 AC_CHECK_HEADERS(readline/history.h)
 dnl Check for libraries, if needed by configuration options.
 if test "$with_readline" != "no"
@@ -166,7 +224,7 @@ then
                if test "x$need" != "x"
                then
                        captive_save_LIBS="$LIBS"
-                       AC_CHECK_LIB($need, main,,
+                       AC_CHECK_LIB($need,main,,
                                [ need_failed="$need_failed $need"
                                continue ]
                                )
@@ -191,7 +249,7 @@ then
        if $have_libreadline
        then
                AC_DEFINE(HAVE_LIBREADLINE,,[Use functions from libreadline?])
-               AC_CHECK_LIB(readline, add_history,
+               AC_CHECK_LIB(readline,add_history,
                        AC_DEFINE(HAVE_ADD_HISTORY,,[Use 'history' extension of libreadline?]),,
                        $READLINE_LIBS)
        else
@@ -201,9 +259,9 @@ then
                done
                if test "$with_readline" = "yes"
                then
-                       AC_MSG_ERROR([captive did not find the requested readline library for its cmdline client line editing capability.])
+                       AC_MSG_ERROR([captive did not find the requested readline library for its client line editing capability.])
                else
-                       AC_MSG_WARN([captive recommends readline library for its cmdline client line editing capability.])
+                       AC_MSG_WARN([captive recommends readline library for its client line editing capability.])
                fi
        fi
 fi
@@ -211,9 +269,15 @@ 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)
 
+# AC_ARG_ENABLE(bug-replay,[--enable-bug-replay=[no/yes/auto]],,enable_bug_replay=auto)
 dnl Check for 2.5.9 for: http://bugzilla.gnome.org/show_bug.cgi?id=117702
 dnl Check the version - impossible to reliably check the missing feature.
 PKG_CHECK_MODULES(LIBXML,libxml-2.0 >= 2.5.9,[ have_libxml_buffering=true ],[
@@ -222,9 +286,15 @@ PKG_CHECK_MODULES(LIBXML,libxml-2.0 >= 2.5.9,[ have_libxml_buffering=true ],[
        ])
 dnl We also condition 'HAVE_LIBXML_XMLREADER_H' by 'HAVE_LIBXML_BUFFERING'
 dnl as we have no use for xmlreader without working libxml buffering of 2.5.9.
-AM_CONDITIONAL(HAVE_LIBXML_BUFFERING,$have_libxml_buffering)
+AM_CONDITIONAL(ENABLE_BUG_REPLAY,[$have_libxml_buffering && test x$enable_bug_replay != xno])
 if $have_libxml_buffering;then
        AC_DEFINE(HAVE_LIBXML_BUFFERING,,[libxml2 correctly reads textnodes by its xmlTextReader.])
+else
+       if test x$enable_bug_replay = xyes;then
+               AC_MSG_ERROR([captive require libxml2 at least 2.5.9 for --enable-bug-replay feature.])
+       elif test x$enable_bug_replay != xno;then
+               AC_MSG_WARN([libxml2 at least 2.5.9 required --enable-bug-replay feature; disabled now.])
+       fi
 fi
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
@@ -239,25 +309,137 @@ PKG_CHECK_MODULES(OPENSSL,openssl,,[
 AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(OPENSSL_LIBS)
 
-have_lufs_includes=true
-AC_CHECK_HEADERS(lufs/fs.h lufs/proto.h,,[ have_lufs_includes=false ])
-AM_CONDITIONAL(HAVE_LUFS_INCLUDES,$have_lufs_includes)
-AC_CHECK_TYPES([struct lufs_sbattr],,,[#include <lufs/proto.h>])
-
-dnl for $(top_srcdir)/src/libcaptive/sandbox/split-sandbox.c
-AM_PATH_LINC(,,[AC_MSG_ERROR([Captive requires linc library used by ORBit.])])
+# AC_ARG_ENABLE(lufs,[--enable-lufs=[no/yes/auto]],,enable_lufs=auto)
+have_lufs_includes=false
+# Although it would be more appropriate to use lufsmount(1) instead of lufsd(1)
+# we use lufsd(1) as lufsmount(1) is just a dumb wrapper and it would cost us
+# another big binary file for the static build package version.
+PATH_LUFSD=""
+if test x$enable_lufs != no;then
+       have_lufs_includes=true
+       dnl If ACTION-IF-NOT-FOUND is given, it is executed when one of the header
+       dnl files is not found.
+       AC_CHECK_HEADERS(lufs/fs.h lufs/proto.h,,[ have_lufs_includes=false ])
+       if test x$have_lufs_includes = xfalse;then
+               if test x$enable_lufs = xyes;then
+                       AC_MSG_ERROR([LUFS client was requested (--enable-lufs) but no LUFS include files were found. Install 'lufs-*-*captive*' package.])
+               else
+                       AC_MSG_WARN([LUFS client not being compiled as no LUFS include files were found. Install 'lufs-*-*captive*' package.])
+               fi
+       fi
+       AC_CHECK_TYPES([struct lufs_sbattr],,[
+               dnl FIXME: Include 'lufs' version when 'lufs_sbattr' gets integrated:
+               if $have_lufs_includes && test x$enable_lufs = xyes;then
+                       AC_MSG_ERROR([Although LUFS include files were found they are too old. You may also use --enable-lufs=auto.])
+               else
+                       AC_MSG_WARN([Although LUFS include files were found they are too old. df(1) will not show available NTFS disk space.])
+               fi
+               ],[#include <lufs/proto.h>])
+       AC_PATH_PROGS(PATH_LUFSD,lufsd)
+       if test x$PATH_LUFSD = x;then
+               if test x$enable_lufs = xyes;then
+                       AC_MSG_ERROR([LUFS client was requested (--enable-lufs) but no lufsd(1) binary was found. Install 'lufs-*-*captive*' package.])
+               else
+                       AC_MSG_WARN([LUFS client not being compiled as no lufsd(1) binary was found. Install 'lufs-*-*captive*' package.])
+               fi
+       fi
+fi
+AM_CONDITIONAL(ENABLE_LUFS,[ $have_lufs_includes && test x$PATH_LUFSD != x -a x$enable_lufs != no ])
+AC_SUBST(PATH_LUFSD)
 
 dnl for $(top_srcdir)/src/libcaptive/client/
 dnl Do not use '[client server]' as $4 to prevent: configure: test: too many arguments
 dnl  - currently this argument is not used by 'orbit2-config' in any way anyway
-AM_PATH_ORBIT2(,,[AC_MSG_ERROR([Captive requires ORBit library.])])
+dnl Do not use PKG_CHECK_MODULES() as it would not set 'ORBIT_IDL' etc.
+AM_PATH_ORBIT2(,,[AC_MSG_ERROR([Captive requires ORBit2 library.])])
+
+AC_ARG_WITH(orbit-line,[  --with-orbit-line=[link/linc/auto]   Use 'link' for ORBit2 >=2.7.x+ (def.=auto)],,with_orbit_line=auto)
+captive_save_CFLAGS="$CFLAGS"
+captive_save_LIBS="$LIBS"
+CFLAGS="$CFLAGS $ORBIT_CFLAGS"
+LIBS="$LIBS $ORBIT_LIBS"
+AC_CHECK_FUNC(link_get_tmpdir,[
+               AC_DEFINE(HAVE_ORBIT_LINK,,[ORBit2 is 2.7.x+ and therefore includes its own 'link' library])
+               found_orbit_line=link
+               ],
+       found_orbit_line=linc
+       )
+CFLAGS="$captive_save_CFLAGS"
+LIBS="$captive_save_LIBS"
+if test "x$with_orbit_line" != "xauto" -a "x$with_orbit_line" != "x$found_orbit_line";then
+       AC_MSG_ERROR([--with-orbit-line=$with_orbit_line specified but the detected line is $found_orbit_line])
+fi
 
-AC_CHECK_LIB(ntfs,ntfs_mount,
-       [ LIBNTFS_LIBS="-lntfs" ],
-       [ LIBNTFS_LIBS="" ])
-AC_SUBST(LIBNTFS_LIBS)
-AM_CONDITIONAL(HAVE_LIBNTFS,test -n "$LIBNTFS_LIBS")
+if test "x$found_orbit_line" = "xlinc";then
+       PKG_CHECK_MODULES(LINC,linc)
+fi
 
+# AC_ARG_ENABLE(install-pkg,[--enable-install-pkg=[no/yes/auto]],,enable_install_pkg=auto)
+GLADE_W_INIT([
+       ./src/install/acquire/ui-gnome-interface.c
+       ./src/install/acquire/ui-gnome-interface.h
+       ./src/install/acquire/ui-gnome-callbacks.h
+       ./src/install/acquire/ui-gnome-support.c
+       ./src/install/acquire/ui-gnome-support.h
+       ],[$enable_install_pkg],[
+               AC_CHECK_LIB(ntfs,ntfs_mount,[
+                       LIBNTFS_LIBS="-lntfs"
+
+                       have_libntfs_includes=true
+                       AC_CHECK_HEADERS
+                       # '#include "config.h"' may be required by <ntfs/*> include files.
+                       # "config.h" may be already present while not yet being compilable.
+                       rm -f config.h-ntfs_save
+                       mv -f config.h config.h-ntfs_save 2>/dev/null
+                       touch config.h
+                       captive_save_CPPFLAGS="$CPPFLAGS"
+                       CPPFLAGS="$CPPFLAGS -I."        # for "config.h" touched above
+                       AC_CHECK_HEADERS(ntfs/types.h ntfs/volume.h,,[ have_libntfs_includes=false ])
+                       CPPFLAGS="$captive_save_CPPFLAGS"
+                       rm -f config.h
+                       mv -f config.h-ntfs_save config.h 2>/dev/null
+                       if $have_libntfs_includes;then
+
+                               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"
+
+                       else
+                               AC_MSG_WARN([Captive requires ntfs/* include files (of ntfsprogs-devel) for --enable-install-pkg.])
+                       fi
+                       ],[ AC_MSG_WARN([Captive requires libntfs (of ntfsprogs-devel) for --enable-install-pkg.]) ])
+               ])
+AC_SUBST(GNOMEUI_CFLAGS)
+AC_SUBST(GNOMEUI_LIBS)
+AC_SUBST(LIBNTFS_LIBS)
+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" ])
+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)
@@ -266,9 +448,19 @@ dnl "Makefile" output files MUST have pathnames incl./excl. "./" prefix as speci
 dnl FIXME: Why the rule above was written here?
 AC_OUTPUT([
 captive.spec
-./src/client/gnomevfs/captive.conf
+./src/libcaptive/captive.pod.pl
+./src/libcaptive/client/options.pod.pl
+./src/client/cmdline/captive-cmdline.pod.pl
+./src/client/lufs/lufs-captivefs.pod.pl
+./src/client/lufs/mount.captive.pod.pl
 ./src/client/lufs/mount.captive
+./src/client/sandbox-server/captive-sandbox-server.pod.pl
+./src/install/fstab/captive-install-fstab.pod.pl
+./src/install/acquire/captive-install-acquire.pod.pl
+./src/client/gnomevfs/captive.conf
 ./po/Makefile.in
+./macros/glade-w.sh
+./debian/changelog
 Makefile
 ./macros/Makefile
 ./src/Makefile
@@ -326,8 +518,11 @@ Makefile
 ./src/client/lufs/Makefile
 ./src/client/sandbox-server/Makefile
 ./src/install/Makefile
+./src/install/libcaptive-install/Makefile
 ./src/install/fstab/Makefile
+./src/install/acquire/Makefile
 ./src/TraceFS/Makefile
+./src/w32-mod/Makefile
 ./doc/Makefile
 ./doc/apiref/Makefile
 ])