summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJohn Spencer <maillist-tinyproxy@barfooze.de>2016-01-03 20:55:37 +0000
committerMichael Adam <obnox@samba.org>2016-01-19 22:50:20 +0100
commit186bbc3efb4b47caac0b5e14465c97918c99e442 (patch)
treeda0077921a5d8a6b3fc7eebc23945c73d25eec8c
parentb036d2e055a1031f9baf579b2edae704d937be97 (diff)
configure.ac: remove check for broken regex which breaks crosscompilation
in the unlikely case that the user's C library has broken regex support, she should probably update to a bugfree version. in its full consequence, checking if individual functions works basically require to test every single function in use, which is nonsensical. since this check required to compile and run a code sample on the host, it cannot be checked in cross-compile scenarios and as it defaulted to yes (broken), causes build failure in any such scenario. closes #1 Signed-off-by: John Spencer <maillist-tinyproxy@barfooze.de> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--configure.ac45
1 files changed, 0 insertions, 45 deletions
diff --git a/configure.ac b/configure.ac
index ca57577..cdf8d42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,11 +131,6 @@ if test x"$transparent_enabled" = x"yes"; then
AC_DEFINE(TRANSPARENT_PROXY)
fi
-dnl Check for broken regex library
-TP_ARG_ENABLE(regexcheck,
- [Check for working regex library (default is YES)],
- yes)
-
# This is required to build test programs below
AC_PROG_CC
@@ -233,46 +228,6 @@ dnl
dnl Handle the REGEX library
if test x"$ac_cv_func_regexec" != x"yes"; then
AC_MSG_ERROR([Could not locate the regexec() function])
-else
- if test x"$regexcheck_enabled" = x"yes" ; then
- AC_MSG_CHECKING([whether the system's regex library is broken])
- AC_CACHE_VAL(tinyproxy_cv_regex_broken,
- [AC_TRY_RUN([
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#if HAVE_REGEX_H
-# include <regex.h>
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-int main(void)
-{
- regex_t blah;
- if (regcomp(&blah, "foo.*bar", REG_NOSUB) != 0)
- exit(1);
- if (regexec(&blah, "foobar", 0, NULL, 0) != 0)
- exit(1);
- else
- exit(0);
-
- return 0;
-}
- ],
- tinyproxy_cv_regex_broken=no,
- tinyproxy_cv_regex_broken=yes,
- tinyproxy_cv_regex_broken=yes)])
-
- AC_MSG_RESULT([$tinyproxy_cv_regex_broken])
-
- if test x"$tinyproxy_cv_regex_broken" = x"yes" ; then
- AC_MSG_ERROR([Your system's regexec() function is broken.])
- fi
- fi
fi
dnl