httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/dav/main config.m4
Date Sat, 01 Jul 2000 14:08:25 GMT
gstein      00/07/01 07:08:25

  Modified:    src      Makefile.in configure.in
               src/lib  Makefile.in
               src/modules/dav/fs config.m4
               src/modules/dav/main config.m4
  Log:
  config magic for enabling DAV, Expat, and SDBM.
  *) AP_LIBS contains the target .a files from src/lib/
  *) AP_LIB_DIRS contains add'l directories (besides pcre and apr) that we
     will build (and generate Makefiles for)
  *) apache_need_expat and apache_need_sdbm are two new configure feature
     macros; set by the DAV stuff as needed
  *) hackery to deal with dav/fs/ since it isn't really a module
  *) do endian testing, so we can feed it into Expat to optimize that code
  
  Revision  Changes    Path
  1.23      +1 -2      apache-2.0/src/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Makefile.in,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Makefile.in	2000/06/12 17:24:09	1.22
  +++ Makefile.in	2000/07/01 14:08:21	1.23
  @@ -10,8 +10,7 @@
     main/libmain.la \
     os/$(OS_DIR)/libos.la \
     ap/libap.la \
  -  lib/apr/$(LIBPRE)apr.a \
  -  lib/pcre/libpcre.la
  +  $(AP_LIBS)
   
   PROGRAMS        = $(PROGRAM_NAME)
   targets         = $(PROGRAMS)
  
  
  
  1.72      +30 -0     apache-2.0/src/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/configure.in,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- configure.in	2000/06/30 19:57:49	1.71
  +++ configure.in	2000/07/01 14:08:21	1.72
  @@ -153,8 +153,38 @@
     progname="$withval" ], [
     progname="httpd"] )
   
  +dnl ### util_xml is always included, so we always need Expat (for now)
  +apache_need_expat=yes
  +
  +dnl AP_LIB_DIRS specifies the additional libs from src/lib/ that we need
  +dnl AP_LIBS specifies the actual libraries. note we have two required libs.
  +AP_LIBS="lib/apr/\$(LIBPRE)apr.a lib/pcre/libpcre.la"
  +if test "$apache_need_sdbm" = "yes"; then
  +  AP_LIB_DIRS="$AP_LIB_DIRS sdbm"
  +  AP_LIBS="$AP_LIBS lib/sdbm/libsdbm.la"
  +  INCLUDES="$INCLUDES -I\$(top_srcdir)/lib/sdbm"
  +fi
  +if test "$apache_need_expat" = "yes"; then
  +  AP_LIB_DIRS="$AP_LIB_DIRS expat-lite"
  +  AP_LIBS="$AP_LIBS lib/expat-lite/libexpat.la"
  +  INCLUDES="$INCLUDES -I\$(top_srcdir)/lib/expat-lite"
  +fi
  +APACHE_SUBST(AP_LIB_DIRS)
  +APACHE_SUBST(AP_LIBS)
  +
  +dnl check for endianness
  +if test "$cross_compiling" = "no"; then
  +  AC_C_BIGENDIAN
  +else
  +  AC_DEFINE(AP_UNKNOWN_BYTE_ORDER,1,
  +		[byte order is unknown due to cross-compilation])
  +fi
  +
   APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile)
   APACHE_FAST_OUTPUT(modules/Makefile os/Makefile support/Makefile lib/pcre/Makefile)
  +for i in $AP_LIB_DIRS; do
  +  APACHE_FAST_OUTPUT(lib/$i/Makefile)
  +done
   
   dnl ## Run configure for packages Apache uses
   dnl ## This has been placed at this location for a reason.  This allows
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	2000/05/05 23:17:54	1.4
  +++ Makefile.in	2000/07/01 14:08:23	1.5
  @@ -1,4 +1,4 @@
   
  -SUBDIRS = apr pcre
  +SUBDIRS = apr pcre $(AP_LIB_DIRS)
   
   include $(top_srcdir)/build/rules.mk
  
  
  
  1.2       +27 -0     apache-2.0/src/modules/dav/fs/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/dav/fs/config.m4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.m4	2000/06/28 09:49:09	1.1
  +++ config.m4	2000/07/01 14:08:24	1.2
  @@ -2,4 +2,31 @@
   
   APACHE_MODPATH_INIT(dav/fs)
   
  +dnl ### dav_fs is not a module, but we want to have it enabled/disabled
  +dnl ### like one. with a bit o' work, dav_fs *will* become a true module.
  +
  +dnl ### this is snarfed from APACHE_MODULE. it does not allow dav_fs to be
  +dnl ### shared, and it does not add it into MODLIST. basically... it is
  +dnl ### just a static library to link into Apache at this point
  +AC_DEFUN(DAV_FS_MODULE,[
  +  AC_MSG_CHECKING(whether to enable mod_$1)
  +  define([optname],[  --]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl
  +  AC_ARG_ENABLE(translit($1,_,-),optname() substr([                         ],len(optname()))$2,,enable_$1=ifelse($5,,no,$5))
  +  undefine([optname])dnl
  +  AC_MSG_RESULT($enable_$1)
  +  if test "$enable_$1" != "no"; then
  +    APACHE_MODPATH_ADD($1, , $3)
  +  fi
  +])dnl
  +
  +
  +dnl ### we want to default this based on whether dav is being used...
  +dnl ### but there is no ordering to the config.m4 files right now...
  +DAV_FS_MODULE(dav_fs, DAV provider for the filesystem, , , no)
  +
  +
  +if test "$enable_dav_fs" = "yes"; then
  +  apache_need_sdbm=yes
  +fi
  +
   APACHE_MODPATH_FINISH
  
  
  
  1.3       +14 -0     apache-2.0/src/modules/dav/main/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/dav/main/config.m4,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- config.m4	2000/06/28 11:42:36	1.2
  +++ config.m4	2000/07/01 14:08:25	1.3
  @@ -3,5 +3,19 @@
   APACHE_MODPATH_INIT(dav/main)
   
   APACHE_MODULE(dav, WebDAV protocol handling, , , no)
  +if test "$enable_dav" = "yes"; then
  +  apache_need_expat=yes
  +
  +  INCLUDES="$INCLUDES -I\$(top_srcdir)/$modpath_current"
  +fi
  +
  +dnl ### hack. we reference a symbol from the dav_fs "library", but that lib
  +dnl ### appears on the link line first. nothing refers to the variable, so
  +dnl ### it doesn't get sucked in. we will add the lib one more time *after*
  +dnl ### our location on the link line, so we pick the thing up.
  +if test "$enable_dav" = "yes"; then
  +  BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/../fs/libapachemod_dav_fs.la"
  +fi
  +
   
   APACHE_MODPATH_FINISH
  
  
  

Mime
View raw message