|
|
|
|
--- webapp/configure.in.dist Tue Jan 14 15:35:38 2003
|
|
|
|
|
+++ webapp/configure.in Tue Jan 14 16:58:25 2003
|
|
|
|
|
@@ -149,82 +149,9 @@
|
|
|
|
|
if test "${APXS_VERSION}" = "1.3" ; then
|
|
|
|
|
|
|
|
|
|
dnl ----------------------------------------------------------------------
|
|
|
|
|
- dnl APXS version 1.3, meaning Apache 1.3. We _require_ APR sources
|
|
|
|
|
- dnl ----------------------------------------------------------------------
|
|
|
|
|
- WA_HEADER([Apache 1.3 module compilation (APR checks)])
|
|
|
|
|
-
|
|
|
|
|
- dnl ----------------------------------------------------------------------
|
|
|
|
|
- dnl Check where the APR sources are and issue "configure"
|
|
|
|
|
- dnl ----------------------------------------------------------------------
|
|
|
|
|
- WA_APR([APR_DIR])
|
|
|
|
|
- tempret="0"
|
|
|
|
|
- tempval="--enable-static --disable-shared --disable-threads"
|
|
|
|
|
- tempval="${tempval} --libdir=${TGT_DIR}/objects"
|
|
|
|
|
- WA_EXEC(
|
|
|
|
|
- [tempret],
|
|
|
|
|
- [./configure ${tempval}],
|
|
|
|
|
- [apr],
|
|
|
|
|
- [${APR_DIR}])
|
|
|
|
|
- AC_MSG_CHECKING([for proper command execution])
|
|
|
|
|
- if test "${tempret}" = "0" ; then
|
|
|
|
|
- AC_MSG_RESULT([ok (${tempret})])
|
|
|
|
|
- else
|
|
|
|
|
- WA_ERROR([command returned with ${tempret}])
|
|
|
|
|
- fi
|
|
|
|
|
- unset tempret
|
|
|
|
|
- unset tempval
|
|
|
|
|
-
|
|
|
|
|
- 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([CFLAGS],[${APR_DIR}],[CFLAGS])
|
|
|
|
|
- WA_APR_GET([CPPFLAGS],[${APR_DIR}],[CPPFLAGS])
|
|
|
|
|
- WA_APR_GET([LDFLAGS],[${APR_DIR}],[LDFLAGS])
|
|
|
|
|
-
|
|
|
|
|
- WA_APR_GET([LDFLAGS],[${APR_DIR}],[LIBS])
|
|
|
|
|
- WA_APR_GET([CPPFLAGS],[${APR_DIR}],[EXTRA_INCLUDES])
|
|
|
|
|
-
|
|
|
|
|
- WA_APR_LIB([APR_LIB],[${APR_DIR}])
|
|
|
|
|
- WA_APR_LIBNAME([APR_LIBNAME],[${APR_DIR}])
|
|
|
|
|
-
|
|
|
|
|
- AC_MSG_CHECKING([for apr headers])
|
|
|
|
|
- WA_APPEND([INCLUDES],[-I${APR_DIR}/include])
|
|
|
|
|
- AC_MSG_RESULT([-I${APR_DIR}/include])
|
|
|
|
|
-
|
|
|
|
|
- AC_MSG_CHECKING([for apr libtool])
|
|
|
|
|
- LIBTOOL="${SHELL} ${APR_DIR}/libtool --silent"
|
|
|
|
|
- AC_MSG_RESULT([${LIBTOOL}])
|
|
|
|
|
-
|
|
|
|
|
- dnl ----------------------------------------------------------------------
|
|
|
|
|
- dnl Done with APR, let's see what APXS says
|
|
|
|
|
- dnl ----------------------------------------------------------------------
|
|
|
|
|
- WA_HEADER([Apache 1.3 module compilation (APXS checks)])
|
|
|
|
|
-
|
|
|
|
|
- dnl ----------------------------------------------------------------------
|
|
|
|
|
- dnl Do a check on the C compiler to see if apxs reports the same one
|
|
|
|
|
- dnl ----------------------------------------------------------------------
|
|
|
|
|
- WA_APXS_GET([tempval],[${APXS}],[CC])
|
|
|
|
|
- AC_MSG_CHECKING([for compiler coherency])
|
|
|
|
|
- if test "${tempval}" != "${CC}" ; then
|
|
|
|
|
- AC_MSG_RESULT([error])
|
|
|
|
|
- AC_MSG_RESULT([compiler discovered by apr: ${CC}])
|
|
|
|
|
- AC_MSG_RESULT([compiler used by apache apxs: ${tempval}])
|
|
|
|
|
- AC_MSG_ERROR([the apache apxs and apr compilers must be the same])
|
|
|
|
|
- exit 1
|
|
|
|
|
- fi
|
|
|
|
|
- AC_MSG_RESULT([ok (${CC})])
|
|
|
|
|
- unset tempval
|
|
|
|
|
-
|
|
|
|
|
- dnl ----------------------------------------------------------------------
|
|
|
|
|
dnl Apache 1.3 configuration complete
|
|
|
|
|
dnl ----------------------------------------------------------------------
|
|
|
|
|
MODULE="apache-1.3"
|
|
|
|
|
- WA_APPEND([EXTRA_BUILD],[apr-build])
|
|
|
|
|
- WA_APPEND([EXTRA_CLEAN],[apr-clean])
|
|
|
|
|
|
|
|
|
|
WA_APXS_GET([tempval],[${APXS}],[INCLUDEDIR])
|
|
|
|
|
WA_PATH_DIR([tempdir],[${tempval}],[apache 1.3 headers])
|
|
|
|
|
@@ -236,6 +163,15 @@
|
|
|
|
|
WA_APXS_GET([EXTRA_LDFLAGS],[${APXS}],[LIBS_SHLIB])
|
|
|
|
|
WA_APXS_GET([EXTRA_LDFLAGS],[${APXS}],[LDFLAGS_SHLIB])
|
|
|
|
|
|
|
|
|
|
+ WA_APXS_GET([CC],[${APXS}],[CC])
|
|
|
|
|
+
|
|
|
|
|
+ WA_APPEND([CFLAGS],"-I$prefix/include/apr")
|
|
|
|
|
+ WA_APPEND([LDFLAGS],"-I$prefix/lib")
|
|
|
|
|
+
|
|
|
|
|
+ APR_LIB=apr
|
|
|
|
|
+ CPP=$prefix/bin/cc -E
|
|
|
|
|
+ SHELL=/bin/sh
|
|
|
|
|
+ LIBTOOL=$prefix/bin/libtool --tag C
|
|
|
|
|
else
|
|
|
|
|
|
|
|
|
|
dnl ----------------------------------------------------------------------
|
|
|
|
|
--- webapp/apache-1.3/Makefile.in.dist 2003-07-09 11:06:30.000000000 +0200
|
|
|
|
|
+++ webapp/apache-1.3/Makefile.in 2003-07-09 11:06:38.000000000 +0200
|
|
|
|
|
@@ -86,7 +86,7 @@
|
|
|
|
|
-Wc,"$(CPPFLAGS) $(CFLAGS)" \
|
|
|
|
|
-Wl,"$(LDFLAGS) $(LIBS)" \
|
|
|
|
|
-L$(LIB_DIR) -l$(APR_LIB) \
|
|
|
|
|
- $(OBJ_DIR)/*.o $<
|
|
|
|
|
+ $(OBJ_DIR)/*.lo $<
|
|
|
|
|
|
|
|
|
|
# +++ EXPERIMENTAL +++ LIBTOOL COMPILE, APXS LINK +++
|
|
|
|
|
# SOURCE = mod_webapp.c
|
