apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@locus.apache.org
Subject cvs commit: apr-util/build apu-conf.m4
Date Tue, 12 Dec 2000 09:44:54 GMT
gstein      00/12/12 01:44:54

  Modified:    .        .cvsignore configure.in
               build    apu-conf.m4
  Added:       .        export_vars.sh.in
  Log:
  pick up exported vars from APR, and export some of our own.
  
  (in particular, this lets us compile/link testdbm successfully with a
  threaded APR because we pick up the thread compile/linkflags; our vars
  include stuff like -lgdbm when APRUTIL is configured using --with-dbm=gdbm)
  
  Revision  Changes    Path
  1.4       +1 -0      apr-util/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/apr-util/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- .cvsignore	2000/12/06 02:12:22	1.3
  +++ .cvsignore	2000/12/12 09:44:52	1.4
  @@ -8,3 +8,4 @@
   libtool
   libaprutil.la
   aprutil.exports
  +export_vars.sh
  
  
  
  1.4       +19 -1     apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- configure.in	2000/12/12 09:10:33	1.3
  +++ configure.in	2000/12/12 09:44:52	1.4
  @@ -35,11 +35,29 @@
   dnl
   INCLUDES="-I\$(top_builddir)/include/private -I\$(top_builddir)/include -I$APR_INCLUDES"
   
  -CFLAGS="$CFLAGS $INCLUDES"
  +dnl
  +dnl grab flags from APR.
  +dnl ### APR doesn't have "nice" names for its exports (yet), but it isn't
  +dnl ### a problem to deal with them right here
  +dnl
  +. "$APR_SOURCE_DIR/APRVARS"
  +APR_EXPORT_CPPFLAGS="$EXTRA_CPPFLAGS"
  +APR_EXPORT_CFLAGS="$EXTRA_CFLAGS"
  +APR_EXPORT_LIBS="$EXTRA_LIBS"
   
  +dnl
  +dnl Prep all the flags and stuff for compilation and export to other builds
  +dnl
  +CFLAGS="$CFLAGS $INCLUDES $APR_EXPORT_CFLAGS $APR_EXPORT_CPPFLAGS"
  +LIBS="$LIBS $APR_EXPORT_LIBS"
   
  +AC_SUBST(APRUTIL_EXPORT_LIBS)
  +
  +dnl
  +dnl everthing is done. 
   AC_OUTPUT([
   	Makefile
  +	export_vars.sh
   	build/Makefile
   	build/rules.mk
   	include/private/apu_private.h
  
  
  
  1.1                  apr-util/export_vars.sh.in
  
  Index: export_vars.sh.in
  ===================================================================
  #
  # export_vars.sh
  #
  # This shell script is used to export vars to the application using the
  # APRUTIL library. This script should be "sourced" to ensure the variable
  # values are set within the calling script's context. For example:
  #
  #   $ . path/to/apr-util/export_vars.sh
  #
  
  APRUTIL_EXPORT_LIBS="@APRUTIL_EXPORT_LIBS@"
  
  
  
  1.2       +4 -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.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- apu-conf.m4	2000/12/06 02:19:47	1.1
  +++ apu-conf.m4	2000/12/12 09:44:53	1.2
  @@ -74,7 +74,11 @@
   AC_SUBST(apu_use_gdbm)
   
   if test $apu_use_gdbm = 1; then
  +  lib_save="$LIBS"
  +  LIBS=""
     AC_CHECK_LIB(gdbm, gdbm_open)
  +  APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LIBS"
  +  LIBS="$lib_save $LIBS"
   fi
   
   ])
  
  
  

Mime
View raw message