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)
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(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 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")
+
dnl Separate 'acconfig.h' is no longer recommended by autoconf
AH_TOP([
#ifndef _CAPTIVE_CONFIG_H
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"
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 ]
)
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
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
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 ],[
])
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 != no;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)
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>])
+# 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 ])
+ 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>])
+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.])])
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_CHECK_LIB(ntfs,ntfs_mount,
- [ LIBNTFS_LIBS="-lntfs" ],
- [ LIBNTFS_LIBS="" ])
-AC_SUBST(LIBNTFS_LIBS)
-AM_CONDITIONAL(HAVE_LIBNTFS,test -n "$LIBNTFS_LIBS")
-
-PKG_CHECK_MODULES(GNOMEUI,libgnomeui-2.0)
+# 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"
+ glade_addon=yes
+ ])
+ ])
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
+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
+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)
+AM_CONDITIONAL(ENABLE_INSTALL_PKG,[ test "xyes" = "x$BUILD_GLADESRC" ])
AC_SUBST(CFLAGS)
./src/client/gnomevfs/captive.conf
./src/client/lufs/mount.captive
./po/Makefile.in
+./macros/glade-w.sh
Makefile
./macros/Makefile
./src/Makefile
git://git.jankratochvil.net / captive.git / blobdiff