httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard config.m4
Date Tue, 27 Jun 2000 20:06:23 GMT
rbb         00/06/27 13:06:22

  Modified:    .        STATUS
               src      acinclude.m4 configure.in
               src/lib/apr .cvsignore Makefile.in aclocal.m4 configure.in
               src/modules/standard config.m4
  Log:
  Detect libraries based on which platform configure is being run on.
  
  Basically, Apache now runs APR's configure script first.  APR's configure
  script has been setup to create a new file, APRVARS.  APRVARS is basically
  all of the environment variables that APR wants to export to the program
  that is using it.  This allows the calling program to "source" APRVARS
  and get those environment variables.
  
  Removed hack to make platforms use -ldl.
  
  Revision  Changes    Path
  1.96      +1 -6      apache-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apache-2.0/STATUS,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- STATUS	2000/06/26 13:13:05	1.95
  +++ STATUS	2000/06/27 20:06:14	1.96
  @@ -1,5 +1,5 @@
   Apache 2.0 STATUS:
  -Last modified at [$Date: 2000/06/26 13:13:05 $]
  +Last modified at [$Date: 2000/06/27 20:06:14 $]
   
   Release:
   
  @@ -23,11 +23,6 @@
               default cgi module on Unix with a threaded MPM is the cgid
               module.  This should be override-able of course.
           Status: Jim Jagielski is looking into this.
  -
  -      - Fix up ./configure to properly detect the various dynamic load
  -          libraries/flags on the different platforms (current, we default
  -          to -ldl which is wrong).
  -        Status:
   
       * suEXEC doesn't work
           Status: Manoj has posted an patch to fix this.
  
  
  
  1.38      +31 -0     apache-2.0/src/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- acinclude.m4	2000/06/20 18:06:51	1.37
  +++ acinclude.m4	2000/06/27 20:06:16	1.38
  @@ -407,3 +407,34 @@
     done
   ])
   ])dnl
  +
  +AC_DEFUN(APACHE_RUN_SUBDIR_CONFIG_NOW, [
  +  echo "configuring package in $1 now"
  +  ac_popdir=`pwd`
  +  ac_abs_srcdir=`(cd $srcdir/$1 && pwd)`
  +  cd $1
  +
  +changequote(, )dnl
  +      # A "../" for each directory in /$config_subdirs.
  +      ac_dots=`echo $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 --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir
  +  then :
  +    echo "$1 configured properly"
  +  else
  +    echo "configure failed for $1"
  +  fi
  +
  +  cd $ac_popdir
  +])
  +
  
  
  
  1.63      +3 -1      apache-2.0/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- configure.in	2000/06/22 22:49:46	1.62
  +++ configure.in	2000/06/27 20:06:16	1.63
  @@ -30,7 +30,9 @@
   fi
   
   dnl ## Run configure for packages Apache uses
  -AC_CONFIG_SUBDIRS(lib/apr)
  +APACHE_RUN_SUBDIR_CONFIG_NOW(lib/apr)
  +source lib/apr/APRVARS
  +
   
   dnl
   dnl ## Preload our OS configuration
  
  
  
  1.8       +1 -0      apache-2.0/src/lib/apr/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/.cvsignore,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- .cvsignore	2000/05/01 15:47:30	1.7
  +++ .cvsignore	2000/06/27 20:06:18	1.8
  @@ -3,6 +3,7 @@
   config.log
   config.status
   configure
  +APRVARS
   objs
   .deps
   LibD
  
  
  
  1.23      +1 -0      apache-2.0/src/lib/apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Makefile.in	2000/04/28 18:27:44	1.22
  +++ Makefile.in	2000/06/27 20:06:18	1.23
  @@ -60,6 +60,7 @@
   	-$(RM) -f *.o *.a *.so
   	-$(RM) -f config.cache config.status config.log configure
   	-$(RM) -f Makefile
  +	-$(RM) -f APRVARS
   	-$(RM) -rf objs
   	cd test; $(MAKE) distclean; cd ..
   
  
  
  
  1.18      +8 -0      apache-2.0/src/lib/apr/aclocal.m4
  
  Index: aclocal.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- aclocal.m4	2000/06/20 22:58:29	1.17
  +++ aclocal.m4	2000/06/27 20:06:18	1.18
  @@ -303,5 +303,13 @@
   fi
   ])
   
  +AC_DEFUN(APR_OUTPUT_VARS,[
  +dnl #----------------------------- output environment variables to a file to
  +dnl #----------------------------- be used by calling program.
  +    rm APRVARS
  +    echo "LIBS=\"$LIBS\"" >> APRVARS
  +])
  +
  +
   sinclude(threads.m4)
   sinclude(hints.m4)
  
  
  
  1.122     +4 -1      apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- configure.in	2000/06/26 19:54:39	1.121
  +++ configure.in	2000/06/27 20:06:19	1.122
  @@ -404,7 +404,8 @@
     [  --enable-dso            Enable dso support ],
     [ tempdso=$enableval],
     [ 
  -    AC_CHECK_LIB(dl, dlopen, tempdso="yes", tempdso="no")
  +    AC_CHECK_LIB(dl, dlopen, [ tempdso="yes" LIBS="$LIBS -ldl" ], 
  +                 tempdso="no")
       if test "$tempdso" = "no"; then
         AC_CHECK_FUNCS(dlopen, [ tempdso="yes" ], [ tempdso="no" ])
       fi
  @@ -650,6 +651,8 @@
   APR_CHECK_GETHOSTBYNAME_NAS
   
   dnl #----------------------------- Construct the files
  +APR_OUTPUT_VARS
  +
   AC_SUBST(LDLIBS)
   AC_SUBST(OPTIM)
   AC_SUBST(RANLIB)
  
  
  
  1.24      +0 -16     apache-2.0/src/modules/standard/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- config.m4	2000/06/12 13:58:49	1.23
  +++ config.m4	2000/06/27 20:06:21	1.24
  @@ -56,22 +56,6 @@
   
   LTFLAGS="$LTFLAGS -export-dynamic"
   
  -PLAT=`$ac_config_guess`
  -PLAT=`$ac_config_sub $PLAT`
  -case "$PLAT" in
  -    *-ibm-os390)
  -        ;;
  -    *-freebsd*)
  -        ;;
  -    *-os2_emx)
  -        ;;
  -    *-beos*)
  -        ;;
  -    *)
  -        LIBS="$LIBS -ldl"
  -        ;;
  -esac
  -
   if test "$sharedobjs" = "yes"; then
       APACHE_CHECK_STANDARD_MODULE(so, DSO capability, , yes)
   else
  
  
  

Mime
View raw message