Author: rfm
Date: Wed Mar 2 11:10:34 2016
New Revision: 39436
URL: http://svn.gna.org/viewcvs/gnustep?rev=39436&view=rev
Log:
Fix to check to see if we should use the additions library
Modified:
libs/license/trunk/GNUmakefile
libs/webserver/trunk/GNUmakefile
Modified: libs/license/trunk/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/license/trunk/GNUmakefile?rev=39436&r1=39435&r2=39436&view=diff
==============================================================================
--- libs/license/trunk/GNUmakefile (original)
+++ libs/license/trunk/GNUmakefile Wed Mar 2 11:10:34 2016
@@ -48,17 +48,10 @@
License.h\
License-C.h\
+# If we are not using the GNUstep foundation library,
+# we need to use its extensions to build License stuff.
#
-# Assume that the use of the gnu runtime means we have the gnustep
-# base library and can use its extensions to build License stuff.
-#
-ifeq ($(OBJC_RUNTIME_LIB),gnu)
-APPLE=0
-else
-APPLE=1
-endif
-
-ifeq ($(APPLE),1)
+ifneq ($(FOUNDATION_LIB),gnu)
ADDITIONAL_OBJC_LIBS += -lgnustep-baseadd
License_LIBRARIES_DEPEND_UPON = -lgnustep-baseadd
endif
Modified: libs/webserver/trunk/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/webserver/trunk/GNUmakefile?rev=39436&r1=39435&r2=39436&view=diff
==============================================================================
--- libs/webserver/trunk/GNUmakefile (original)
+++ libs/webserver/trunk/GNUmakefile Wed Mar 2 11:10:34 2016
@@ -58,17 +58,10 @@
# Optional Java wrappers for the library
JAVA_WRAPPER_NAME = WebServer
+# If we are not using the GNUstep foundation library,
+# we need to use its extensions to build WebServer stuff.
#
-# Assume that the use of the gnu runtime means we have the gnustep
-# base library and can use its extensions to build WebServer stuff.
-#
-ifeq ($(OBJC_RUNTIME_LIB),$(filter $(OBJC_RUNTIME_LIB), gnu gnugc ng))
-APPLE=0
-else
-APPLE=1
-endif
-
-ifeq ($(APPLE),1)
+ifneq ($(FOUNDATION_LIB),gnu)
ADDITIONAL_OBJC_LIBS += -lgnustep-baseadd
WebServer_LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
endif
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
