diff options
| author | Richard Jones <rjones@redhat.com> | 2010-02-22 12:53:16 +0000 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-02-22 13:19:21 +0000 |
| commit | a8c3723e3818b5a7a31520043c6831115ab9d0e0 (patch) | |
| tree | 00568e6c18afe37e0b3963306fb19cade9b75f87 /configure.ac | |
| parent | aa4700f0325743aaa16b525637b00ee61b39df13 (diff) | |
| download | libguestfs-a8c3723e3818b5a7a31520043c6831115ab9d0e0.tar.gz libguestfs-a8c3723e3818b5a7a31520043c6831115ab9d0e0.tar.xz libguestfs-a8c3723e3818b5a7a31520043c6831115ab9d0e0.zip | |
Spin off hivex as a separate upstream project.
This commit makes the semi-independent hivex library into a
separate upstream project. The git repo for hivex is now:
http://git.annexia.org/?p=hivex.git;a=summary
Downloads of hivex are available here:
http://libguestfs.org/download/
All questions, patches, bugs etc should be sent to the libguestfs
mailing list and bug tracker.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 1ba449e5..744d24a6 100644 --- a/configure.ac +++ b/configure.ac @@ -422,10 +422,16 @@ dnl For i18n. AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.17]) -dnl libxml2 is used by the hivex library. -PKG_CHECK_MODULES([LIBXML2], [libxml-2.0]) -AC_SUBST([LIBXML2_CFLAGS]) -AC_SUBST([LIBXML2_LIBS]) +dnl hivex library (highly recommended). +dnl This used to be a part of libguestfs, but was spun off into its +dnl own separate upstream project in libguestfs 1.0.85. +HAVE_HIVEX=yes +PKG_CHECK_MODULES([HIVEX], [hivex],,[ + HAVE_HIVEX=no + AC_MSG_WARN([Hivex library and headers are missing, so optional Windows Registry tools won't be built])]) +AM_CONDITIONAL([HAVE_HIVEX],[test "x$HAVE_HIVEX" = "xyes"]) +AC_SUBST([HIVEX_CFLAGS]) +AC_SUBST([HIVEX_LIBS]) dnl FUSE is optional to build the FUSE module. HAVE_FUSE=yes @@ -736,9 +742,6 @@ AC_CONFIG_FILES([Makefile libguestfs.pc gnulib/lib/Makefile gnulib/tests/Makefile - hivex/Makefile - hivex/t/Makefile - hivex/tools/Makefile fuse/Makefile ocaml/META perl/Makefile.PL]) AC_OUTPUT |