],[$enable_install_pkg],[
AC_CHECK_LIB(ntfs,ntfs_mount,[
LIBNTFS_LIBS="-lntfs"
- glade_addon=yes
+
+ 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"
])
])
AC_SUBST(GNOMEUI_CFLAGS)
AC_SUBST(GNOMEUI_LIBS)
AC_SUBST(LIBNTFS_LIBS)
-# Do not: AM_CONDITIONAL(HAVE_LIBNTFS,[ test -n "$LIBNTFS_LIBS" ])
-# as we do not need it as we are conditioned by ENABLE_INSTALL_PKG
+dnl Do not: AM_CONDITIONAL(HAVE_LIBNTFS,[ test -n "$LIBNTFS_LIBS" ])
+dnl as we do not need it as we are conditioned by ENABLE_INSTALL_PKG
AM_CONDITIONAL(HAVE_GLADE_WRITESOURCE,[ test "x$PATH_GLADE" != "x" ])
-# Do not: AM_CONDITIONAL(BUILD_GLADESRC,[ test "xyes" = "x$BUILD_GLADESRC" ])
-# as we do not need it as we are conditioned by ENABLE_INSTALL_PKG
+dnl Do not: AM_CONDITIONAL(BUILD_GLADESRC,[ test "xyes" = "x$BUILD_GLADESRC" ])
+dnl as we do not need it as we are conditioned by ENABLE_INSTALL_PKG
GNOME_ADDON_LIBS=""
if test "x$BUILD_GLADESRC_TRUE" = "x"
then
AC_CHECK_LIB(Xi,XOpenDevice,GNOME_ADDON_LIBS="$GNOME_ADDON_LIBS -lXi")
fi
AC_SUBST(GNOME_ADDON_LIBS)
+dnl $BUILD_GLADESRC is already conditioned by $enable_install_pkg by GLADE_W_INIT()
AM_CONDITIONAL(ENABLE_INSTALL_PKG,[ test "xyes" = "x$BUILD_GLADESRC" ])