X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=configure.in;h=a12a3144515145de99604b0050d1fce6571716d7;hb=a73a9e87fba2ac850ed0393cd6762461498af73d;hp=3aca33cc5e888f27c5bb6d884f87b199f27cd510;hpb=222ad5da3ec6edebf645978ce79af2e799f55272;p=captive.git

diff --git a/configure.in b/configure.in
index 3aca33c..a12a314 100644
--- a/configure.in
+++ b/configure.in
@@ -38,6 +38,11 @@ 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.
@@ -192,7 +197,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"
@@ -339,7 +345,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"
@@ -359,7 +366,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)
@@ -373,13 +380,27 @@ GLADE_W_INIT([
 		AC_CHECK_LIB(ntfs,ntfs_mount,[
 			LIBNTFS_LIBS="-lntfs"
 
+			have_libntfs_includes=true
+			AC_CHECK_HEADERS
+			# '#include "config.h"' may be required by <ntfs/*> include files.
+			test -r config.h || touch config.h
 			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="$CPPFLAGS -I."	# for "config.h" touched above
+			AC_CHECK_HEADERS(ntfs/types.h ntfs/volume.h,,[ have_libntfs_includes=false ])
 			CPPFLAGS="$captive_save_CPPFLAGS"
-			])
+			if $have_libntfs_includes;then
+
+				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"
+
+			else
+				AC_MSG_WARN([Captive requires ntfs/* include files (of ntfsprogs-devel) for --enable-install-pkg.])
+			fi
+			],[ AC_MSG_WARN([Captive requires libntfs (of ntfsprogs-devel) for --enable-install-pkg.]) ])
 		])
 AC_SUBST(GNOMEUI_CFLAGS)
 AC_SUBST(GNOMEUI_LIBS)