X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=configure.in;h=60e1e213c022de07b1b6f9719c5c911697b39be6;hb=8780f98e140b6dd2b1b382d2a23fa75508a45328;hp=91e4b3ddab8571a612744a2b5739931918da836d;hpb=f90868cf365473bf3fb55ca3bf2145d7c79cb6f4;p=captive.git

diff --git a/configure.in b/configure.in
index 91e4b3d..60e1e21 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,9 @@
 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.0.3cvs)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 dnl Call AC_PROG_CC before AC_ISC_POSIX.
@@ -197,7 +199,8 @@ GnomeVFSResult gnome_vfs_read_entire_file(const char *uri,int *file_size,char **
 #endif /* !_CAPTIVE_CONFIG_H */
 ])
 
-AM_PATH_GLIB_2_0(,,[AC_MSG_ERROR([Captive requires glib-2.0 library.])],[gmodule gobject])
+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"
@@ -344,7 +347,8 @@ 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.])])
+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"
@@ -364,7 +368,7 @@ if test "x$with_orbit_line" != "xauto" -a "x$with_orbit_line" != "x$found_orbit_
 fi
 
 if test "x$found_orbit_line" = "xlinc";then
-	AM_PATH_LINC(,,[AC_MSG_ERROR([Captive requires linc library used by ORBit.])])
+	PKG_CHECK_MODULES(LINC,linc)
 fi
 
 # AC_ARG_ENABLE(install-pkg,[--enable-install-pkg=[no/yes/auto]],,enable_install_pkg=auto)
@@ -380,7 +384,17 @@ GLADE_W_INIT([
 
 			have_libntfs_includes=true
 			AC_CHECK_HEADERS
+			# '#include "config.h"' may be required by <ntfs/*> include files.
+			# "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"