[jbossnative-commits] JBoss Native SVN: r1576 - in trunk/httpd/httpd-2.2: srclib/apr-util and 1 other directory.
Author: mladen.turk(a)jboss.com
Date: 2008-05-02 01:30:21 -0400 (Fri, 02 May 2008)
New Revision: 1576
Modified:
trunk/httpd/httpd-2.2/NMAKEhttpd.inc
trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
Log:
Add GNU iconv to the makefiles
Modified: trunk/httpd/httpd-2.2/NMAKEhttpd.inc
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2008-05-02 05:11:34 UTC (rev 1575)
+++ trunk/httpd/httpd-2.2/NMAKEhttpd.inc 2008-05-02 05:30:21 UTC (rev 1576)
@@ -45,11 +45,19 @@
ZLIB = zlib-1.lib
LIBZLIB = libzlib-1.lib
LIBHTTPD = libhttpd.lib
+LIBICONV = libiconv-1.lib
!IF "$(TARGET)" != "LIB"
LFLAGS = $(LFLAGS) /version:2.2
!ENDIF
+!IFDEF WITH_GNU_ICONV
+API = $(LIBICONV)
+LIBAPI = $(LIBICONV)
+!ENDIF
+
+
+
DISTSUBDIRS = \
$(PREFIX)\include\arch\win32\~ \
$(PREFIX)\lib\~ \
Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2008-05-02 05:11:34 UTC (rev
1575)
+++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2008-05-02 05:30:21 UTC (rev
1576)
@@ -28,18 +28,26 @@
!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == ""
TARGET=DLL
-CFLAGS = -DAPR_DECLARE_EXPORT -DAPU_DECLARE_EXPORT -DAPI_DECLARE_EXPORT $(CFLAGS)
+CFLAGS = -DAPR_DECLARE_EXPORT -DAPU_DECLARE_EXPORT $(CFLAGS)
PROJECT = libaprutil-1
APR_LIB = libapr-1.lib
API_LIB = libapriconv-1.lib
+API_CFLAGS = -DAPI_DECLARE_EXPORT
!ELSE
-CFLAGS = -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC -DAPI_DECLARE_STATIC $(CFLAGS)
+TARGET=LIB
+CFLAGS = -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC $(CFLAGS)
PROJECT = aprutil-1
APR_LIB = apr-1.lib
API_LIB = apriconv-1.lib
-TARGET=LIB
+API_CFLAGS = -DAPI_DECLARE_STATIC
!ENDIF
+!IFDEF WITH_GNU_ICONV
+API_LIB = libiconv-1.lib
+!ELSE
+CFLAGS = $(CFLAGS) $(API_CFLAGS)
+!ENDIF
+
CFLAGS = $(CFLAGS) -DAPU_USE_SDBM -DVERSION=\"expat_1.95.2\"
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
@@ -53,6 +61,9 @@
WITH_APR=..\apr
!ENDIF
+!IFDEF WITH_GNU_ICONV
+WITH_API=..\libiconv
+!ENDIF
!IFNDEF WITH_API
WITH_API=..\apr-iconv
!ENDIF