summaryrefslogtreecommitdiffstats
path: root/src/filearch.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-25 11:13:21 +0100
commit41cd0e302d6554facd6b9f7daaa78304361efaef (patch)
tree18c6361a122c7e707230d32574e94bf909822733 /src/filearch.c
parent316817b5ad98e294a9d2498a4403e82911a75b4a (diff)
downloadlibguestfs-41cd0e302d6554facd6b9f7daaa78304361efaef.tar.gz
libguestfs-41cd0e302d6554facd6b9f7daaa78304361efaef.tar.xz
libguestfs-41cd0e302d6554facd6b9f7daaa78304361efaef.zip
Require PCRE library.
This library is widely available in distros.
Diffstat (limited to 'src/filearch.c')
-rw-r--r--src/filearch.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/filearch.c b/src/filearch.c
index 14c7c027..0ed64257 100644
--- a/src/filearch.c
+++ b/src/filearch.c
@@ -26,9 +26,8 @@
#include <string.h>
#include <sys/stat.h>
-#ifdef HAVE_PCRE
#include <pcre.h>
-#endif
+
#ifdef HAVE_LIBMAGIC
#include <magic.h>
#endif
@@ -40,7 +39,7 @@
#include "guestfs-internal-actions.h"
#include "guestfs_protocol.h"
-#if defined(HAVE_PCRE) && defined(HAVE_LIBMAGIC)
+#if defined(HAVE_LIBMAGIC)
static pcre *re_file_elf;
static pcre *re_elf_ppc64;
@@ -258,12 +257,12 @@ guestfs__file_architecture (guestfs_h *g, const char *path)
return ret; /* caller frees */
}
-#else /* no PCRE or libmagic at compile time */
+#else /* no libmagic at compile time */
/* XXX Should be an optgroup. */
#define NOT_IMPL(r) \
- error (g, _("file-architecture API not available since this version of libguestfs was compiled without PCRE or libmagic libraries")); \
+ error (g, _("file-architecture API not available since this version of libguestfs was compiled without the libmagic library")); \
return r
char *
@@ -272,4 +271,4 @@ guestfs__file_architecture (guestfs_h *g, const char *path)
NOT_IMPL(NULL);
}
-#endif /* no PCRE or libmagic at compile time */
+#endif /* no libmagic at compile time */