#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"
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
+ 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"