Fixed the recent detection of ORBit-2.0 by pkg-config(1).

[captive.git] / configure.in

diff --git a/configure.in b/configure.in
index 91e4b3d..e429a92 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -197,7 +197,7 @@ 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])
+PKG_CHECK_MODULES(GLIB,glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0)
 dnl Force glib for the whole package
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
 LIBS="$LIBS $GLIB_LIBS"
@@ -344,7 +344,9 @@ 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.])])
+PKG_CHECK_MODULES(ORBIT,ORBit-2.0)
+dnl AM_PATH_ORBIT2() also sets 'ORBIT_IDL':
+AC_PATH_PROG(ORBIT_IDL,orbit-idl-2)
 
 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 +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)
@@ -380,7 +382,12 @@ GLADE_W_INIT([
 
                        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 -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"