summaryrefslogtreecommitdiffstats
path: root/src/inspect_apps.c
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-07-25 10:56:52 +0100
committerRichard W.M. Jones <rjones@redhat.com>2011-07-26 15:48:11 +0100
commitefeda05dedf45b99cd5e149f38276dc806cb6d0b (patch)
treedd97c32577906437e5ed050eef7c3a3308e28b6e /src/inspect_apps.c
parent8076a345b2ff6e327bf06eee6166af4096ad1418 (diff)
downloadlibguestfs-efeda05dedf45b99cd5e149f38276dc806cb6d0b.tar.gz
libguestfs-efeda05dedf45b99cd5e149f38276dc806cb6d0b.tar.xz
libguestfs-efeda05dedf45b99cd5e149f38276dc806cb6d0b.zip
Require PCRE library.
This library is widely available in distros. (cherry picked from commit 41cd0e302d6554facd6b9f7daaa78304361efaef)
Diffstat (limited to 'src/inspect_apps.c')
-rw-r--r--src/inspect_apps.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/inspect_apps.c b/src/inspect_apps.c
index 83c5e5e5..ba272476 100644
--- a/src/inspect_apps.c
+++ b/src/inspect_apps.c
@@ -29,9 +29,7 @@
#include <errno.h>
#include <endian.h>
-#ifdef HAVE_PCRE
#include <pcre.h>
-#endif
#ifdef HAVE_HIVEX
#include <hivex.h>
@@ -46,7 +44,7 @@
#include "guestfs-internal-actions.h"
#include "guestfs_protocol.h"
-#if defined(HAVE_PCRE) && defined(HAVE_HIVEX)
+#if defined(HAVE_HIVEX)
#ifdef DB_DUMP
static struct guestfs_application_list *list_applications_rpm (guestfs_h *g, struct inspect_fs *fs);
@@ -601,12 +599,12 @@ sort_applications (struct guestfs_application_list *apps)
compare_applications);
}
-#else /* no PCRE or hivex at compile time */
+#else /* no hivex at compile time */
/* XXX These functions should be in an optgroup. */
#define NOT_IMPL(r) \
- error (g, _("inspection API not available since this version of libguestfs was compiled without PCRE or hivex libraries")); \
+ error (g, _("inspection API not available since this version of libguestfs was compiled without the hivex library")); \
return r
struct guestfs_application_list *
@@ -615,4 +613,4 @@ guestfs__inspect_list_applications (guestfs_h *g, const char *root)
NOT_IMPL(NULL);
}
-#endif /* no PCRE or hivex at compile time */
+#endif /* no hivex at compile time */