From: Andres Mejia Date: Sun, 3 Feb 2013 06:42:59 +0000 (-0500) Subject: Fix mingw build because of bad check for libpcreposix. X-Git-Tag: v3.1.2~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91717f721e126d3f00f60665df44a93aa733d2a4;p=thirdparty%2Flibarchive.git Fix mingw build because of bad check for libpcreposix. --- diff --git a/configure.ac b/configure.ac index 7f405d76e..43f104852 100644 --- a/configure.ac +++ b/configure.ac @@ -372,9 +372,28 @@ if test "$enable_posix_regex_lib" = "auto" || test "$enable_posix_regex_lib" = " fi if test -z $posix_regex_lib_found && (test "$enable_posix_regex_lib" = "auto" || test "$enable_posix_regex_lib" = "libpcreposix"); then AC_CHECK_HEADERS([pcreposix.h]) + AC_CHECK_LIB(pcre,pcre_exec) AC_CHECK_LIB(pcreposix,regcomp) if test "x$ac_cv_lib_pcreposix_regcomp" = xyes; then posix_regex_lib_found=1 + AC_MSG_CHECKING(if PCRE_STATIC needs to be defined) + AC_LINK_IFELSE( + [AC_LANG_SOURCE(#include + int main() { return regcomp(NULL, NULL, 0); })], + [without_pcre_static=yes], + [without_pcre_static=no]) + AC_LINK_IFELSE( + [AC_LANG_SOURCE(#define PCRE_STATIC + #include + int main() { return regcomp(NULL, NULL, 0); })], + [with_pcre_static=yes], + [with_pcre_static=no]) + if test "x$without_pcre_static" != xyes && test "x$with_pcre_static" = xyes; then + AC_MSG_RESULT(yes) + AC_DEFINE([PCRE_STATIC], [1], [Define to 1 if PCRE_STATIC needs to be defined.]) + else + AC_MSG_RESULT(no) + fi fi fi