httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Paul Querna <c...@force-elite.com>
Subject Re: svn commit: r153400 - in httpd/httpd/trunk: Makefile.in configure.in srclib/Makefile.in
Date Tue, 24 May 2005 19:30:23 GMT
jorton@apache.org wrote:
> Author: jorton
> Date: Fri Feb 11 06:08:24 2005
> New Revision: 153400
> 
> URL: http://svn.apache.org/viewcvs?view=rev&rev=153400
> Log:
> Support use of an external copy of the PCRE library:
> 
> * configure.in: Set abs_{builddir,srcdir} higher.  Add --with-pcre
> flag; build against external PCRE library if used.
> 

This adds the path to the libpcre in srclib/pcre to the EXTRA_CFLAGS, eg:
-I/work/apache/httpd-listen-proto/srclib/pcre

This means the installed config_vars.mk references that build path, even
after it is installed.  It would be nice if this could be added only for
the compile, and not exported.

> -APR_SUBDIR_CONFIG(srclib/pcre,
> +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; then :; else
> +       AC_MSG_ERROR([Did not find pcre-config script at $PCRE_CONFIG])
> +     fi
> +     ;;
> +*) PCRE_CONFIG=false ;;
> +esac
> +
> +if test "$PCRE_CONFIG" != "false"; then
> +  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])
>  
> -echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
> +  APR_ADDTO(AP_LIBS, [$abs_builddir/srclib/pcre/libpcre.la])
> +  APR_ADDTO(CPPFLAGS, [-I$abs_builddir/srclib/pcre])

^^ offending bits here

-Paul

Mime
View raw message