AC_INIT(src/libcaptive/Makefile-libcaptive.am)
dnl 2.53 for AM_GLIB_GNU_GETTEXT:
AC_PREREQ(2.53)
-AM_INIT_AUTOMAKE(captive,1.0.2cvs)
+dnl Not yet present in: Red Hat autoconf-2.57-3
+dnl AC_CONFIG_MACRO_DIR(macros)
+AM_INIT_AUTOMAKE(captive,1.1.1.2cvs)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
dnl Call AC_PROG_CC before AC_ISC_POSIX.
#endif /* !_CAPTIVE_CONFIG_H */
])
-PKG_CHECK_MODULES(GLIB,glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0)
+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"
# AC_ARG_ENABLE(lufs,[--enable-lufs=[no/yes/auto]],,enable_lufs=auto)
have_lufs_includes=false
-PATH_LUFSMOUNT=""
+# 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
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
+ 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 lufsmount(1) binary was found. Install 'lufs-*-*captive*' package.])
+ 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 lufsmount(1) binary was found. Install 'lufs-*-*captive*' package.])
+ 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_LUFSMOUNT != x -a x$enable_lufs != no ])
-AC_SUBST(PATH_LUFSMOUNT)
+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
-PKG_CHECK_MODULES(ORBIT,ORBit-2.0)
+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"
have_libntfs_includes=true
AC_CHECK_HEADERS
# '#include "config.h"' may be required by <ntfs/*> include files.
- test -r config.h || touch config.h
+ # "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"