apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr-util/build apu-conf.m4
Date Tue, 14 May 2002 07:50:36 GMT
jerenkrantz    02/05/14 00:50:36

  Modified:    .        configure.in
               build    apu-conf.m4
  Log:
  Add call to APR_MKDIR_P_CHECK.
  Remove APU_SUBDIR_CONFIG and replace with calls to APR_SUBDIR_CONFIG.
  (APR_SUBDIR_CONFIG correctly handles VPATH builds.)
  
  Revision  Changes    Path
  1.49      +3 -0      apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- configure.in	9 May 2002 16:33:07 -0000	1.48
  +++ configure.in	14 May 2002 07:50:36 -0000	1.49
  @@ -35,6 +35,9 @@
   AC_SUBST(top_builddir)
   AC_SUBST(abs_srcdir)
   
  +dnl Initialize mkdir -p functionality.
  +APR_MKDIR_P_CHECK($abs_srcdir/build/mkdir.sh)
  +
   dnl
   dnl set up the compilation flags and stuff
   dnl
  
  
  
  1.39      +2 -42     apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- apu-conf.m4	19 Apr 2002 22:06:34 -0000	1.38
  +++ apu-conf.m4	14 May 2002 07:50:36 -0000	1.39
  @@ -390,46 +390,6 @@
   
   ])
   
  -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
  @@ -537,7 +497,7 @@
   dnl special-case the bundled distribution (use absolute dirs)
   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)
  +  APR_SUBDIR_CONFIG($bundled_subdir)
     expat_include_dir=$top_builddir/$bundled_subdir/lib
     expat_libs=$top_builddir/$bundled_subdir/lib/libexpat.la
     APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
  @@ -546,7 +506,7 @@
     dnl This is a bit of a hack.  This only works because we know that
     dnl we are working with the bundled version of the software.
     bundled_subdir="xml/expat"
  -  APU_SUBDIR_CONFIG($bundled_subdir)
  +  APR_SUBDIR_CONFIG($bundled_subdir)
     expat_include_dir=$top_builddir/$bundled_subdir/lib
     expat_libs=$top_builddir/$bundled_subdir/lib/libexpat.la
     APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
  
  
  

Mime
View raw message