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, 16 Apr 2002 07:14:50 GMT
jerenkrantz    02/04/16 00:14:50

  Modified:    .        CHANGES apu-config.in
               build    apu-conf.m4
  Log:
  Add --old-expat option to apu-config to allow users of apr-util to
  determine what expat it should expect to be installed.  If the
  flag is set to yes, it should include xmlparse.h.  If it is set to
  no, it should include expat.h.
  
  Revision  Changes    Path
  1.62      +5 -0      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- CHANGES	16 Apr 2002 06:55:59 -0000	1.61
  +++ CHANGES	16 Apr 2002 07:14:50 -0000	1.62
  @@ -1,5 +1,10 @@
   Changes with APR-util b1  
   
  +  *) Add --old-expat option to apu-config to allow users of apr-util to
  +     determine what expat it should expect to be installed.  If the
  +     flag is set to yes, it should include xmlparse.h.  If it is set to
  +     no, it should include expat.h.  [Justin Erenkrantz]
  +
     *) Fix exporting of includes in apu-config.  [Justin Erenkrantz]
   
     *) Change bucket brigades API to allow a "bucket allocator" to be
  
  
  
  1.10      +10 -0     apr-util/apu-config.in
  
  Index: apu-config.in
  ===================================================================
  RCS file: /home/cvs/apr-util/apu-config.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- apu-config.in	16 Apr 2002 06:55:59 -0000	1.9
  +++ apu-config.in	16 Apr 2002 07:14:50 -0000	1.10
  @@ -67,6 +67,7 @@
   
   APU_SOURCE_DIR="@top_srcdir@"
   APU_BUILD_DIR="@top_builddir@"
  +APR_XML_EXPAT_OLD="@APR_XML_EXPAT_OLD@"
   
   show_usage()
   {
  @@ -82,6 +83,7 @@
     --link-ld         print link switch(es) for linking to APR-util
     --link-libtool    print the libtool inputs for linking to APR-util
     --apu-la-file     print the path to the .la file, if available
  +  --old-expat       indicate if APR-util was built against an old expat
     --help            print this help
   
   When linking with libtool, an application should do something like:
  @@ -180,6 +182,14 @@
       if test -f "$LA_FILE"; then
           flags="$flags $LA_FILE"
       fi
  +    ;;
  +    --old-expat)
  +    if test ! -n "$APR_XML_EXPAT_OLD"; then
  +        echo "no"
  +    else
  +        echo "$APR_XML_EXPAT_OLD"
  +    fi
  +    exit 0
       ;;
       --help)
       show_usage
  
  
  
  1.37      +2 -0      apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- apu-conf.m4	1 Mar 2002 05:50:27 -0000	1.36
  +++ apu-conf.m4	16 Apr 2002 07:14:50 -0000	1.37
  @@ -548,8 +548,10 @@
   fi
   fi
   APR_XML_DIR=$bundled_subdir
  +APR_XML_EXPAT_OLD=$expat_old
   AC_SUBST(APR_XML_SUBDIRS)
   AC_SUBST(APR_XML_DIR)
  +AC_SUBST(APR_XML_EXPAT_OLD)
   
   if test "$expat_include_dir" != "/usr/include"; then
     APR_ADDTO(APRUTIL_INCLUDES, [-I$expat_include_dir])
  
  
  

Mime
View raw message