apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: apr APRVARS.in configure.in
Date Tue, 09 Jan 2001 19:28:39 GMT
rbb         01/01/09 11:28:38

  Modified:    .        configure.in
               .        APRVARS.in configure.in
  Log:
  Fix a compile break with the new APR libtool setup.  Basically, we are
  using a libtool library from MM, but it isn't getting linked into the
  Apache executable, so we fail the link stage.  This makes APR
  publicize the libtool libraries that it uses, so that Apache can link
  them in.
  
  Revision  Changes    Path
  1.114     +2 -1      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- configure.in	2001/01/09 11:35:46	1.113
  +++ configure.in	2001/01/09 19:28:33	1.114
  @@ -204,7 +204,7 @@
   
   dnl AP_LIB_DIRS specifies the additional libs from srclib/ that we need
   dnl AP_LIBS specifies the actual libraries. note we have some required libs.
  -AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/libaprutil.la"
  +AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/libaprutil.la $AP_LIBS"
   
   if test "$apache_need_expat" = "yes"; then
     AP_LIB_DIRS="$AP_LIB_DIRS expat-lite"
  @@ -256,6 +256,7 @@
   dnl get the exported vars from APRUTIL
   . ./srclib/apr-util/export_vars.sh
   EXTRA_LIBS="$EXTRA_LIBS $APRUTIL_EXPORT_LIBS"
  +AP_LIBS="$AP_LIBS $LIBTOOL_LIBS"
   
   APACHE_GEN_CONFIG_VARS
   
  
  
  
  1.5       +1 -0      apr/APRVARS.in
  
  Index: APRVARS.in
  ===================================================================
  RCS file: /home/cvs/apr/APRVARS.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- APRVARS.in	2000/10/25 12:56:00	1.4
  +++ APRVARS.in	2001/01/09 19:28:36	1.5
  @@ -1,3 +1,4 @@
   EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS @THREAD_CPPFLAGS@"
   EXTRA_CFLAGS="$EXTRA_CFLAGS @THREAD_CFLAGS@"
   EXTRA_LIBS="$EXTRA_LIBS @LIBS@"
  +LIBTOOL_LIBS="$LIBTOOL_LIBS @LIBTOOL_LIBS@"
  
  
  
  1.207     +2 -0      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.206
  retrieving revision 1.207
  diff -u -r1.206 -r1.207
  --- configure.in	2001/01/09 11:05:34	1.206
  +++ configure.in	2001/01/09 19:28:36	1.207
  @@ -158,6 +158,7 @@
     sharedmem="1"
     anonymous_shm="1"
     AC_MSG_RESULT(anonymous)
  +  LIBTOOL_LIBS="$abs_srcdir/shmem/unix/mm/libmm.la"
   elif test "$ac_cv_enable_shmem" = "file"; then
     sharedmem="1"
     filebased_shm="1"
  @@ -865,6 +866,7 @@
   AC_SUBST(EXEEXT)
   AC_SUBST(THREAD_CPPFLAGS)
   AC_SUBST(THREAD_CFLAGS)
  +AC_SUBST(LIBTOOL_LIBS)
   
   echo "${nl}Construct Makefiles and header files."
   MAKEFILE1="Makefile lib/Makefile strings/Makefile passwd/Makefile tables/Makefile"
  
  
  

Mime
View raw message