mturk 2005/06/11 23:10:13
Modified: jni/native Makefile.in configure.in
jni/native/build tcnative.m4
Log:
Fix compilation by favoring CFLAGS, CPPFLAGS, LIBS and LDFLAGS
set before calling configure.
Revision Changes Path
1.9 +5 -1 jakarta-tomcat-connectors/jni/native/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 6 Jun 2005 16:15:20 -0000 1.8
+++ Makefile.in 12 Jun 2005 06:10:13 -0000 1.9
@@ -2,6 +2,9 @@
# Top-level Makefile for TCNATIVE
#
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+
# gets substituted into some targets
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -9,7 +12,8 @@
srcdir = @srcdir@
VPATH = @srcdir@
-INCLUDES = @SSL_CFLAGS@ @TCNATIVE_INCLUDES@ @TCNATIVE_PRIV_INCLUDES@
@APR_INCLUDES@
+# this sucks, but it's the only way to add extra flags to the LT_COMPILE
+INCLUDES = @CFLAGS@ @CPPFLAGS@ @TCNATIVE_INCLUDES@ @TCNATIVE_PRIV_INCLUDES@
@APR_INCLUDES@
TCNATIVE_LDFLAGS = @TCNATIVE_LDFLAGS@
TCNATIVE_LIBS = @TCNATIVE_LIBS@
1.5 +4 -3 jakarta-tomcat-connectors/jni/native/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.in 6 Jun 2005 16:15:20 -0000 1.4
+++ configure.in 12 Jun 2005 06:10:13 -0000 1.5
@@ -81,8 +81,6 @@
dnl
APR_SETIFNULL(CC, `$apr_config --cc`)
APR_SETIFNULL(CPP, `$apr_config --cpp`)
-APR_ADDTO(CFLAGS, `$apr_config --cflags`)
-APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`)
AC_PROG_INSTALL
@@ -133,14 +131,17 @@
dnl
dnl Prep all the flags and stuff for compilation and export to other builds
dnl
+APR_ADDTO(TCNATIVE_LIBS, [$LIBS])
APR_ADDTO(TCNATIVE_LIBS, [$APR_LIBS])
+APR_ADDTO(TCNATIVE_LDFLAGS, [$LDFLAGS])
AC_SUBST(TCNATIVE_EXPORT_LIBS)
AC_SUBST(TCNATIVE_PRIV_INCLUDES)
AC_SUBST(TCNATIVE_INCLUDES)
AC_SUBST(TCNATIVE_LDFLAGS)
AC_SUBST(TCNATIVE_LIBS)
-AC_SUBST(LDFLAGS)
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
dnl copy apr's rules.mk into our build directory.
if test ! -d ./build; then
1.9 +1 -2 jakarta-tomcat-connectors/jni/native/build/tcnative.m4
Index: tcnative.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/build/tcnative.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tcnative.m4 8 Jun 2005 07:56:24 -0000 1.8
+++ tcnative.m4 12 Jun 2005 06:10:13 -0000 1.9
@@ -320,8 +320,7 @@
dnl (a) define preprocessor symbols
if test "$tcn_ssltk_type" = "openssl"; then
APR_SETVAR(SSL_LIBS, [-lssl -lcrypto])
- APR_ADDTO(SSL_CFLAGS, [-DHAVE_OPENSSL])
+ APR_ADDTO(CFLAGS, [-DHAVE_OPENSSL])
fi
AC_SUBST(SSL_LIBS)
- AC_SUBST(SSL_CFLAGS)
])
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
