You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2014/07/23 21:01:45 UTC
svn commit: r1612921 - in /httpd/httpd/trunk: configure.in server/util_pcre.c
Author: rjung
Date: Wed Jul 23 19:01:45 2014
New Revision: 1612921
URL: http://svn.apache.org/r1612921
Log:
Check for correct minimum PCRE version in configure,
do not check in source code.
Modified:
httpd/httpd/trunk/configure.in
httpd/httpd/trunk/server/util_pcre.c
Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1612921&r1=1612920&r2=1612921&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Wed Jul 23 19:01:45 2014
@@ -236,7 +236,9 @@ if test "$PCRE_CONFIG" != "false"; then
fi
case `$PCRE_CONFIG --version` in
[[1-5].*])
- AC_MSG_ERROR([Need at least pcre version 6.0])
+ AC_MSG_ERROR([Need at least pcre version 6.7])
+ [6.[0-6]*])
+ AC_MSG_ERROR([Need at least pcre version 6.7])
;;
esac
AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
Modified: httpd/httpd/trunk/server/util_pcre.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_pcre.c?rev=1612921&r1=1612920&r2=1612921&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_pcre.c (original)
+++ httpd/httpd/trunk/server/util_pcre.c Wed Jul 23 19:01:45 2014
@@ -125,12 +125,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t *
const char *errorptr;
int erroffset;
int errcode = 0;
- /* PCRE_DUPNAMES is only present since version 6.7 of PCRE */
-#ifdef PCRE_DUPNAMES
int options = PCRE_DUPNAMES;
-#else
-#error PCRE_DUPNAMES does not exist in this PCRE implementation; too old.
-#endif
if ((cflags & AP_REG_ICASE) != 0)
options |= PCRE_CASELESS;
Re: svn commit: r1612921 - in /httpd/httpd/trunk: configure.in server/util_pcre.c
Posted by Rainer Jung <ra...@kippdata.de>.
Am 24.07.2014 um 02:39 schrieb Takashi Sato:
>> --- httpd/httpd/trunk/configure.in (original)
>> +++ httpd/httpd/trunk/configure.in Wed Jul 23 19:01:45 2014
>> @@ -236,7 +236,9 @@ if test "$PCRE_CONFIG" != "false"; then
>> fi
>> case `$PCRE_CONFIG --version` in
>> [[1-5].*])
>> - AC_MSG_ERROR([Need at least pcre version 6.0])
>> + AC_MSG_ERROR([Need at least pcre version 6.7])
>> + [6.[0-6]*])
>> + AC_MSG_ERROR([Need at least pcre version 6.7])
>> ;;
>> esac
>> AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
>
> This causes an error:
>
> checking for pcre-config... /usr/bin/pcre-config
> ./configure: line 6115: syntax error near unexpected token `)'
> ./configure: line 6115: ` 6.[0-6]*)'
>
> I think following fix is needed.
>
> Index: configure.in
> ===================================================================
> --- configure.in (revision 1612973)
> +++ configure.in (working copy)
> @@ -237,6 +237,7 @@
> case `$PCRE_CONFIG --version` in
> [[1-5].*])
> AC_MSG_ERROR([Need at least pcre version 6.7])
> + ;;
> [6.[0-6]*])
> AC_MSG_ERROR([Need at least pcre version 6.7])
> ;;
>
Oups, yes, sorry, applied in r1613029 (and also tested this time).
Regards,
Rainer
Re: svn commit: r1612921 - in /httpd/httpd/trunk: configure.in server/util_pcre.c
Posted by Takashi Sato <ta...@tks.st>.
> --- httpd/httpd/trunk/configure.in (original)
> +++ httpd/httpd/trunk/configure.in Wed Jul 23 19:01:45 2014
> @@ -236,7 +236,9 @@ if test "$PCRE_CONFIG" != "false"; then
> fi
> case `$PCRE_CONFIG --version` in
> [[1-5].*])
> - AC_MSG_ERROR([Need at least pcre version 6.0])
> + AC_MSG_ERROR([Need at least pcre version 6.7])
> + [6.[0-6]*])
> + AC_MSG_ERROR([Need at least pcre version 6.7])
> ;;
> esac
> AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
This causes an error:
checking for pcre-config... /usr/bin/pcre-config
./configure: line 6115: syntax error near unexpected token `)'
./configure: line 6115: ` 6.[0-6]*)'
I think following fix is needed.
Index: configure.in
===================================================================
--- configure.in (revision 1612973)
+++ configure.in (working copy)
@@ -237,6 +237,7 @@
case `$PCRE_CONFIG --version` in
[[1-5].*])
AC_MSG_ERROR([Need at least pcre version 6.7])
+ ;;
[6.[0-6]*])
AC_MSG_ERROR([Need at least pcre version 6.7])
;;