Author: mturk
Date: Fri Apr 14 00:33:27 2006
New Revision: 394040
URL: http://svn.apache.org/viewcvs?rev=394040&view=rev
Log:
Separate tcnative and apr versions.
Modified:
tomcat/connectors/trunk/jni/native/Makefile.in
tomcat/connectors/trunk/jni/native/configure.in
Modified: tomcat/connectors/trunk/jni/native/Makefile.in
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/Makefile.in?rev=394040&r1=394039&r2=394040&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/Makefile.in (original)
+++ tomcat/connectors/trunk/jni/native/Makefile.in Fri Apr 14 00:33:27 2006
@@ -8,6 +8,7 @@
# gets substituted into some targets
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
srcdir = @srcdir@
VPATH = @srcdir@
@@ -29,6 +30,7 @@
@INCLUDE_RULES@
@INCLUDE_OUTPUTS@
+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE)
-version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@
CLEAN_SUBDIRS = test
CLEAN_TARGETS = .make.dirs
Modified: tomcat/connectors/trunk/jni/native/configure.in
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/configure.in?rev=394040&r1=394039&r2=394040&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/configure.in (original)
+++ tomcat/connectors/trunk/jni/native/configure.in Fri Apr 14 00:33:27 2006
@@ -50,9 +50,11 @@
version_hdr="$abs_srcdir/include/tcn_version.h"
TCNATIVE_MAJOR_VERSION="`$get_version major $version_hdr TCN`"
TCNATIVE_DOTTED_VERSION="`$get_version all $version_hdr TCN`"
+TCNATIVE_LIBTOOL_VERSION="`$get_version libtool $version_hdr TCN`"
AC_SUBST(TCNATIVE_DOTTED_VERSION)
AC_SUBST(TCNATIVE_MAJOR_VERSION)
+AC_SUBST(TCNATIVE_LIBTOOL_VERSION)
echo "Tomcat Native Version: ${TCNATIVE_DOTTED_VERSION}"
@@ -146,7 +148,7 @@
CFLAGS="${CFLAGS} -DDEBUG -Wall"
else
CFLAGS="${CFLAGS} -DDEBUG"
- fi
+ fi
AC_MSG_RESULT([...Enabling Maintainer mode...])
])
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
