X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=configure.in;h=aa64345395ea70bdd6bfa5f4c733e34da255eca0;hb=18e8a947ea8f4133dfee34df9e4b5cfc60f87f1e;hp=c06a44feeda38d78f774739a0e191718edf068e7;hpb=952ad78616a59b0a5d04265ea5b9e5012838ecb5;p=captive.git

diff --git a/configure.in b/configure.in
index c06a44f..aa64345 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.2cvs)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 dnl Call AC_PROG_CC before AC_ISC_POSIX.
@@ -34,8 +34,8 @@ 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 gettext localization.
@@ -64,6 +64,8 @@ dnl Some Makefiles use additional tests etc.
 AM_CONDITIONAL(MAINTAINER_MODE,[test "$USE_MAINTAINER_MODE" = "yes"])
 
 
+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" ])
@@ -107,7 +109,6 @@ AC_DEFINE_UNQUOTED(CAPTIVE_SANDBOX_CHROOT,"$CAPTIVE_SANDBOX_CHROOT",
 		[root-owned directory for captive-sandbox-server])
 AC_SUBST(CAPTIVE_SANDBOX_CHROOT)
 
-
 dnl Permit 'if NEVER' for Makefile.am-s; symbol 'FALSE' forbidden by automake
 AM_CONDITIONAL(NEVER,false)
 
@@ -118,6 +119,26 @@ if test '!' -f ./src/libcaptive/ke/exports.c -a -z "$PERL";then
 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
@@ -155,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"
@@ -232,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)
 
@@ -253,7 +284,7 @@ if $have_libxml_buffering;then
 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 != no;then
+	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
@@ -276,6 +307,13 @@ if test x$enable_lufs != no;then
 	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
@@ -305,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)
@@ -332,10 +388,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