Check/require <libxml/xmlreader.h> for '--enable-install-pkg'.

diff --git a/captive.spec.in b/captive.spec.in
index f2664e5..42fe66d 100644 (file)
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -86,6 +86,8 @@ BuildRequires: libgnomeui-devel
 Requires: libgnomeui
 BuildRequires: readline-devel
 Requires: readline
+BuildRequires: libxml2-devel >= 2.4.29
+Requires: libxml2 >= 2.4.29
 
 %description install
 Package provides easy enough unattended installation of Microsoft Windows

diff --git a/configure.in b/configure.in
index 6c8bbf7..6dcb141 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -333,23 +333,30 @@ GLADE_W_INIT([
        ],[$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" ])
 
 

diff --git a/debian/control b/debian/control
index 529634d..5077237 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>> 3.0.0),
  liborbit2-dev,
  libssl-dev,
  libgnomevfs2-dev,
- libxml2-dev,
+ libxml2-dev (>= 2.4.29),
  libpopt-dev,
  libglib2.0-dev,
  libreadline4-dev,
@@ -57,7 +57,8 @@ Depends: captive-lufs (= ${Source-Version}),
  libgnomeui-0,
  libpopt0,
  ntfsprogs-gnomevfs,
- gnome-vfs-httpcaptive
+ gnome-vfs-httpcaptive,
+ libxml2 (>= 2.4.29)
 Description: Instant installer for Microsoft Windows platform filesystem access.
  Package provides easy enough unattended installation of Microsoft Windows
  platform filesystem access. Installer finds available NTFS partitions and