httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@hyperreal.org
Subject cvs commit: apache-2.0/src/modules/standard Makefile.am config.m4
Date Sun, 05 Dec 1999 10:33:43 GMT
manoj       99/12/05 02:33:42

  Modified:    src      acinclude.m4 configure.in
               src/modules/standard Makefile.am config.m4
  Log:
  autoconf: Start adding support for selecting modules on the
  ./configure line. This commit only supports mod_env and mod_log_config.
  
  Revision  Changes    Path
  1.5       +6 -5      apache-2.0/src/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -d -u -r1.4 -r1.5
  --- acinclude.m4	1999/12/05 09:09:16	1.4
  +++ acinclude.m4	1999/12/05 10:33:39	1.5
  @@ -7,19 +7,20 @@
   dnl "shared" can be set to "shared" or "yes" to build the extension as
   dnl a dynamically loadable library.
   dnl
  +dnl XXX - for now, all modules using this function are in modules/standard
   AC_DEFUN(APACHE_MODULE,[
  -  if test -d "$cwd/$srcdir/modules/$1" ; then
  -    MOD_SUBDIRS="$MOD_SUBDIRS $1"
  +  if test -d "$cwd/$srcdir/modules/standard" ; then
  +dnl    MOD_SUBDIRS="$MOD_SUBDIRS $1"
       if test "$2" != "shared" -a "$2" != "yes"; then
         libname=$(basename $1)
         _extlib="libapachemod_${libname}.a"
  -      MOD_LTLIBS="$MOD_LTLIBS modules/$1/libapachemod_${libname}.la"
  -      MOD_LIBS="$MOD_LIBS $1/$_extlib"
  +      MOD_LTLIBS="$MOD_LTLIBS modules/standard/libapachemod_${libname}.la"
  +      MOD_LIBS="$MOD_LIBS standard/$_extlib"
         MOD_STATIC="$MOD_STATIC $1"
       else
         MOD_SHARED="$MOD_SHARED $1"
       fi
  -    APACHE_OUTPUT(modules/$1/Makefile)
  +dnl    APACHE_OUTPUT(modules/$1/Makefile)
     fi
   ])
   
  
  
  
  1.9       +2 -2      apache-2.0/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -d -u -r1.8 -r1.9
  --- configure.in	1999/12/05 08:54:37	1.8
  +++ configure.in	1999/12/05 10:33:40	1.9
  @@ -123,5 +123,5 @@
   dnl ## Build modules.c
   rm -f $srcdir/modules.c
   echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $srcdir/modules.c
  -AC_OUTPUT([Makefile ap/Makefile main/Makefile modules/Makefile os/Makefile
  -          $APACHE_OUTPUT_FILES])
  +AC_OUTPUT([Makefile ap/Makefile main/Makefile modules/Makefile
  +           modules/standard/Makefile os/Makefile $APACHE_OUTPUT_FILES])
  
  
  
  1.3       +9 -4      apache-2.0/src/modules/standard/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/Makefile.am,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -d -u -r1.2 -r1.3
  --- Makefile.am	1999/12/05 09:09:17	1.2
  +++ Makefile.am	1999/12/05 10:33:41	1.3
  @@ -2,12 +2,17 @@
   # by placing each module into its own subdirectory and placing a
   # config.m4 to allow or disallow it in there.
   
  -noinst_LTLIBRARIES = libapachemod_standard.la
  +noinst_LTLIBRARIES = @STANDARD_LIBS@
  +EXTRA_LTLIBRARIES = \
  +libapachemod_env.la \
  +libapachemod_log_config.la \
  +libapachemod_standard.la
  +
  +libapachemod_env_la_SOURCES = mod_env.c
  +libapachemod_log_config_la_SOURCES = mod_log_config.c
   libapachemod_standard_la_SOURCES = \
  -	mod_env.c mod_log_config.c mod_mime.c mod_negotiation.c \
  +	mod_mime.c mod_negotiation.c \
   	mod_include.c mod_autoindex.c mod_dir.c mod_cgi.c mod_asis.c \
   	mod_imap.c mod_actions.c mod_speling.c mod_userdir.c mod_alias.c \
   	mod_access.c mod_auth.c mod_setenvif.c mod_echo.c
  -
  -
   
  
  
  
  1.4       +29 -2     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.3
  retrieving revision 1.4
  diff -u -d -u -r1.3 -r1.4
  --- config.m4	1999/12/05 08:54:39	1.3
  +++ config.m4	1999/12/05 10:33:41	1.4
  @@ -1,7 +1,34 @@
  +dnl modules enabled in this directory by default
  +default_env=yes
  +default_log_config=yes
  +
  +STANDARD_LIBS=""
  +AC_DEFUN(STANDARD_MODULE,[
  +  APACHE_MODULE($1)
  +  STANDARD_LIBS="$STANDARD_LIBS libapachemod_$1.la"
  +])
   
  +dnl XXX - Need to add help text to --enable-module flags
  +dnl XXX - Need to add support for per-module config
  +AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
  +    AC_MSG_CHECKING([whether to enable mod_$1])
  +    AC_ARG_ENABLE(patsubst([$1], _, -), [  --enable-]patsubst([$1], _, -), [],
  +        [enable_$1=$default_$1])
  +    if test "$enable_[$1]" != "no" ; then
  +        MODLIST="$MODLIST $2"
  +        STANDARD_MODULE([$1])
  +    fi
  +    AC_MSG_RESULT([$enable_$1])
  +])
  +
  +APACHE_CHECK_STANDARD_MODULE(env, env)
  +APACHE_CHECK_STANDARD_MODULE(log_config, config_log)
  +
   dnl ## mod_usertrack.c
   AC_CHECK_HEADERS(sys/times.h)
   AC_CHECK_FUNCS(times)
   
  -MODLIST="$MODLIST env config_log mime negotiation includes autoindex dir cgi asis imap
action userdir alias access auth setenvif echo"
  -APACHE_MODULE(standard)
  +MODLIST="$MODLIST mime negotiation includes autoindex dir cgi asis imap action userdir
alias access auth setenvif echo"
  +STANDARD_MODULE(standard)
  +
  +AC_SUBST(STANDARD_LIBS)
  
  
  

Mime
View raw message