[jbossnative-commits] JBoss Native SVN: r1262 - trunk/httpd/httpd-2.2/modules/mod_jk.
Author: mladen.turk(a)jboss.com
Date: 2007-12-20 02:00:26 -0500 (Thu, 20 Dec 2007)
New Revision: 1262
Modified:
trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk
Log:
Add HAVE_JNI although jni worker is deprecated.
Modified: trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk
===================================================================
--- trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk 2007-12-19 16:37:33 UTC (rev 1261)
+++ trunk/httpd/httpd-2.2/modules/mod_jk/NMAKEmodjk 2007-12-20 07:00:26 UTC (rev 1262)
@@ -40,7 +40,7 @@
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
BUILDBIN = $(WORKDIR)\$(PROJECT).so
-BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
BUILDMFT = $(BUILDBIN).manifest
@@ -69,6 +69,11 @@
$(WORKDIR)\jk_worker.obj \
$(WORKDIR)\mod_jk.obj
+!IF DEFINED(HAVE_JNI) && DEFINED(JAVA_HOME)
+OBJECTS = $(OBJECTS) $(WORKDIR)\jk_jni_worker.obj
+INCLUDES = $(INCLUDES) -I$(JAVA_HOME)\include -I$(JAVA_HOME)\include\win32
+!ENDIF
+
{$(SRCDIR)\common}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<