httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: httpd-2.0 CHANGES configure.in
Date Fri, 11 May 2001 08:12:13 GMT
fielding    01/05/11 01:12:12

  Modified:    .        CHANGES configure.in
  Log:
  Simplify the configuration process by moving all libtool stuff to APR
  and moving the last bits of hints.m4 inline.  Now we only run every
  test four times instead of five.  One down, three to go.
  
  Revision  Changes    Path
  1.194     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.193
  retrieving revision 1.194
  diff -u -r1.193 -r1.194
  --- CHANGES	2001/05/11 04:35:28	1.193
  +++ CHANGES	2001/05/11 08:12:04	1.194
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.18-dev
   
  +  *) Simplify the configure process by moving all libtool stuff to APR
  +     and moving hints.m4 inline.  [Roy Fielding]
  +
     *) Add the AP_DECLARE()/AP_CORE_DECLARE macros on the return types
        of functions used by mod_proxy for export in the DLL 
        [Ian Holsman <IanH@cnet.com>]
  
  
  
  1.149     +32 -5     httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.148
  retrieving revision 1.149
  diff -u -r1.148 -r1.149
  --- configure.in	2001/05/11 07:15:07	1.148
  +++ configure.in	2001/05/11 08:12:06	1.149
  @@ -16,7 +16,6 @@
   sinclude(srclib/apr/build/apr_common.m4)
   sinclude(srclib/apr/build/apr_network.m4)
   sinclude(srclib/apr/build/apr_threads.m4)
  -sinclude(hints.m4)
   sinclude(acinclude.m4)
   
   dnl Save user-defined environment settings for later restoration
  @@ -88,6 +87,8 @@
     APR_ADDTO(INCLUDES, [-I. -I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_NAME)
-I\$(top_srcdir)/modules/http -I\$(top_srcdir)/include -I\$(top_srcdir)/srclib/apr/include
-I\$(top_srcdir)/srclib/apr-util/include])
   fi
   
  +echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}"
  +
   AC_CANONICAL_SYSTEM
   
   case "$host_alias" in
  @@ -107,9 +108,35 @@
         ;;
   esac
   
  -dnl
  -dnl ## Preload our OS configuration
  -APACHE_PRELOAD
  +case "$host" in
  +  *-apple-aux3*)
  +      APR_SETVAR(APACHE_MPM, [prefork])
  +      APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
  +      ;;
  +  *-beos*)
  +      APR_SETVAR(APACHE_MPM, [beos])
  +      APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
  +      ;;
  +  *os2_emx*)
  +      APR_SETVAR(APACHE_MPM, [spmt_os2])
  +      APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
  +      ;;
  +  *-linux-*)
  +      case `uname -r` in
  +        2.2* ) APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
  +            ;;
  +        * )
  +            ;;
  +      esac
  +      ;;
  +  *486-*-bsdi* | *-netbsd* | *-freebsd* | *-apple-darwin* | *-dec-osf* | *-qnx)
  +      APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
  +      ;;
  +  *-solaris2*)
  +      dnl  This is a hack -- we should be using AC_TRY_RUN instead
  +      ap_platform_runtime_link_flag="-R"
  +      ;;
  +esac
   
   dnl
   dnl Process command line arguments. This is done early in the process so the
  @@ -205,7 +232,7 @@
   
   if test "$apache_need_shared" = "yes"; then
     $SHELL $ac_aux_dir/ltconfig --output=shlibtool --disable-static --srcdir=$ac_aux_dir
--cache-file=./config.cache $ac_aux_dir/ltmain.sh
  -  case $PLATFORM in
  +  case "$host" in
       *-ibm-aix*)
         HTTPD_LDFLAGS="$HTTPD_LDFLAGS -Wl,-bE:$abs_srcdir/support/httpd.exp"
         SH_LDFLAGS="$SH_LDFLAGS -Wl,-bI:$abs_srcdir/support/httpd.exp"
  
  
  

Mime
View raw message