pier 02/04/30 17:37:16
Modified: webapp Makedefs.in Makefile.in configure.in
webapp/apache-1.3 Makefile.in
webapp/lib Makefile.in
Log:
Reorganization and clean-up of all the autoconf code, with the objective
to build Apache 2.0 binaries from APXS/2.0 tomorrow...
Revision Changes Path
1.14 +29 -119 jakarta-tomcat-connectors/webapp/Makedefs.in
Index: Makedefs.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makedefs.in 1 Nov 2001 22:20:51 -0000 1.13
+++ Makedefs.in 1 May 2002 00:37:16 -0000 1.14
@@ -56,126 +56,36 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makedefs.in,v 1.13 2001/11/01 22:20:51 pier Exp $
+# @version $Id: Makedefs.in,v 1.14 2002/05/01 00:37:16 pier Exp $
.SUFFIXES: .c .o .lo
-# -------------------------------------------------------------------------
-# Programs discovered by "configure" during initialization
-# -------------------------------------------------------------------------
-
-TEST = @TEST@
-TRUE = @TRUE@
-ECHO = @ECHO@
-GREP = @GREP@
-CAT = @CAT@
-SED = @SED@
-LN = @LN@
-RM = @RM@
-
-# -------------------------------------------------------------------------
-# Compilation settings and Makefile macros
-# -------------------------------------------------------------------------
-
-# The target module to build
-MODULE = @MODULE@
-# The system which built this binary
-SYSTEM = @SYSTEM@
-# Wether to build debug information or not
-DEBUG = @DEBUG@
-# The WebApp sources directory
-SRCDIR = @SRCDIR@
-# The compilation (this) directory
-TGTDIR = @TGTDIR@
-# The directory of a Tomcat 4.0 binary distribution
-TC4DIR = @TC4DIR@
-# The list of configure-generated files
-CFGFILES = @CFGFILES@ ./config.cache ./config.log ./config.status
-# The file holding the list of makefile-generated files
-LSTFILE = $(TGTDIR)/config.list
-# GNU-Make style echo
-MECHO = $(ECHO) "$(MAKE)[$(MAKELEVEL)]:"
-
-# -------------------------------------------------------------------------
-# APR library values
-# -------------------------------------------------------------------------
-
-# The APR source directory (if needed)
-APR_SRCDIR = @APR_SRCDIR@
-# Where libapr.a resides
-APR_LIBDIR = @APR_LIBDIR@
-# Where APR include files are located
-APR_INCDIR = @APR_INCDIR@
-# Location of APRVARS
-APR_VARFIL = @APR_VARFIL@
-# Extra APR C compilation flags
-APR_CFLAGS = @APR_CFLAGS@
-# Extra APR C macro pre-processor flags
-APR_CPPFLAGS = @APR_CPPFLAGS@
-# Extra APR inclusion flags
-APR_INCLUDES = @APR_INCLUDES@
-# Extra APR linker flags
-APR_LDFLAGS = @APR_LDFLAGS@
-# Extra APR libraries required for linking
-APR_LIBS = @APR_LIBS@
-# Libtool location
-LIBTOOL = @LIBTOOL@
-
-# -------------------------------------------------------------------------
-# C Compiler settings
-# -------------------------------------------------------------------------
-
-# Library archiver
-AR = @AR@
-# C compiler
-CC = @CC@
-# C macro pre-processor
-CPP = @CPP@
-# Library updater
-RANLIB = @RANLIB@
-# C compilation flags
-CFLAGS = @CFLAGS@
-# C macro pre-processor flags
-CPPFLAGS = @CPPFLAGS@
-
-# -------------------------------------------------------------------------
-# Java Compiler settings
-# -------------------------------------------------------------------------
-
-# The JVM home directory
-JAVA_HOME = @JAVA_HOME@
-# Jar archiver
-JAR = @JAR@
-# Java compiler
-JAVAC = @JAVAC@
-# JavaDoc documentation tool
-JAVADOC = @JAVADOC@
-# Java compilation flags
-JAVACFLAGS = @JAVACFLAGS@
-# Java Class Path
-CLASSPATH = @CLASSPATH@
-
-# -------------------------------------------------------------------------
-# ScanDoc Documentation tool settings
-# -------------------------------------------------------------------------
-
-# PERL interpreter
-PERL = @PERL@
-# ScanDoc documentation tool
-SCANDOC = @SCANDOC@
-# Scandoc flags
-SCANDOCFLAGS = @SCANDOCFLAGS@
-
-# -------------------------------------------------------------------------
-# C-Compilation default setting
-# -------------------------------------------------------------------------
-
-ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) \
- $(APR_CFLAGS) $(APR_CPPFLAGS) $(APR_INCLUDES) \
- -I$(APR_INCDIR) -I$(SRCDIR)/include
+# Building tools
+CC = @CC@
+CPP = @CPP@
+SHELL = @SHELL@
+LIBTOOL = @LIBTOOL@
+APXS = @APXS@
-.c.o:
- $(CC) $(ALL_CFLAGS) -c "$<" -o "$@"
-
-.c.lo:
- $(LIBTOOL) $(CC) -static $(ALL_CFLAGS) -c "$<"
+# Build flags
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+INCLUDES = @INCLUDES@
+
+# Module to build
+MODULE = @MODULE@
+
+# Directories location
+APR_DIR = @APR_DIR@
+SRC_DIR = @SRC_DIR@
+TGT_DIR = @TGT_DIR@
+
+# Compilation template
+%.lo: $(LOCAL_SRC_DIR)/%.c
+ $(LIBTOOL) --mode=compile \
+ $(CC) -c $< -o $@ \
+ $(INCLUDES) \
+ $(LOCAL_INCLUDES) \
+ $(CPPFLAGS) $(CFLAGS)
1.27 +42 -61 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.in 23 Jan 2002 17:48:50 -0000 1.26
+++ Makefile.in 1 May 2002 00:37:16 -0000 1.27
@@ -56,74 +56,55 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.26 2002/01/23 17:48:50 remm Exp $
+# @version $Id: Makefile.in,v 1.27 2002/05/01 00:37:16 pier Exp $
-include @TGTDIR@/Makedefs
+include @TGT_DIR@/Makedefs
-all: build
-build: @TARGET_BUILD@
-clean: @TARGET_CLEAN@
-lbuild: @TARGET_LBUILD@
-lclean: @TARGET_LCLEAN@
-
-distclean: clean
- @$(ECHO) "" >> $(LSTFILE)
- @$(MECHO) "Removing makefile generated files"
- $(RM) -f `$(CAT) $(LSTFILE)`
- $(RM) -f $(LSTFILE)
- @$(MECHO) "Removing configure generated files"
- $(RM) -f $(CFGFILES)
+all: extra-build
-apr-build:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="$(APR_SRCDIR)" MTGT="all"
- @$(MECHO) "Installing APR library in \"$(APR_LIBDIR)\""
- @$(APR_SRCDIR)/libtool --silent --mode=install \
- $(SRCDIR)/support/install.sh -c \
- $(APR_SRCDIR)/libapr.la \
- $(APR_LIBDIR) 2>/dev/null
- @$(APR_SRCDIR)/libtool --silent --mode=finish \
- $(APR_LIBDIR)
+distclean: extra-clean
+ rm -f $(MODULE)/Makefile
+ rm -f lib/Makefile
+ rm -f Makedefs
+ rm -f Makefile
-apr-clean:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="$(APR_SRCDIR)" MTGT="clean"
- @$(MECHO) "Cleaning up APR library in \"$(APR_LIBDIR)\""
- @$(RM) -f $(APR_LIBDIR)/libapr.*
+extra-build: @EXTRA_BUILD@ build
+extra-clean: @EXTRA_BUILD@ clean
+build: lib-build $(MODULE)-build
+clean: lib-clean $(MODULE)-clean
+
+$(MODULE)-build: libapr.la
+ @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(TGT_DIR)/$(MODULE)" SUBT="build" subdir
+
+$(MODULE)-clean:
+ @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(TGT_DIR)/$(MODULE)" SUBT="clean" subdir
lib-build:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="lib" MTGT="build"
+ @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(TGT_DIR)/lib" SUBT="build" subdir
+ @echo "$(MAKE): Installing library libwebapp.la"
+ $(LIBTOOL) --mode=install cp \
+ $(TGT_DIR)/lib/libwebapp.la \
+ $(TGT_DIR)/libwebapp.la > /dev/null
lib-clean:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="lib" MTGT="clean"
+ @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(TGT_DIR)/lib" SUBT="clean" subdir
+ rm -f libwebapp.la
+ rm -f libwebapp.a
-apache-1.3-build:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-1.3" MTGT="build"
-
-apache-1.3-clean:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-1.3" MTGT="clean"
+apr-build:
+ @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(APR_DIR)" SUBT="all" subdir
+ @echo "$(MAKE): Installing library libapr.la"
+ $(LIBTOOL) --mode=install cp \
+ $(APR_DIR)/libapr.la \
+ $(TGT_DIR)/libapr.la > /dev/null
-apache-2.0-build:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-2.0" MTGT="build"
-
-apache-2.0-clean:
- @$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-2.0" MTGT="clean"
-
-apidocs-c-build:
- mkdir docs/api-c
- support/scandoc.pl -i support/template.pl -p docs/api-c/ */*.h
-apidocs-c-clean:
- $(RM) -rf docs/api-c
-
-template:
- @ { \
- $(ECHO) "" ; \
- $(MECHO) "Entering directory \"$(MDIR)\"" ; \
- cd $(MDIR) ; \
- $(MECHO) "Invoking \"$(MAKE) $(MFLG) $(MTGT)\"" ; \
- $(MAKE) $(MFLG) $(MTGT); \
- RET=$$? ; \
- $(MECHO) "Exiting directory \"$(MDIR)\"" ; \
- cd $(SRCDIR) ; \
- if test "$${RET}" != "0" ; then \
- exit $${RET} ; \
- fi ; \
- }
+apr-clean:
+ @$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(APR_DIR)" SUBT="clean" subdir
+ rm -f libapr.la
+ rm -f libapr.a
+
+subdir:
+ @echo ""
+ @echo "$(MAKE)[$(MAKELEVEL)]: Entering directory \"$(SUBD)\""
+ @$(MAKE) -C "$(SUBD)" $(SUBF) "$(SUBT)"
+ @echo "$(MAKE)[$(MAKELEVEL)]: Exiting directory \"$(SUBD)\""
1.52 +108 -488 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- configure.in 28 Apr 2002 19:21:07 -0000 1.51
+++ configure.in 1 May 2002 00:37:16 -0000 1.52
@@ -57,508 +57,128 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-dnl Author Jon S. Stevens <mailto:[EMAIL PROTECTED]>
-dnl Version $Id: configure.in,v 1.51 2002/04/28 19:21:07 pier Exp $
+dnl Version $Id: configure.in,v 1.52 2002/05/01 00:37:16 pier Exp $
dnl --------------------------------------------------------------------------
+sinclude(./support/wa_util.m4)
+sinclude(./support/wa_exec.m4)
+sinclude(./support/wa_apr.m4)
+sinclude(./support/wa_apxs.m4)
+
dnl --------------------------------------------------------------------------
-dnl Initialize
-dnl New vars: TEST TRUE ECHO GREP CAT SED RM SYSTEM
-dnl Upd vars: N/A
-dnl --------------------------------------------------------------------------
-sinclude(./support/aplocal.m4)
-AC_INIT([Makefile.in])
-AC_CONFIG_AUX_DIR([support])
-LOCAL_INIT()
-AC_CANONICAL_HOST()
-SYSTEM="${host_os}-${host_cpu}"
-AC_SUBST(SYSTEM)
-
-dnl --------------------------------------------------------------------------
-dnl Setup initial variable value
-dnl
-dnl New vars: MODULE TARGET CFGFILES
-dnl APR_CFGFLG APR_SRCDIR APR_LIBDIR APR_INCDIR APR_VARFIL
-dnl Upd vars: N/A
-dnl --------------------------------------------------------------------------
-MODULE=""
-TARGET="lib"
-CFGFILES="./Makefile ./Makedefs ./lib/Makefile"
-APR_CFGFLG=""
-APR_SRCDIR=""
-APR_LIBDIR=""
-APR_INCDIR=""
-APR_VARFIL=""
-
-AC_SUBST(MODULE)
-AC_SUBST(TARGET)
-AC_SUBST(CFGFILES)
-AC_SUBST(APR_CFGFLG)
-AC_SUBST(APR_SRCDIR)
-AC_SUBST(APR_LIBDIR)
-AC_SUBST(APR_INCDIR)
-AC_SUBST(APR_VARFIL)
-
-dnl --------------------------------------------------------------------------
-dnl Check where sources are
-dnl
-dnl New vars: SRCDIR
-dnl Upd vars: N/A
-dnl --------------------------------------------------------------------------
-LOCAL_RESOLVEDIR(SRCDIR,[${srcdir}],[sources directory])
-LOCAL_RESOLVEDIR(TGTDIR,[.],[targets directory])
-AC_SUBST(SRCDIR)
-
-dnl -------------------------------------------------------------------------
-dnl Check C environment
-dnl
-dnl We need to check local compilation in case the user got an APR
-dnl distribution from a binary tarball (such as in Apache 2.0) and the
-dnl compiler is not available.
-dnl
-dnl New vars: AR RANLIB CC CFLAGS CPP CPPFLAGS
-dnl Upd vars: N/A
-dnl -------------------------------------------------------------------------
-LOCAL_HEADER([C-Language compilation tools])
-LOCAL_CHECK_PROG(AR,ar)
-AC_CHECK_TOOL(RANLIB, ranlib, true)
-AC_SUBST(AR)
-AC_SUBST(RANLIB)
-AC_PROG_CC()
-local_cc="${CC}"
-LOCAL_CHECK_PROG(CC,"${local_cc}")
-unset local_cc
-AC_PROG_CC_C_O()
-AC_PROG_CPP()
-AC_SUBST(CPPFLAGS)
-
-dnl -------------------------------------------------------------------------
-dnl Optional compilation flags
-dnl
-dnl New vars: DEBUG
-dnl Upd vars: CPPFLAGS
-dnl -------------------------------------------------------------------------
-LOCAL_HELP([External libraries and compilation flags])
-AC_MSG_CHECKING([for debug build])
-AC_ARG_ENABLE(debug,
- [ --enable-debug enable compilation of debug information messages
- within C code (this will slow down
- execution and create huge log files).],
- [
- AC_MSG_RESULT([yes])
- DEBUG="true"
- CPPFLAGS="${CPPFLAGS} -DDEBUG"
- ],[
- AC_MSG_RESULT([no])
- DEBUG="false"
- ]
-)
-AC_SUBST(DEBUG)
-
-dnl -------------------------------------------------------------------------
-dnl Check wether we have to build the C API documentation or not
-dnl
-dnl New vars: PERL SCANDOC SCANDOCFLAGS
-dnl Upd vars: TARGET
-dnl -------------------------------------------------------------------------
-LOCAL_HEADER([API documentation generation])
-AC_MSG_CHECKING([for C API documentation])
-AC_ARG_ENABLE(apidocs-c,
- [ --enable-apidocs-c[=PERL]
- enable generation of C API documentation using
- ScanDoc (PERL is the name of the Perl interpreter
- used to run ScanDoc. If not specified this is
- looked up in your current path).],
- [
- AC_MSG_RESULT([yes])
-
- AC_MSG_CHECKING([for Perl interpreter])
- case "${enableval}" in
- ""|"yes"|"YES"|"true"|"TRUE")
- LOCAL_CHECK_PROG(PERL,perl)
- ;;
- *)
- PERL="${enableval}"
- ;;
- esac
-
- if ${TEST} ! -x "${PERL}"
- then
- AC_MSG_RESULT([error])
- AC_MSG_ERROR([cannot execute perl \"${PERL}\"])
- fi
- AC_MSG_RESULT([${PERL}])
+dnl Initialize GNU Autoconf (note, this requires autoconf vers. >= 2.52)
+dnl --------------------------------------------------------------------------
+AC_INIT([WebApp Module],[2.0],[http://nagoya.apache.org/bugzilla])
+AC_CONFIG_SRCDIR([configure.in])
- AC_MSG_CHECKING([for ScanDoc to use])
- SCANDOC="${SRCDIR}/support/scandoc.pl"
- if ${TEST} ! -f "${SCANDOC}"
- then
- AC_MSG_RESULT([error])
- AC_MSG_ERROR([cannof find ScanDoc \"${SCANDOC}\"])
- fi
- AC_MSG_RESULT([${SCANDOC}])
+dnl --------------------------------------------------------------------------
+dnl Get rid of all that "--prefix" ... "--xxxdir" in the help message
+dnl --------------------------------------------------------------------------
+WA_HELP()
- AC_MSG_CHECKING([for ScanDoc template])
- if ${TEST} ! -f "${SRCDIR}/support/template.pl"
- then
- AC_MSG_RESULT([error])
- AC_MSG_ERROR([cannof find ScanDoc \"${SRCDIR}/support/template.pl\"])
- fi
- AC_MSG_RESULT([${SRCDIR}/support/template.pl])
- SCANDOCFLAGS="-i ${SRCDIR}/support/template.pl"
+dnl --------------------------------------------------------------------------
+dnl Define and zero the variables we need in Makedefs.in
+dnl --------------------------------------------------------------------------
+WA_VARIABLE([CC])
+WA_VARIABLE([CPP])
+WA_VARIABLE([SHELL])
+WA_VARIABLE([LIBTOOL])
+WA_VARIABLE([APXS])
- TARGET="${TARGET} apidocs-c"
- ],[
- AC_MSG_RESULT([no])
- PERL=""
- ]
-)
-AC_SUBST(PERL)
-AC_SUBST(SCANDOC)
-AC_SUBST(SCANDOCFLAGS)
-
-dnl --------------------------------------------------------------------------
-dnl Process the --with-apr=... command line argument
-dnl
-dnl This is always processed, and sets the APR_SRCDIR variable. After this
-dnl is executed, for each module the APR_SRCDIR variable should be over
-dnl written if the web server already knows the location of APR's include
-dnl header and library directories. (As in Apache 2.0)
-dnl
-dnl New vars: N/A
-dnl Upd vars: APR_SRCDIR
-dnl --------------------------------------------------------------------------
-LOCAL_HEADER([APR location])
-AC_MSG_CHECKING([for APR sources])
-AC_ARG_WITH(apr,
- [ --with-apr[=DIR] path of an APR (Apache Portable Runtime) source
- distribution or CVS snapshot. (DIR defaults to
- \"./apr\"). Not required and ignored when an
- Apache 2.0 apxs is specified (--with-apxs).],
- [
- case "${withval}" in
- ""|"yes"|"YES"|"true"|"TRUE")
- APR_SRCDIR="${SRCDIR}/apr"
- ;;
- *)
- APR_SRCDIR="${withval}"
- ;;
- esac
- AC_MSG_RESULT([${APR_SRCDIR}])
- ],[
- APR_SRCDIR="${SRCDIR}/apr"
- AC_MSG_RESULT([${APR_SRCDIR}])
- ]
-)
-dnl --------------------------------------------------------------------------
-dnl Process the --with-apr-lib=... command line argument
-dnl FHS System does not have apr library installed local_prefix/lib
-dnl but somewhere else.
-dnl --------------------------------------------------------------------------
-AC_MSG_CHECKING([for APR libraries])
-AC_ARG_WITH(apr-lib,
- [ --with-apr-lib=DIR path where the APR libraries are installed.],
- [
- case "${withval}" in
- ""|"yes"|"YES"|"true"|"TRUE")
- AC_MSG_ERROR([--with-apr-lib need a directory])
- ;;
- *)
- APR_LIBDIR="${withval}"
- ;;
- esac
- AC_MSG_RESULT([${APR_LIBDIR}])
- ],
- [
- AC_MSG_RESULT([no])
- ]
-)
-
-dnl --------------------------------------------------------------------------
-dnl Process the --with-apr-include=... command line argument
-dnl FHS System does not have apr include installed local_prefix/include
-dnl but somewhere else.
-dnl --------------------------------------------------------------------------
-AC_MSG_CHECKING([for APR includes])
-AC_ARG_WITH(apr-include,
- [ --with-apr-include=DIR path where the APR includes are
- installed.],
- [
- case "${withval}" in
- ""|"yes"|"YES"|"true"|"TRUE")
- AC_MSG_ERROR([--with-apr-include need a directory])
- ;;
- *)
- APR_INCDIR="${withval}"
- ;;
- esac
- AC_MSG_RESULT([${APR_INCDIR}])
- ],
- [
- AC_MSG_RESULT([no])
- ]
-)
-
-dnl --------------------------------------------------------------------------
-dnl Target module to build
-dnl --------------------------------------------------------------------------
-LOCAL_HEADER([Target web-server])
-LOCAL_HELP([Available Web-Server modules])
-
-dnl --------------------------------------------------------------------------
-dnl Process the --with-apxs[=FILE] command line argument
-dnl
-dnl Use Apache's APXS utility to compile the Apache module (1.3/2.0 is
-dnl detected and APR variables are set accordingly).
-dnl
-dnl New vars: APXS
-dnl Upd vars: N/A
-dnl --------------------------------------------------------------------------
-AC_MSG_CHECKING([for Apache apxs])
-AC_ARG_WITH(apxs,
- [ --with-apxs[=FILE] build a shared Apache module. If FILE was not
- specified, then APXS will be searched within the
- current PATH. The Apache server version (1.3 or 2.0)
- will be automatically detected.],
- [
- AC_MSG_RESULT([yes])
-
- if ${TEST} -n "${MODULE}"
- then
- AC_MSG_ERROR([target module already defined as ${MODULE}])
- fi
+WA_VARIABLE([CPPFLAGS])
+WA_VARIABLE([CFLAGS])
+WA_VARIABLE([LDFLAGS])
+WA_VARIABLE([LIBS])
+WA_VARIABLE([INCLUDES])
- case "${withval}" in
- ""|"yes"|"YES"|"true"|"TRUE")
- LOCAL_CHECK_PROG(APXS,apxs)
- ;;
- *)
- APXS="${withval}"
- ;;
- esac
-
- if ${TEST} ! -x ${APXS}
- then
- AC_MSG_ERROR([cannot execute apxs \"${APXS}\"])
- fi
+WA_VARIABLE([MODULE])
- dnl ----------------------------------------------------------------------
- dnl Detect APXS 1.3/2.0
- dnl ----------------------------------------------------------------------
- local_apache=`${GREP} STANDARD20 ${APXS}`
- if ${TEST} -n "${local_apache}"
- then
-
- dnl -----------------------------------------------------
- dnl APXS 2.0
- dnl Note: APXS for 2.0 is broken, so we need to
- dnl "discover" some of the values manually hoping
- dnl to get the right layout.
- dnl
- dnl New vars: N/A
- dnl Upd vars: APR_CFGFLG APR_VARFIL APR_LIBDIR APR_INCDIR
- dnl -----------------------------------------------------
- MODULE="apache-2.0"
- local_prefix="`${APXS} -q PREFIX`"
- LIBTOOL="$local_prefix/build/libtool"
- APR_CFGFLG=""
-
- dnl check APR_LIBDIR
- if ${TEST} -z "${APR_LIBDIR}"
- then
- APR_VARFIL="${local_prefix}/lib/APRVARS"
- APR_LIBDIR="${local_prefix}/lib"
- else
- APR_VARFIL="${APR_LIBDIR}/APRVARS"
- fi
-
- dnl check APR_INCDIR
- if ${TEST} -z "${APR_INCDIR}"
- then
- APR_INCDIR="${local_prefix}/include"
- fi
- if ${TEST} ! -d "${APR_LIBDIR}"
- then
- AC_MSG_ERROR([\"${APR_LIBDIR}\" not found. Use --with-apr-lib=DIR.])
- fi
- if ${TEST} ! -d "${APR_INCDIR}"
- then
- AC_MSG_ERROR([\"${APR_INCDIR}\" not found. Use --with-apr-include=DIR.])
- fi
- unset local_prefix
- else
-
- dnl Upd vars: APR_CFGFLG APR_VARFIL APR_LIBDIR APR_INCDIR
- dnl -----------------------------------------------------
- dnl APXS 1.3
- dnl
- dnl New vars: N/A
- dnl Upd vars: APR_CFGFLG APR_VARFIL APR_LIBDIR APR_INCDIR
- dnl -----------------------------------------------------
- MODULE="apache-1.3"
- APR_CFGFLG="--enable-static --disable-shared --disable-threads"
- APR_VARFIL=""
- APR_LIBDIR=""
- APR_INCDIR=""
-
- dnl -----------------------------------------------------
- dnl check for broken APXS (Apachetoolbox brokes it)
- dnl -----------------------------------------------------
- local_ldflags_shlib="`${APXS} -q LDFLAGS_SHLIB 2>&1 | grep Error`"
- if ${TEST} -n "${local_ldflags_shlib}"
- then
- AC_MSG_ERROR([${APXS} is broken (LDFLAGS_SHLIB not found)])
- fi
-
- local_cflags="`${APXS} -q CFLAGS 2>&1 | grep Error`"
- if ${TEST} -n "${local_cflags}"
- then
- AC_MSG_ERROR([${APXS} is broken (CFLAGS not found)])
- fi
+WA_VARIABLE([APR_DIR])
+WA_VARIABLE([SRC_DIR])
+WA_VARIABLE([TGT_DIR])
- fi
- unset local_apache
- ],[
- AC_MSG_RESULT([no])
- ]
-)
-
-dnl --------------------------------------------------------------------------
-dnl Was a module specified?
-dnl
-dnl New vars: N/A
-dnl Upd vars: CFGFILES
-dnl --------------------------------------------------------------------------
-AC_MSG_CHECKING([target module])
-
-if ${TEST} -z "${MODULE}"
-then
- AC_MSG_RESULT([error])
- AC_MSG_ERROR([No target module specified])
-fi
-AC_MSG_RESULT([${MODULE}])
-CFGFILES="${CFGFILES} ./${MODULE}/Makefile"
+WA_VARIABLE([EXTRA_BUILD])
+WA_VARIABLE([EXTRA_CLEAN])
+
+WA_PATH_DIR([SRC_DIR],[${srcdir}],[sources])
+WA_PATH_DIR([TGT_DIR],[.],[build])
dnl --------------------------------------------------------------------------
-dnl Configure the APR source distribution
-dnl
-dnl This step gets executed ONLY if APR_VARFIL's length zero. Basically, if
-dnl the module doesn't provide us with a name for the APRVARS file.
-dnl
-dnl New vars: N/A
-dnl Upd vars: APR_VARFIL APR_LIBDIR APR_INCDIR TARGET
-dnl --------------------------------------------------------------------------
-if ${TEST} -z "${APR_VARFIL}"
-then
-
- dnl -----------------------------------------------
- dnl Check if we were supplied a valid APR directory
- dnl -----------------------------------------------
- if ${TEST} ! -d "${APR_SRCDIR}"
- then
- AC_MSG_ERROR([APR sources not found. Use --with-apr=DIR.])
- fi
- LOCAL_RESOLVEDIR(APR_SRCDIR,[${APR_SRCDIR}],[full APR directory path])
-
- dnl ----------------------------
- dnl Run the APR configure script
- dnl ----------------------------
- LOCAL_HEADER([Configuring APR])
- LOCAL_FILTEREXEC(local_return,
- [./configure ${APR_CFGFLG}],
- ["APR configure"],
- [${APR_SRCDIR}])
-
- if ${TEST} "${local_return}" -ne "0"
- then
- AC_MSG_ERROR([APR configure script terminated with error code ${local_return}])
- fi
-
- APR_INCDIR="${APR_SRCDIR}/include"
- APR_VARFIL="${APR_SRCDIR}/APRVARS"
- APR_LIBDIR="${TGTDIR}/lib"
- TARGET="${TARGET} apr"
- LIBTOOL="${APR_SRCDIR}/libtool"
- eval `${GREP} "^CC=" ${APR_VARFIL} | ${SED} "s/^CC=/APR_CC=/"`
-else
- APR_CC="${CC}"
-fi
+dnl Figure out if we have APXS, where it's located, and what version it is
+dnl --------------------------------------------------------------------------
+WA_APXS([APXS])
+WA_APXS_CHECK([APXS_VERSION],[${APXS}])
dnl --------------------------------------------------------------------------
-dnl Parse APRVARS and discover what values we need
-dnl
-dnl New vars: APR_CFLAGS APR_CPPFLAGS APR_LDFLAGS APR_LIBS APR_INCLUDES
-dnl Upd vars: N/A
-dnl --------------------------------------------------------------------------
-LOCAL_HEADER([Finishing up])
-AC_MSG_CHECKING([for APR compilation flags])
-if ${TEST} ! -f "${APR_VARFIL}"
-then
- AC_MSG_RESULT([error])
- AC_MSG_ERROR([Cannot find required APRVARS file])
-fi
+dnl Decide based on what version of APXS we found
+dnl --------------------------------------------------------------------------
+AC_MSG_CHECKING([for apr location])
+if test "${APXS_VERSION}" = "1.3" ; then
-dnl Check that we are not mixing native and gnu compilers
-dnl on the platfroms that do not support it.
+ dnl ----------------------------------------------------------------------
+ dnl APXS version 1.3, meaning Apache 1.3. We _require_ APR sources
+ dnl ----------------------------------------------------------------------
+ AC_MSG_RESULT([local sources])
-eval `${GREP} "^NM=" ${LIBTOOL}`
-gnu_cc=`${APR_CC} --help | ${GREP} gnu`
-if ${TEST} ! -z "${gnu_cc}"
-then
- APACHE_DIR=`${APXS} -q SBINDIR`
- is_apache_gcc="Yes"
- case $host in
- sparc-sun-solaris2.8)
- is_apache_gcc=`${NM} ${APACHE_DIR}/httpd | ${GREP} __lshrdi3`
- ;;
- esac
- if ${TEST} -z "${is_apache_gcc}"
- then
- AC_MSG_ERROR([Cannot mix gcc and native cc])
- fi
-fi
+ dnl ----------------------------------------------------------------------
+ dnl Check where the APR sources are and issue "configure"
+ dnl ----------------------------------------------------------------------
+ WA_APR([APR_DIR])
+ tempval="--enable-static --disable-shared --disable-threads"
+ tempval="${tempval} --libdir=${TGT_DIR}"
+ WA_EXEC(
+ [tempval],
+ [./configure ${tempval}],
+ [apr],
+ [${APR_DIR}])
+ unset tempval
+
+ dnl TODO: CHECK FOR RETURN VALUE HERE
-AC_MSG_RESULT([ok])
-eval `${CAT} ${APR_VARFIL} | ${GREP} "EXTRA_" | ${SED} "s/EXTRA_/APR_/g"`
-AC_SUBST(APR_CFLAGS)
-AC_SUBST(APR_CPPFLAGS)
-AC_SUBST(APR_INCLUDES)
-AC_SUBST(APR_LDFLAGS)
-AC_SUBST(APR_LIBS)
-AC_SUBST(LIBTOOL)
-
-dnl --------------------------------------------------------------------------
-dnl Set up targets for building and cleaning
-dnl
-dnl New vars: TARGET_BUILD TARGET_CLEAN TARGET_LBUILD TARGET_LCLEAN
-dnl Upd vars: N/A
-dnl --------------------------------------------------------------------------
-AC_MSG_CHECKING([for Makefile targets])
-TARGET_BUILD=""
-TARGET_CLEAN=""
-for local_target in ${TARGET}
-do
- TARGET_BUILD="${TARGET_BUILD} ${local_target}-build"
- TARGET_CLEAN="${TARGET_CLEAN} ${local_target}-clean"
- if ${TEST} ! "${local_target}" = "apr"
- then
- TARGET_LBUILD="${TARGET_LBUILD} ${local_target}-build"
- TARGET_LCLEAN="${TARGET_LCLEAN} ${local_target}-clean"
- fi
-done
-unset local_target
-TARGET_BUILD="${TARGET_BUILD} ${MODULE}-build"
-TARGET_CLEAN="${TARGET_CLEAN} ${MODULE}-clean"
-TARGET_LBUILD="${TARGET_LBUILD} ${MODULE}-build"
-TARGET_LCLEAN="${TARGET_LCLEAN} ${MODULE}-clean"
-AC_MSG_RESULT([${TARGET} ${MODULE}])
-AC_SUBST(TARGET_BUILD)
-AC_SUBST(TARGET_CLEAN)
-AC_SUBST(TARGET_LBUILD)
-AC_SUBST(TARGET_LCLEAN)
+ dnl ----------------------------------------------------------------------
+ dnl Retrieve APR variables
+ dnl ----------------------------------------------------------------------
+ WA_APR_GET([CC],[${APR_DIR}],[CC])
+ WA_APR_GET([CPP],[${APR_DIR}],[CPP])
+ WA_APR_GET([SHELL],[${APR_DIR}],[SHELL])
+ WA_APR_GET([CPPFLAGS],[${APR_DIR}],[EXTRA_CPPFLAGS])
+ WA_APR_GET([LDFLAGS],[${APR_DIR}],[EXTRA_LDFLAGS])
+ WA_APR_GET([CFLAGS],[${APR_DIR}],[EXTRA_CFLAGS])
+ WA_APR_GET([LIBS],[${APR_DIR}],[EXTRA_LIBS])
+ WA_APR_GET([INCLUDES],[${APR_DIR}],[EXTRA_INCLUDES])
+
+ AC_MSG_CHECKING([for apr INCLUDES variable])
+ INCLUDES="-I${APR_DIR}/include ${INCLUDES}"
+ AC_SUBST([INCLUDES])
+ AC_MSG_RESULT([-I${APR_DIR}/include])
+
+ AC_MSG_CHECKING([for apr LIBTOOL variable])
+ LIBTOOL="${SHELL} ${APR_DIR}/libtool --silent"
+ AC_SUBST([LIBTOOL])
+ AC_MSG_RESULT([${LIBTOOL}])
-dnl --------------------------------------------------------------------------
-dnl Finish up
-dnl --------------------------------------------------------------------------
-AC_OUTPUT(${CFGFILES})
-LOCAL_HEADER([All done. Now you can issue \"make\". Good luck.])
+ dnl ----------------------------------------------------------------------
+ dnl Do a check on the C compiler to see if apxs reports the same one
+ dnl ----------------------------------------------------------------------
+ AC_MSG_CHECKING([for apr compiler coherency])
+ if test "`${APXS} -q CC`" != "${CC}" ; then
+ WA_ERROR([you have to use the same compiler for both Apache and WebApp])
+ fi
+ AC_MSG_RESULT([ok])
+
+ dnl ----------------------------------------------------------------------
+ dnl Apache 1.3 configuration complete
+ dnl ----------------------------------------------------------------------
+ MODULE="apache-1.3"
+ EXTRA_BUILD="apr-build"
+ EXTRA_CLEAN="apr-clean"
+
+else
+
+ AC_MSG_RESULT([apache 2 distribution])
+ AC_MSG_ERROR([using Apache 2.0 apxs will be supported shortly])
+ MODULE="apache-2.0"
+fi
+
+AC_SUBST([MODULE])
+AC_OUTPUT([Makedefs Makefile lib/Makefile ${MODULE}/Makefile])
1.24 +20 -45 jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.in 1 Nov 2001 22:20:51 -0000 1.23
+++ Makefile.in 1 May 2002 00:37:16 -0000 1.24
@@ -56,55 +56,30 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.23 2001/11/01 22:20:51 pier Exp $
+# @version $Id: Makefile.in,v 1.24 2002/05/01 00:37:16 pier Exp $
-include @TGTDIR@/Makedefs
+LOCAL_INCLUDES = -I$(SRC_DIR)/include
+LOCAL_TGT_DIR = $(TGT_DIR)/apache-1.3
+LOCAL_SRC_DIR = $(SRC_DIR)/apache-1.3
+include @TGT_DIR@/Makedefs
-SRCS = mod_webapp.c
+OBJ = mod_webapp.o
+LIB = mod_webapp.so
-OBJS = mod_webapp.lo
+.PHONY: build clean
-MODULE = mod_webapp.so
+build: $(LIB)
-APXS = @APXS@
-
-build: $(MODULE)
+clean:
+ rm -f $(OBJ)
+ rm -f $(LIB)
+$(LIB): $(LOCAL_SRC_DIR)/mod_webapp.c
+ $(APXS) -c -o $@ \
+ $(INCLUDES) $(LOCAL_INCLUDES) \
+ -Wc,"$(CPPFLAGS) $(CFLAGS)" \
+ -Wl,"$(LDFLAGS) $(LIBS)" \
+ $(TGT_DIR)/libwebapp.a \
+ $(TGT_DIR)/libapr.a \
+ $<
-clean:
- @for ENTRY in *.o *.lo $(MODULE) .libs ; \
- do \
- if $(TEST) -f $${ENTRY} ; \
- then \
- $(ECHO) Removing file $${ENTRY} ; \
- $(RM) -f $${ENTRY} ; \
- fi ; \
- if $(TEST) -d $${ENTRY} ; \
- then \
- $(ECHO) Removing directory $${ENTRY} ; \
- $(RM) -rf $${ENTRY} ; \
- fi ; \
- done
-
-$(MODULE): $(SRCS) $(TGTDIR)/lib/libapr.a $(TGTDIR)/lib/libwebapp.a
- { APXS_LDFLAGS_SHLIB="`$(APXS) -q LDFLAGS_SHLIB` \
- $(APR_LDFLAGS) \
- $(APR_LIBS)" ; \
- APXS_LDFLAGS_SHLIB=`$(ECHO) $${APXS_LDFLAGS_SHLIB}` ; \
- APXS_CFLAGS="`$(APXS) -q CFLAGS` \
- $(CFLAGS) \
- $(APR_CFLAGS) \
- $(CPPFLAGS) \
- $(APR_CPPFLAGS) \
- -I$(APR_INCDIR) \
- -I$(SRCDIR)/include \
- $(APR_INCLUDES)" ; \
- APXS_CFLAGS=`$(ECHO) $${APXS_CFLAGS}` ; \
- $(APXS) \
- -S CFLAGS="$${APXS_CFLAGS}" \
- -S LDFLAGS_SHLIB="$${APXS_LDFLAGS_SHLIB}" \
- -o "$@" \
- -c "mod_webapp.c" \
- "$(TGTDIR)/lib/libwebapp.a" \
- "$(TGTDIR)/lib/libapr.a" ; \
- }
1.24 +38 -55 jakarta-tomcat-connectors/webapp/lib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile.in 26 Apr 2002 13:12:35 -0000 1.23
+++ Makefile.in 1 May 2002 00:37:16 -0000 1.24
@@ -56,71 +56,54 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.23 2002/04/26 13:12:35 jfclere Exp $
+# @version $Id: Makefile.in,v 1.24 2002/05/01 00:37:16 pier Exp $
-include @TGTDIR@/Makedefs
+LOCAL_INCLUDES = -I$(SRC_DIR)/include -I$(SRC_DIR)/lib
+LOCAL_TGT_DIR = $(TGT_DIR)/lib
+LOCAL_SRC_DIR = $(SRC_DIR)/lib
+include @TGT_DIR@/Makedefs
-SRCS = pr_info.c \
- pr_warp.c \
- pr_warp.h \
- pr_warp_config.c \
- pr_warp_network.c \
- pr_warp_packet.c \
- wa_config.c \
- wa_main.c \
- wa_request.c \
- pr_warp_socketpool.c
-
-OBJS = wa_main.lo \
+OBJS = wa_main.lo \
wa_config.lo \
- wa_request.lo
-
-PROVS = pr_info.lo \
+ wa_request.lo \
+ pr_info.lo \
pr_warp.lo \
pr_warp_packet.lo \
pr_warp_network.lo \
pr_warp_config.lo \
pr_warp_socketpool.lo
+LIB = libwebapp.la
+DEFH = pr_warp_defs.h
-LIB = $(TGTDIR)/lib/libwebapp.a
-
-WARPH = pr_warp_defs.h
+.PHONY: build clean
-build: $(LIB)
+build: $(DEFH) $(LIB)
clean:
- @for ENTRY in *.o *.lo $(LIB) $(WARPH) .libs ; \
- do \
- if $(TEST) -d $${ENTRY} ; \
- then \
- $(ECHO) Removing directory $${ENTRY} ; \
- $(RM) -rf $${ENTRY} ; \
- else \
- $(ECHO) Removing file $${ENTRY} ; \
- $(RM) -f $${ENTRY} ; \
- fi ; \
+ @for FILE in $(OBJS) ; do \
+ FILE="`basename $$FILE .lo`" ; \
+ echo rm -f $$FILE.lo ; \
+ rm -f $$FILE.lo ; \
+ echo rm -f $$FILE.o ; \
+ rm -f $$FILE.o ; \
done
-
-$(LIB): libwebapp.la
- $(LIBTOOL) --silent --mode=install \
- $(SRCDIR)/support/install.sh -c \
- libwebapp.la \
- $(TGTDIR)/lib
- $(LIBTOOL) --silent --mode=finish \
- $(TGTDIR)/lib
-
-libwebapp.la: $(SRCS) $(WARPH) $(OBJS) $(PROVS)
- @$(MECHO) "Creating library \"$@\""
- $(LIBTOOL) $(CC) -rpath $(TGTDIR)/lib -static -o $@ $(OBJS) $(PROVS)
-
-pr_warp_defs.h: $(TGTDIR)/java/org/apache/catalina/connector/warp/Constants.java
- @$(MECHO) "Generating \"$@\" from \"$?\""
- @$(CAT) "$?" | \
- $(GREP) "TYPE_" | \
- $(SED) "s/public static final int/#define/g" | \
- $(SED) "y/=;/ /" > $@
-
-$(SRCS):
- $(LN) -s $(SRCDIR)/lib/$@ ./$@
- @$(ECHO) $(TGTDIR)/lib/$@ >> $(LSTFILE)
-
+ rm -f $(DEFH)
+ rm -f libwebapp.la
+ rm -f libwebapp.a
+ rm -rf .libs
+
+$(LIB): $(WARPH) $(OBJS) $(PROVS)
+ $(LIBTOOL) --mode=link \
+ $(CC) -static -o $@ \
+ -rpath $(TGT_DIR) \
+ $(OBJS)
+
+$(DEFH): $(SRC_DIR)/java/org/apache/catalina/connector/warp/Constants.java
+ cat "$<" | \
+ grep 'VERS_' | \
+ sed 's/.*public static final int/#define/g' | \
+ sed 'y/=;/ /' > $@
+ cat "$<" | \
+ grep 'TYPE_' | \
+ sed 's/.*public static final int/#define/g' | \
+ sed 'y/=;/ /' > $@
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
