Commit 3d44f677 authored by Philip M. Gollucci's avatar Philip M. Gollucci
Browse files

hook up srclib/libapreq to the build system 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200590 13f79535-47bb-0310-9956-ffa450edef68
parent 30536dd8

buildconf

+8 −0
Original line number Diff line number Diff line
@@ -161,6 +161,14 @@ if [ "$apr_src_dir" = "srclib/apr" ]; then 
    rm -f srclib/apr/apr.spec

fi



apreq_configure="srclib/libapreq"

echo

echo rebuilding $apreq_configure

(cd srclib/libapreq && ./buildconf) || {

    echo "./buildconf failed for apreq"

    exit 1

}



apr_src_dir=`cd $apr_src_dir && pwd` 



if [ $apr_major_version -lt 2 ] ; then

configure.in

+5 −2
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ if test "$apr_found" = "reconfig"; then 
                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],

                    [--enable-layout=*|\'--enable-layout=*])

  dnl We must be the first to build and the last to be cleaned

  AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"

  AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS apr"

  AP_BUILD_SRCLIB_DIRS="apr libapreq $AP_BUILD_SRCLIB_DIRS"

  AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS libapreq apr"



  dnl We have to find apr-N-config when we reconfigure APR.

  for majorver in 1 2; do
@@ -119,6 +119,9 @@ APR_VERSION=`$apr_config --version` 
apr_major_version=`echo ${APR_VERSION} | sed 's,\..*,,'`

APR_CONFIG="$APR_BINDIR/apr-${apr_major_version}-config"



echo $ac_n "${nl}Configuring Apache Request Library...${nl}"

APR_SUBDIR_CONFIG(srclib/libapreq, [--with-apr=../apr/apr-2-config])



echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"



if test "x${apr_major_version}" = "x2"; then

srclib/libapreq/buildconf

+6 −20
Original line number Diff line number Diff line
@@ -17,10 +17,14 @@ 
#

#



if [ "$1" = "--verbose" -o "$1" = "-v" ]; then

    verbose="--verbose"

    shift

fi



# Default place to look for apr source.  Can be overridden with 

#   --with-apr=[directory]

apr_src_dir=../apr

apu_src_dir=../apr-util



while test $# -gt 0 

do
@@ -34,16 +38,13 @@ do 
  --with-apr=*)

  apr_src_dir=$optarg

  ;;

  --with-apr-util=*)

  apu_src_dir=$optarg

  ;;

  esac



  shift

done



if [ -f "$apr_src_dir/build/apr_common.m4" ]; then

  echo ""

  apr_src_dir=`cd $apr_src_dir; pwd`

  echo "Looking for apr source in $apr_src_dir"

else

  echo ""
@@ -53,17 +54,6 @@ else 
  exit 1

fi



if [ -f "$apu_src_dir/build/find_apu.m4" ]; then

  echo ""

  echo "Looking for apr-util source in $apu_src_dir"

else

  echo ""

  echo "Problem finding apr-util source in $apu_src_dir."

  echo "Use:"

  echo "  --with-apr-util=[directory]" 

  exit 1

fi



set -e



# Remove some files, then copy them from apr source tree
@@ -73,10 +63,6 @@ cp $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \ 
   $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess  \

   $apr_src_dir/build/config.sub build



rm -f build/find_apu.m4

cp $apu_src_dir/build/find_apu.m4 build





# Remove aclocal.m4 as it'll break some builds...

rm -rf aclocal.m4 autom4te*.cache

srclib/libapreq/configure.in

+0 −4
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ sinclude(build/apreq-conf.m4) 
sinclude(build/apreq-hints.m4)

sinclude(build/apr_common.m4)

sinclude(build/find_apr.m4)

sinclude(build/find_apu.m4)



dnl Generate ./config.nice for reproducing runs of configure

dnl
@@ -90,8 +89,6 @@ APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`) 


AC_SUBST(CPP)



APREQ_FIND_APU



dnl get our version information

get_version="$abs_srcdir/build/get-version.sh"

version_hdr="$abs_srcdir/include/apreq_version.h"
@@ -125,7 +122,6 @@ dnl 
dnl Prep all the flags and stuff for compilation and export to other builds

dnl

APR_ADDTO(APREQ_LIBS, [$APR_LIBS])

APR_ADDTO(APREQ_LIBS, [$APU_LIBS])



AC_SUBST(APREQ_EXPORT_LIBS)

AC_SUBST(APREQ_PRIV_INCLUDES)