diff options
| author | Paul Querna <pquerna@apache.org> | 2008-11-26 23:53:34 +0100 |
|---|---|---|
| committer | Paul Querna <pquerna@apache.org> | 2008-11-26 23:53:34 +0100 |
| commit | 84bd9a2553dc0d6d0e1e97895aad6d5585f0f75e (patch) | |
| tree | 9697b2c9ea0641805b77fcbae8e095091f85e521 /configure.in | |
| parent | Slight clarification to the way rewrite works in per-directory context. (diff) | |
| download | apache2-84bd9a2553dc0d6d0e1e97895aad6d5585f0f75e.tar.xz apache2-84bd9a2553dc0d6d0e1e97895aad6d5585f0f75e.zip | |
Stop bundling PCRE in trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@721020 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/configure.in b/configure.in index 913466e4eb..b380439464 100644 --- a/configure.in +++ b/configure.in @@ -160,37 +160,22 @@ abs_builddir=`pwd` 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}" |