Author: mturk
Date: Fri Oct 22 04:31:20 2010
New Revision: 1026209
URL: http://svn.apache.org/viewvc?rev=1026209&view=rev
Log:
Axe portable.h and use config.h guarded by preproc define
Removed:
tomcat/jk/trunk/native/common/portable.h
tomcat/jk/trunk/native/common/portable.h.sample
Modified:
tomcat/jk/trunk/native/Makefile.am
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/native/configure.in
Modified: tomcat/jk/trunk/native/Makefile.am
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/Makefile.am?rev=1026209&r1=1026208&r2=1026209&view=diff
==============================================================================
--- tomcat/jk/trunk/native/Makefile.am (original)
+++ tomcat/jk/trunk/native/Makefile.am Fri Oct 22 04:31:20 2010
@@ -17,8 +17,8 @@
# Tell automake what it should do
AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES=config.cache config.status config.log \
-config.nice Makefile.in configure common/portable.h.in \
-aclocal.m4
+config.nice Makefile.in configure common/config.h.in \
+common/config.h aclocal.m4
SUBDIRS = @WEBSERVER@
Modified: tomcat/jk/trunk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1026209&r1=1026208&r2=1026209&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Fri Oct 22 04:31:20 2010
@@ -25,8 +25,8 @@
#ifndef JK_GLOBAL_H
#define JK_GLOBAL_H
-#if !defined(WIN32) && !defined(AS400) && !defined(NETWARE)
-#include "portable.h"
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
#endif
#if defined(WIN32)
Modified: tomcat/jk/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.in?rev=1026209&r1=1026208&r2=1026209&view=diff
==============================================================================
--- tomcat/jk/trunk/native/configure.in (original)
+++ tomcat/jk/trunk/native/configure.in Fri Oct 22 04:31:20 2010
@@ -20,7 +20,7 @@ AC_REVISION($Id$)dnl
AC_PREREQ(2.13)
AC_INIT(common/jk_worker.h)
-AC_CONFIG_HEADER(common/portable.h)
+AC_CONFIG_HEADER(common/config.h)
AC_CONFIG_AUX_DIR(scripts/build/unix)
AC_CANONICAL_SYSTEM
@@ -60,6 +60,10 @@ AC_SUBST(CP)
AC_PATH_PROG(MKDIR,mkdir,$PATH)dnl
AC_SUBST(MKDIR)
+dnl Mark that we have generated config.h
+CFLAGS="${CFLAGS} -DHAVE_CONFIG_H"
+AC_SUBST(CFLAGS)
+
APACHE_CONFIG_VARS=`pwd`/scripts/build/config_vars.mk
WEBSERVER=""
apache_dir=""
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
