Revert PKG_CHECK_MODULES() back to AM_PATH_*() to get its AC_SUBST()s.

diff --git a/configure.in b/configure.in
index e429a92..a12a314 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -197,7 +197,8 @@ GnomeVFSResult gnome_vfs_read_entire_file(const char *uri,int *file_size,char **
 #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"
@@ -344,9 +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
-PKG_CHECK_MODULES(ORBIT,ORBit-2.0)
-dnl AM_PATH_ORBIT2() also sets 'ORBIT_IDL':
-AC_PATH_PROG(ORBIT_IDL,orbit-idl-2)
+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"