jfclere 2002/08/30 07:15:06
Modified: webapp Makedefs.in Makefile.in configure.in
webapp/apache-1.3 Makefile.in
webapp/support wa_apr.m4
Log:
Arrange to allow to use the released version of APR.
Revision Changes Path
1.22 +5 -1 jakarta-tomcat-connectors/webapp/Makedefs.in
Index: Makedefs.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makedefs.in 14 May 2002 22:06:20 -0000 1.21
+++ Makedefs.in 30 Aug 2002 14:15:06 -0000 1.22
@@ -80,6 +80,10 @@
EXTRA_LDFLAGS = @EXTRA_LDFLAGS@
EXTRA_INCLUDES = @EXTRA_INCLUDES@
+# apr library name
+APR_LIBNAME = @APR_LIBNAME@
+APR_LIB = @APR_LIB@
+
# Module to build
MODULE = @MODULE@
1.37 +2 -2 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.in 14 May 2002 22:37:15 -0000 1.36
+++ Makefile.in 30 Aug 2002 14:15:06 -0000 1.37
@@ -132,7 +132,7 @@
apr-build: $(LIB_DIR)
@$(MAKE) SUBF="$(MAKEFLAGS)" SUBD="$(APR_DIR)" SUBT="all" subdir
$(LIBTOOL) --mode=install \
- cp $(APR_DIR)/libapr.la $(LIB_DIR)/libapr.la
+ cp $(APR_DIR)/$(APR_LIBNAME) $(LIB_DIR)/$(APR_LIBNAME)
$(LIBTOOL) --mode=finish $(LIB_DIR)
apr-clean:
1.63 +10 -5 jakarta-tomcat-connectors/webapp/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/configure.in,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- configure.in 14 May 2002 22:37:15 -0000 1.62
+++ configure.in 30 Aug 2002 14:15:06 -0000 1.63
@@ -93,6 +93,8 @@
dnl Directories locations are defined here
dnl --------------------------------------------------------------------------
WA_VARIABLE([APR_DIR])
+WA_VARIABLE([APR_LIB])
+WA_VARIABLE([APR_LIBNAME])
WA_VARIABLE([SRC_DIR])
WA_VARIABLE([TGT_DIR])
WA_VARIABLE([TC4_DIR])
@@ -179,12 +181,15 @@
WA_APR_GET([CPP],[${APR_DIR}],[CPP])
WA_APR_GET([SHELL],[${APR_DIR}],[SHELL])
- WA_APR_GET([CFLAGS],[${APR_DIR}],[EXTRA_CFLAGS])
- WA_APR_GET([CPPFLAGS],[${APR_DIR}],[EXTRA_CPPFLAGS])
- WA_APR_GET([LDFLAGS],[${APR_DIR}],[EXTRA_LDFLAGS])
+ 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}],[EXTRA_LIBS])
+ 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])
1.29 +3 -3 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.in 13 May 2002 23:25:09 -0000 1.28
+++ Makefile.in 30 Aug 2002 14:15:06 -0000 1.29
@@ -85,7 +85,7 @@
$(INCLUDES) $(LOCAL_INCLUDES) \
-Wc,"$(CPPFLAGS) $(CFLAGS)" \
-Wl,"$(LDFLAGS) $(LIBS)" \
- -L$(LIB_DIR) -lapr \
+ -L$(LIB_DIR) -l$(APR_LIB) \
$(OBJ_DIR)/*.o $<
# +++ EXPERIMENTAL +++ LIBTOOL COMPILE, APXS LINK +++
@@ -100,4 +100,4 @@
# $(CFLAGS) $(EXTRA_CFLAGS)
#
# $(MODFILE): $(OBJECT)
-# $(APXS) -c -o $@ -L$(OBJ_DIR) -lapr $< $(OBJ_DIR)/*.o
+# $(APXS) -c -o $@ -L$(OBJ_DIR) -l$(APR_LIB) $< $(OBJ_DIR)/*.o
1.6 +54 -6 jakarta-tomcat-connectors/webapp/support/wa_apr.m4
Index: wa_apr.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/wa_apr.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wa_apr.m4 13 May 2002 23:23:19 -0000 1.5
+++ wa_apr.m4 30 Aug 2002 14:15:06 -0000 1.6
@@ -100,18 +100,18 @@
dnl Retrieve a value from the configured APR source tree
dnl $1 => Environment variable name for the returned value
dnl $2 => APR sources directory as returned by WA_APR
-dnl $3 => APR variable name (found in $2/APRVARS)
+dnl $3 => APR variable name (found in $2/apr-config)
dnl --------------------------------------------------------------------------
AC_DEFUN(
[WA_APR_GET],
[
AC_MSG_CHECKING([for apr $3 variable])
- if test ! -f "$2/APRVARS" ; then
- WA_ERROR([cannot find APRVARS file in $2])
+ if test ! -f "$2/apr-config" ; then
+ WA_ERROR([cannot find apr-config file in $2])
fi
- wa_apr_get_tempval=`cat $2/APRVARS | grep "^$3=" 2> /dev/null`
+ wa_apr_get_tempval=`cat $2/apr-config | grep "^$3=" 2> /dev/null`
if test -z "${wa_apr_get_tempval}" ; then
- WA_ERROR([value for $3 not specified in $2/APRVARS])
+ WA_ERROR([value for $3 not specified in $2/apr-config])
fi
wa_apr_get_tempval=`echo ${wa_apr_get_tempval} | sed 's/^$3="//g'`
wa_apr_get_tempval=`echo ${wa_apr_get_tempval} | sed 's/"$//g'`
@@ -119,3 +119,51 @@
AC_MSG_RESULT([${wa_apr_get_tempval}])
unset wa_apr_get_tempval
])
+
+dnl --------------------------------------------------------------------------
+dnl WA_APR_LIB
+dnl Retrieve the name of the library for -l$(APR_LIB)
+dnl $1 => Environment variable name for the returned value
+dnl $2 => APR sources directory as returned by WA_APR
+dnl --------------------------------------------------------------------------
+AC_DEFUN(
+ [WA_APR_LIB],
+ [
+ AC_MSG_CHECKING([for apr APR_LIB])
+ if test ! -f "$2/apr-config" ; then
+ WA_ERROR([cannot find apr-config file in $2])
+ fi
+ wa_apr_get_tempval=`$2/apr-config --apr-la-file 2> /dev/null`
+ if test -z "${wa_apr_get_tempval}" ; then
+ WA_ERROR([$2/apr-config --apr-la-file failed])
+ fi
+ wa_apr_get_tempval=`basename ${wa_apr_get_tempval} | sed 's/lib//g'`
+ wa_apr_get_tempval=`echo ${wa_apr_get_tempval} | sed 's/\.la//g'`
+ WA_APPEND([$1],[${wa_apr_get_tempval}])
+ AC_MSG_RESULT([${wa_apr_get_tempval}])
+ unset wa_apr_get_tempval
+ ])
+
+dnl --------------------------------------------------------------------------
+dnl WA_APR_LIBNAME
+dnl Retrieve the complete name of the library.
+dnl $1 => Environment variable name for the returned value
+dnl $2 => APR sources directory as returned by WA_APR
+dnl --------------------------------------------------------------------------
+AC_DEFUN(
+ [WA_APR_LIBNAME],
+ [
+ AC_MSG_CHECKING([for apr APR_LIBNAME])
+ if test ! -f "$2/apr-config" ; then
+ WA_ERROR([cannot find apr-config file in $2])
+ fi
+ wa_apr_get_tempval=`$2/apr-config --apr-la-file 2> /dev/null`
+ if test -z "${wa_apr_get_tempval}" ; then
+ WA_ERROR([$2/apr-config --apr-la-file failed])
+ fi
+ wa_apr_get_tempval=`basename ${wa_apr_get_tempval}`
+ WA_APPEND([$1],[${wa_apr_get_tempval}])
+ AC_MSG_RESULT([${wa_apr_get_tempval}])
+ unset wa_apr_get_tempval
+ ])
+
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
