[jbossnative-commits] JBoss Native SVN: r1951 - in trunk/httpd/httpd-2.2/srclib: apr-util and 1 other directory.
Author: mladen.turk(a)jboss.com
Date: 2008-10-12 14:14:30 -0400 (Sun, 12 Oct 2008)
New Revision: 1951
Modified:
trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu
trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile
Log:
More httpd 2.2.9+ build patches
Modified: trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile 2008-10-12 15:21:29 UTC (rev 1950)
+++ trunk/httpd/httpd-2.2/srclib/apr/NMAKEmakefile 2008-10-12 18:14:30 UTC (rev 1951)
@@ -112,6 +112,11 @@
$(WORKDIR)\groupinfo.obj \
$(WORKDIR)\userinfo.obj
+!IF EXIST($(SRCDIR)\file_io\win32\buffer.c)
+OBJECTS = $(OBJECTS) \
+ $(WORKDIR)\buffer.obj
+!ENDIF
+
HEADERS = $(SRCDIR)\include\apr.h
!IF "$(TARGET)" == "DLL"
Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu 2008-10-12 15:21:29 UTC (rev 1950)
+++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu 2008-10-12 18:14:30 UTC (rev 1951)
@@ -109,9 +109,6 @@
$(WORKDIR)\sdbm_pair.obj \
$(WORKDIR)\apr_base64.obj \
$(WORKDIR)\apr_hooks.obj \
- $(WORKDIR)\apr_ldap_init.obj \
- $(WORKDIR)\apr_ldap_url.obj \
- $(WORKDIR)\apr_ldap_option.obj \
$(WORKDIR)\apr_date.obj \
$(WORKDIR)\apr_queue.obj \
$(WORKDIR)\apr_reslist.obj \
@@ -130,15 +127,28 @@
OBJECTS = $(OBJECTS) \
$(WORKDIR)\apu_dso.obj \
$(WORKDIR)\apr_thread_pool.obj \
- $(WORKDIR)\apr_memcache.obj \
+ $(WORKDIR)\apr_memcache.obj
+
!ENDIF
!IF EXIST($(SRCDIR)\LDAP\apr_ldap_stub.c)
+OBJECTS = $(OBJECTS) \
+ $(WORKDIR)\apr_ldap_stub.obj \
+ $(WORKDIR)\apr_ldap_url.obj
+
!IF "$(TARGET)" == "LIB"
OBJECTS = $(OBJECTS) \
- $(WORKDIR)\apr_ldap_rebind.obj \
- $(WORKDIR)\apr_ldap_stub.obj
+ $(WORKDIR)\apr_ldap_init.obj \
+ $(WORKDIR)\apr_ldap_option.obj \
+ $(WORKDIR)\apr_ldap_rebind.obj
+
!ENDIF
+!ELSE
+OBJECTS = $(OBJECTS) \
+ $(WORKDIR)\apr_ldap_init.obj \
+ $(WORKDIR)\apr_ldap_option.obj \
+ $(WORKDIR)\apr_ldap_url.obj
+
!ENDIF
HEADERS = \
Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2008-10-12 15:21:29 UTC (rev
1950)
+++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2008-10-12 18:14:30 UTC (rev
1951)
@@ -22,7 +22,12 @@
# ====================================================================
#
+!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == ""
TARGET=DLL
+!ELSE
+TARGET=LIB
+!ENDIF
+
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
SRCDIR = .
!ENDIF