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 2009/07/11 18:42:13 UTC

svn commit: r793197 - /httpd/httpd/trunk/NWGNUmakefile

Author: fuankg
Date: Sat Jul 11 16:42:12 2009
New Revision: 793197

URL: http://svn.apache.org/viewvc?rev=793197&view=rev
Log:
added NetWare build defaults; added path sanity checks; removed obsolete include path.

Modified:
    httpd/httpd/trunk/NWGNUmakefile

Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=793197&r1=793196&r2=793197&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Sat Jul 11 16:42:12 2009
@@ -1,4 +1,35 @@
 #
+# Define our required macro's if not already done.
+#
+
+ifndef AP_WORK
+export AP_WORK = $(CURDIR)
+endif
+
+ifndef APR_WORK
+ifeq "$(wildcard $(AP_WORK)/srclib/apr)" "$(AP_WORK)/srclib/apr"
+export APR_WORK = $(AP_WORK)/srclib/apr
+endif
+endif
+ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h"
+$(error APR_WORK does not point to a valid APR source tree) 
+endif
+
+ifndef APU_WORK
+ifeq "$(wildcard $(AP_WORK)/srclib/apr-util)" "$(AP_WORK)/srclib/apr-uril"
+export APU_WORK = $(AP_WORK)/srclib/apr-util
+endif
+endif
+ifndef APU_WORK
+ifeq "$(wildcard $(APR_WORK)/include/apu_version.h)" "$(APR_WORK)/include/apu_version.h"
+export APU_WORK = $(APR_WORK)
+endif
+endif
+ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h"
+$(error APU_WORK does not point to a valid APU source tree) 
+endif
+
+#
 # Declare the sub-directories to be built here
 #
 
@@ -43,7 +74,6 @@
 			$(AP_WORK)/server/mpm/NetWare \
 			$(PCRESDK) \
 			$(NWOS) \
-			$(AP_WORK)/modules/ssl \
 			$(EOLIST)
 
 #