httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/build rules.mk
Date Tue, 21 Aug 2001 23:41:35 GMT
rbb         01/08/21 16:41:35

  Modified:    .        STATUS configure.in
               build    rules.mk
  Log:
  Allow Apache to use libtool 1.4.  In order to do this, we check the
  libtool version of the machine, and we add the correct flags to the build.
  We also had to remove the --disable-shared in order to make this work
  correctly.
  
  Revision  Changes    Path
  1.274     +1 -14     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.273
  retrieving revision 1.274
  diff -u -r1.273 -r1.274
  --- STATUS	2001/08/17 00:29:08	1.273
  +++ STATUS	2001/08/21 23:41:35	1.274
  @@ -1,5 +1,5 @@
   APACHE 2.0 STATUS:						-*-text-*-
  -Last modified at [$Date: 2001/08/17 00:29:08 $]
  +Last modified at [$Date: 2001/08/21 23:41:35 $]
   
   Release:
   
  @@ -44,19 +44,6 @@
         in a container, it is present in any subcontainers.  It can only be
         added to the filter chain after any filters specified in enclosing
         containers.
  -
  -    * remove the --disable-shared from the subdir config of APR(UTIL)
  -      before the final release. (in fact, it might even be nice to
  -      allow for Apache config/build against an already-installed
  -      APR(UTIL))
  -      Note: we need to do a "make install" for APR(UTIL) so the shared
  -            libraries can be installed properly. We could also use that
  -            point to install include files (rather than have Apache
  -	    know everything that needs to be installed from the
  -	    sub-packages). The original impetus for doing the
  -	    disable-shared was because the shared lib wasn't getting
  -	    installed and a "make clean" in aprutil would make Apache
  -	    fail to load.
   
       * mod_dir should normally redirect ALL directory requests which do
         not include a trailing slash on the URI. However, if a "notes"
  
  
  
  1.171     +20 -4     httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.170
  retrieving revision 1.171
  diff -u -r1.170 -r1.171
  --- configure.in	2001/08/20 12:19:50	1.170
  +++ configure.in	2001/08/21 23:41:35	1.171
  @@ -45,11 +45,11 @@
   
   echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
   
  -APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --disable-shared --prefix=$prefix")
  +APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix")
   
   echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
   
  -APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --disable-shared --prefix=$prefix")
  +APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix")
   
   echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
   
  @@ -103,15 +103,31 @@
         MK_IMPLIB="emximp"
         other_targets="$other_targets os2core"
         INSTALL_PROG_FLAGS="-e .exe"
  +      SHLTCFLAGS=""
  +      LTCFLAGS=""
         ;;
     *)
         if test "x$LTFLAGS" = "x"; then
             LTFLAGS='--silent'
         fi
         LIBTOOL='$(SHELL) $(top_builddir)/srclib/apr/libtool $(LTFLAGS)'
  -      SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)'
  +      libtoolversion=`$abs_builddir/srclib/apr/libtool --version`
  +      case $libtoolversion in
  +          *1.4*)
  +              SH_LIBTOOL='$(LIBTOOL)'
  +              SHLTCFLAGS="-prefer-pic"
  +              LTCFLAGS="-prefer-non-pic -static"
  +              ;;
  +          *)
  +              SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)'
  +              SHLTCFLAGS=""
  +              LTCFLAGS=""
  +              ;;
  +      esac
         ;;
   esac
  +APACHE_SUBST(SHLTCFLAGS)
  +APACHE_SUBST(LTCFLAGS)
   
   case $host in
     *-apple-aux3*)
  @@ -385,7 +401,7 @@
       ;;
   esac
   
  -AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/log_server_status
support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile,,[
  +AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/log_server_status
support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,,[
     APACHE_GEN_MAKEFILES
   ])
   
  
  
  
  1.60      +4 -4      httpd-2.0/build/rules.mk
  
  Index: rules.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/rules.mk,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- rules.mk	2001/05/18 09:45:44	1.59
  +++ rules.mk	2001/08/21 23:41:35	1.60
  @@ -73,11 +73,11 @@
   COMPILE      = $(CC)  $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
   CXX_COMPILE  = $(CXX) $(ALL_CXXFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
   
  -SH_COMPILE     = $(SH_LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@
  -SH_CXX_COMPILE = $(SH_LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch
$@
  +SH_COMPILE     = $(LIBTOOL) --mode=compile $(COMPILE) -prefer-pic -c $< && touch
$@
  +SH_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -prefer-pic-c $< &&
touch $@
   
  -LT_COMPILE     = $(LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@
  -LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@
  +LT_COMPILE     = $(LIBTOOL) --mode=compile $(COMPILE) -prefer-non-pic -static -c $<
&& touch $@
  +LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -prefer-non-pic -static -c $<
&& touch $@
   
   # Link-related commands
   
  
  
  

Mime
View raw message