You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2008/11/26 23:53:34 UTC
svn commit: r721020 - in /httpd/httpd/trunk: configure.in srclib/pcre/
Author: pquerna
Date: Wed Nov 26 14:53:34 2008
New Revision: 721020
URL: http://svn.apache.org/viewvc?rev=721020&view=rev
Log:
Stop bundling PCRE in trunk.
Removed:
httpd/httpd/trunk/srclib/pcre/
Modified:
httpd/httpd/trunk/configure.in
Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=721020&r1=721019&r2=721020&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Wed Nov 26 14:53:34 2008
@@ -160,37 +160,22 @@
AC_ARG_WITH(pcre,
APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library))
-case $with_pcre in
-yes) AC_PATH_PROG(PCRE_CONFIG, pcre-config, false) ;;
- /*) if test -d "$with_pcre" && test -x "$with_pcre/bin/pcre-config"; then
- PCRE_CONFIG=$with_pcre/bin/pcre-config
- elif test -x "$with_pcre"; then
- PCRE_CONFIG=$with_pcre
- fi
-
- if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
- AC_MSG_ERROR([Did not find pcre-config script at $PCRE_CONFIG])
- fi
- ;;
-*) PCRE_CONFIG=false ;;
-esac
+AC_PATH_PROG(PCRE_CONFIG, pcre-config, false)
+if test -d "$with_pcre" && test -x "$with_pcre/bin/pcre-config"; then
+ PCRE_CONFIG=$with_pcre/bin/pcre-config
+elif test -x "$with_pcre"; then
+ PCRE_CONFIG=$with_pcre
+fi
if test "$PCRE_CONFIG" != "false"; then
+ if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
+ AC_MSG_ERROR([Did not find pcre-config script at $PCRE_CONFIG])
+ fi
AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
APR_ADDTO(CFLAGS, [`$PCRE_CONFIG --cflags`])
APR_ADDTO(LIBS, [`$PCRE_CONFIG --libs`])
else
- # Build the bundled PCRE
- AC_MSG_NOTICE([Configuring PCRE regular expression library])
-
- APR_SUBDIR_CONFIG(srclib/pcre,
- [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir])
-
- APR_ADDTO(AP_LIBS, [$abs_builddir/srclib/pcre/libpcre.la])
- APR_ADDTO(INCLUDES, [-I\$(top_builddir)/srclib/pcre])
-
- AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS pcre"
- AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS pcre"
+ AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/])
fi
echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
Re: svn commit: r721020 - in /httpd/httpd/trunk: configure.in srclib/pcre/
Posted by "Philip M. Gollucci" <pg...@p6m7g8.com>.
pquerna@apache.org wrote:
> Author: pquerna
> Date: Wed Nov 26 14:53:34 2008
> New Revision: 721020
>
> URL: http://svn.apache.org/viewvc?rev=721020&view=rev
> Log:
> Stop bundling PCRE in trunk.
Definitely needs an entry in CHANGES IMHO.
--
------------------------------------------------------------------------
Philip M. Gollucci (pgollucci@p6m7g8.com)
c:703.336.9354
Consultant - P6M7G8 Inc. - http://p6m7g8.net
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C
Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.