diff options
| author | Richard Jones <rjones@redhat.com> | 2010-11-09 18:56:00 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2010-11-11 11:24:13 +0000 |
| commit | 7509c91a71c729b3223eef4cde10d70daca66c72 (patch) | |
| tree | 927c56e258c843439d545081d8af3c27125a8b9a /configure.ac | |
| parent | f08fe63761d4186d49212b1d2382b1a5a2b8a62f (diff) | |
| download | libguestfs-7509c91a71c729b3223eef4cde10d70daca66c72.tar.gz libguestfs-7509c91a71c729b3223eef4cde10d70daca66c72.tar.xz libguestfs-7509c91a71c729b3223eef4cde10d70daca66c72.zip | |
fish: Use core add-domain API to implement '-d' option.
This also makes libxml2 and libvirt into optional dependencies.
If they are missing then the core API will print an error, as
will the '-d' option to guestfish.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index e7761c99..67b13097 100644 --- a/configure.ac +++ b/configure.ac @@ -445,11 +445,6 @@ AC_CHECK_LIB([magic],[magic_file], ], [AC_MSG_WARN([libmagic not found, some core features will be disabled])]) -dnl libvirt (required) -PKG_CHECK_MODULES([LIBVIRT], [libvirt]) -AC_SUBST([LIBVIRT_CFLAGS]) -AC_SUBST([LIBVIRT_LIBS]) - dnl Check for PCRE (highly recommended) PKG_CHECK_MODULES([PCRE], [libpcre], [AC_SUBST([PCRE_CFLAGS]) @@ -458,11 +453,21 @@ PKG_CHECK_MODULES([PCRE], [libpcre], ], [AC_MSG_WARN([PCRE not found, some core features will be disabled])]) -dnl libxml2 (required) -PKG_CHECK_MODULES([LIBXML2], [libxml-2.0]) -AC_SUBST([LIBXML2_CFLAGS]) -AC_SUBST([LIBXML2_LIBS]) +dnl libvirt (highly recommended) +PKG_CHECK_MODULES([LIBVIRT], [libvirt], + [AC_SUBST([LIBVIRT_CFLAGS]) + AC_SUBST([LIBVIRT_LIBS]) + AC_DEFINE([HAVE_LIBVIRT],[1],[libvirt found at compile time.]) + ], + [AC_MSG_WARN([libvirt not found, some core features will be disabled])]) +dnl libxml2 (highly recommended) +PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], + [AC_SUBST([LIBXML2_CFLAGS]) + AC_SUBST([LIBXML2_LIBS]) + AC_DEFINE([HAVE_LIBXML2],[1],[libxml2 found at compile time.]) + ], + [AC_MSG_WARN([libxml2 not found, some core features will be disabled])]) dnl hivex library (highly recommended) dnl This used to be a part of libguestfs, but was spun off into its |