X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=configure.in;h=aa64345395ea70bdd6bfa5f4c733e34da255eca0;hb=d9ed28783f1fead15ddacd50782e3c7fdc004b7d;hp=1609bb0acfd8235f88d00b8d916efe858ec487bd;hpb=7d4f265844f6a14699dec0ccee119afef3d57be2;p=captive.git diff --git a/configure.in b/configure.in index 1609bb0..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. @@ -50,8 +50,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) @@ -63,27 +63,81 @@ if test "$USE_MAINTAINER_MODE" = "yes";then dnl Some Makefiles use additional tests etc. AM_CONDITIONAL(MAINTAINER_MODE,[test "$USE_MAINTAINER_MODE" = "yes"]) -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) -dnl Permit 'if IS_FALSE' for Makefile.am-s; symbol 'FALSE' forbidden by automake -AM_CONDITIONAL(IS_FALSE,false) +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([ @@ -122,6 +176,14 @@ AH_BOTTOM([ #include /* 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 +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" @@ -139,7 +201,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 w/line editing [default=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" @@ -154,7 +216,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 ] ) @@ -179,7 +241,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 @@ -189,9 +251,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 @@ -199,9 +261,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 ],[ @@ -210,9 +278,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) @@ -227,9 +301,29 @@ 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_ARG_ENABLE(lufs,[--enable-lufs=[no/yes/auto]],,enable_lufs=auto) +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 ]) +fi +AM_CONDITIONAL(ENABLE_LUFS,[ $have_lufs_includes && test x$enable_lufs != no ]) dnl for $(top_srcdir)/src/libcaptive/sandbox/split-sandbox.c AM_PATH_LINC(,,[AC_MSG_ERROR([Captive requires linc library used by ORBit.])]) @@ -239,16 +333,76 @@ dnl Do not use '[client server]' as $4 to prevent: configure: test: too many arg dnl - currently this argument is not used by 'orbit2-config' in any way anyway AM_PATH_ORBIT2(,,[AC_MSG_ERROR([Captive requires ORBit library.])]) +# 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" + + 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) +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) dnl "Makefile" output files MUST have pathnames incl./excl. "./" prefix as specified! +dnl FIXME: Why the rule above was written here? AC_OUTPUT([ captive.spec +./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 -./po/Makefile.in ./src/Makefile ./src/libcaptive/Makefile ./src/libcaptive/include/Makefile @@ -303,10 +457,14 @@ Makefile ./src/client/gnomevfs/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 -./src/client/gnomevfs/captive.conf ]) dnl FIXME: Why is "po/POTFILES" being substituted?