You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2011/05/21 11:50:59 UTC
svn commit: r1125655 - in /httpd/httpd/branches/2.2.x/support: NWGNUab
utilitiesnw.def
Author: fuankg
Date: Sat May 21 09:50:58 2011
New Revision: 1125655
URL: http://svn.apache.org/viewvc?rev=1125655&view=rev
Log:
Enabled NetWare abs build; axed obsolete IDE .def.
Removed:
httpd/httpd/branches/2.2.x/support/utilitiesnw.def
Modified:
httpd/httpd/branches/2.2.x/support/NWGNUab
Modified: httpd/httpd/branches/2.2.x/support/NWGNUab
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/NWGNUab?rev=1125655&r1=1125654&r2=1125655&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/NWGNUab (original)
+++ httpd/httpd/branches/2.2.x/support/NWGNUab Sat May 21 09:50:58 2011
@@ -1,8 +1,4 @@
#
-# Make sure all needed macro's are defined
-#
-
-#
# Get the 'head' of the build environment if necessary. This includes default
# targets and paths to tools
#
@@ -12,16 +8,53 @@ include $(AP_WORK)/build/NWGNUhead.inc
endif
#
+# build this level's files
+#
+# Make sure all needed macro's are defined
+#
+
+ifeq "$(WITH_ABS)" "1"
+
+ifeq "$(USE_NTLS)" "1"
+SSL_INC = $(NTLSSDK)/inc
+SSL_LIB = $(NTLSSDK)/imp
+SSL_BIN = $(NTLSSDK)/bin
+SSL_APP = $(NTLSSDK)/apps
+ifneq "$(wildcard $(SSL_INC)/openssl/opensslv.h)" "$(SSL_INC)/openssl/opensslv.h"
+$(warning '$(NTLSSDK)' does NOT point to a valid NTLS SDK!)
+endif
+else
+SSL_INC = $(OSSLSDK)/outinc_nw_libc
+SSL_LIB = $(OSSLSDK)/out_nw_libc
+SSL_BIN = $(OSSLSDK)/out_nw_libc
+SSL_APP = $(OSSLSDK)/apps
+ifneq "$(wildcard $(SSL_INC)/openssl/opensslv.h)" "$(SSL_INC)/openssl/opensslv.h"
+$(warning '$(OSSLSDK)' does NOT point to a valid OpenSSL SDK!)
+endif
+endif
+ifeq "$(wildcard $(SSL_INC)/openssl/opensslv.h)" "$(SSL_INC)/openssl/opensslv.h"
+HAVE_OPENSSL = 1
+endif
+
+endif
+
+#
# These directories will be at the beginning of the include list, followed by
# INCDIRS
#
+ifdef HAVE_OPENSSL
+XINCDIRS += \
+ $(SSL_INC) \
+ $(SSL_INC)/openssl \
+ $(EOLIST)
+endif
+
XINCDIRS += \
$(NWOS) \
$(AP_WORK)/include \
$(APR)/include \
$(APRUTIL)/include \
$(APR)/misc/netware \
- $(APR) \
$(EOLIST)
#
@@ -33,14 +66,18 @@ XCFLAGS += \
#
# These defines will come after DEFINES
#
+ifdef HAVE_OPENSSL
XDEFINES += \
+ -DHAVE_OPENSSL \
$(EOLIST)
#
# These flags will be added to the link.opt file
#
XLFLAGS += \
+ -l $(SSL_LIB) \
$(EOLIST)
+endif
#
# These values will be appended to the correct variables based on the value of
@@ -93,7 +130,11 @@ endif
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME = ab
+ifdef HAVE_OPENSSL
+NLM_NAME = abs
+else
+NLM_NAME = ab
+endif
#
# This is used by the link '-desc ' directive.
@@ -105,7 +146,7 @@ NLM_DESCRIPTION = Apache $(VERSION_STR)
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
-NLM_THREAD_NAME = ab
+NLM_THREAD_NAME = $(NLM_NAME)
#
# This is used by the '-screenname' directive. If left blank,
@@ -123,7 +164,7 @@ NLM_VERSION =
#
# If this is specified, it will override the default of 64K
#
-NLM_STACK_SIZE = 8192
+NLM_STACK_SIZE =
#
@@ -157,7 +198,7 @@ XDCDATA =
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)/ab.nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -182,6 +223,15 @@ FILES_nlm_libs = \
$(PRELUDE) \
$(EOLIST)
+ifdef HAVE_OPENSSL
+ifneq "$(USE_NTLS)" "1"
+FILES_nlm_libs += \
+ $(SSL_LIB)/crypto.lib \
+ $(SSL_LIB)/ssl.lib \
+ $(EOLIST)
+endif
+endif
+
#
# These are the modules that the above NLM target depends on to load.
# These will be added as a module command in the link.opt file.
@@ -191,6 +241,13 @@ FILES_nlm_modules = \
libc \
$(EOLIST)
+ifdef HAVE_OPENSSL
+ifeq "$(USE_NTLS)" "1"
+FILES_nlm_modules += ntls \
+ $(EOLIST)
+endif
+endif
+
#
# If the nlm has a msg file, put it's path here
#
@@ -214,6 +271,25 @@ FILES_nlm_Ximports = \
@libc.imp \
$(EOLIST)
+# Don't link with Winsock if standard sockets are being used
+ifneq "$(USE_STDSOCKETS)" "1"
+FILES_nlm_Ximports += @ws2nlm.imp \
+ $(EOLIST)
+endif
+
+ifdef HAVE_OPENSSL
+ifeq "$(USE_NTLS)" "1"
+FILES_nlm_Ximports += @ntls.imp \
+ $(EOLIST)
+else
+FILES_nlm_Ximports += \
+ GetProcessSwitchCount \
+ RunningProcess \
+ GetSuperHighResolutionTimer \
+ $(EOLIST)
+endif
+endif
+
#
# Any symbols exported to here
#
@@ -252,4 +328,3 @@ install :: nlms FORCE
include $(APBUILD)/NWGNUtail.inc
-