Partial workaround for autoconf-2.57 'configure' script dependency rebuild.

[captive.git] / configure.in

diff --git a/configure.in b/configure.in
index c61a7f0..c6f56a0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,10 +34,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.
@@ -302,6 +307,8 @@ AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(OPENSSL_LIBS)
 
 # AC_ARG_ENABLE(lufs,[--enable-lufs=[no/yes/auto]],,enable_lufs=auto)
+have_lufs_includes=false
+PATH_LUFSMOUNT=""
 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
@@ -322,17 +329,44 @@ if test x$enable_lufs != no;then
                        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_LUFSMOUNT,lufsmount)
+       if test x$PATH_LUFSMOUNT = x;then
+               if test x$enable_lufs = xyes;then
+                       AC_MSG_ERROR([LUFS client was requested (--enable-lufs) but no lufsmount(1) binary was found. Install 'lufs-*-*captive*' package.])
+               else
+                       AC_MSG_WARN([LUFS client not being compiled as no lufsmount(1) binary was found. Install 'lufs-*-*captive*' package.])
+               fi
+       fi
 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.])])
+AM_CONDITIONAL(ENABLE_LUFS,[ $have_lufs_includes && test x$PATH_LUFSMOUNT != x -a x$enable_lufs != no ])
+AC_SUBST(PATH_LUFSMOUNT)
 
 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.])])
 
+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
+
+if test "x$found_orbit_line" = "xlinc";then
+       AM_PATH_LINC(,,[AC_MSG_ERROR([Captive requires linc library used by ORBit.])])
+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