X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=src%2Ffilearch.c;h=0ed64257226ec39f78eaafd031c908a939dcfa84;hp=14c7c02741edf66c74eb3894263726ec184b6ebf;hb=41cd0e302d6554facd6b9f7daaa78304361efaef;hpb=316817b5ad98e294a9d2498a4403e82911a75b4a diff --git a/src/filearch.c b/src/filearch.c index 14c7c02..0ed6425 100644 --- a/src/filearch.c +++ b/src/filearch.c @@ -26,9 +26,8 @@ #include #include -#ifdef HAVE_PCRE #include -#endif + #ifdef HAVE_LIBMAGIC #include #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 */