apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: apr-util/build apu-conf.m4
Date Wed, 28 Feb 2001 15:18:37 GMT
gstein      01/02/28 07:18:37

  Modified:    .        buildconf.sh
               build    apu-conf.m4
  Log:
  *) buildconf.sh should invoke expat's buildconf.sh, if it exists
  *) expat.h.in is a more reliable test for an Expat distribution
  *) look for xml/expat-cvs before xml/expat
  *) invoke expat's configuration when APRUTIL is configured
     Note: we needed to copy over APR_SUBDIR_CONFIG (and rename) since APRUTIL
           is not (yet) including apr/build/apr_common.m4 (and it is a big
           change to do that use/sharing)
  
  Revision  Changes    Path
  1.7       +9 -0      apr-util/buildconf.sh
  
  Index: buildconf.sh
  ===================================================================
  RCS file: /home/cvs/apr-util/buildconf.sh,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- buildconf.sh	2001/01/06 21:46:34	1.6
  +++ buildconf.sh	2001/02/28 15:18:37	1.7
  @@ -29,3 +29,12 @@
   echo "Creating configure ..."
   ### do some work to toss config.cache?
   autoconf
  +
  +#
  +# If Expat has been bundled, then go and configure the thing
  +#
  +if test -d xml/expat; then
  +  echo "Invoking xml/expat/buildconf.sh ..."
  +  (cd xml/expat; ./buildconf.sh)
  +fi
  +### expat-cvs (from SourceForge's CVS) does not have a buildconf.sh (yet)
  
  
  
  1.5       +47 -5     apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- apu-conf.m4	2001/02/24 14:17:24	1.4
  +++ apu-conf.m4	2001/02/28 15:18:37	1.5
  @@ -241,6 +241,46 @@
   
   ])
   
  +dnl APU_SUBDIR_CONFIG
  +dnl ### we should use APR's copy of this
  +AC_DEFUN(APU_SUBDIR_CONFIG, [
  +  # save our work to this point; this allows the sub-package to use it
  +  AC_CACHE_SAVE
  +
  +  echo "configuring package in $1 now"
  +  ac_popdir=`pwd`
  +  ac_abs_srcdir=`(cd $srcdir/$1 && pwd)`
  +  apr_config_subdirs="$1"
  +  test -d $1 || $MKDIR $1
  +  cd $1
  +
  +changequote(, )dnl
  +      # A "../" for each directory in /$config_subdirs.
  +      ac_dots=`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
  +changequote([, ])dnl
  +
  +  # Make the cache file name correct relative to the subdirectory.
  +  case "$cache_file" in
  +  /*) ac_sub_cache_file=$cache_file ;;
  +  *) # Relative path.
  +    ac_sub_cache_file="$ac_dots$cache_file" ;;
  +  esac
  +
  +  # The eval makes quoting arguments work.
  +  if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir
$2
  +  then :
  +    echo "$1 configured properly"
  +  else
  +    echo "configure failed for $1"
  +    exit 1
  +  fi
  +
  +  cd $ac_popdir
  +
  +  # grab any updates from the sub-package
  +  AC_CACHE_LOAD
  +])dnl
  +
   dnl
   dnl APU_TEST_EXPAT(directory): test if Expat is located in the specified dir
   dnl
  @@ -249,7 +289,7 @@
   AC_DEFUN(APU_TEST_EXPAT,[
     AC_MSG_CHECKING(for Expat in ifelse($2,,$1,$2))
   
  -  if test -r "$1/lib/expat.h"; then
  +  if test -r "$1/lib/expat.h.in"; then
       dnl Expat 1.95.* distribution
       expat_include_dir="$1/lib"
       expat_libs="$1/lib/libexpat.la"
  @@ -311,7 +351,7 @@
   ])
   
   if test -z "$expat_include_dir"; then
  -  for d in /usr /usr/local xml/expat ; do
  +  for d in /usr /usr/local xml/expat-cvs xml/expat ; do
       APU_TEST_EXPAT($d)
       if test -n "$expat_include_dir"; then
         break
  @@ -327,9 +367,11 @@
   fi
   
   dnl special-case the bundled distribution (use absolute dirs)
  -if test "$expat_include_dir" = "xml/expat/lib"; then
  -  expat_include_dir=$srcdir/xml/expat/lib
  -  expat_libs=$top_builddir/xml/expat/lib/libexpat.la
  +if test "$expat_include_dir" = "xml/expat/lib" -o "$expat_include_dir" = "xml/expat-cvs/lib";
then
  +  bundled_subdir="`echo $expat_include_dir | sed -e 's%/lib%%'`"
  +  APU_SUBDIR_CONFIG($bundled_subdir)
  +  expat_include_dir=$srcdir/$bundled_subdir/lib
  +  expat_libs=$top_builddir/$bundled_subdir/lib/libexpat.la
   fi
   
   INCLUDES="$INCLUDES -I$expat_include_dir"
  
  
  

Mime
View raw message