Author: rfm
Date: Fri May 29 19:01:30 2015
New Revision: 38591
URL: http://svn.gna.org/viewcvs/gnustep?rev=38591&view=rev
Log:
improve check for whether baseadd is needed
Modified:
libs/webservices/trunk/GNUmakefile
libs/webservices/trunk/GWSCoder.m
Modified: libs/webservices/trunk/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/webservices/trunk/GNUmakefile?rev=38591&r1=38590&r2=38591&view=diff
==============================================================================
--- libs/webservices/trunk/GNUmakefile (original)
+++ libs/webservices/trunk/GNUmakefile Fri May 29 19:01:30 2015
@@ -103,13 +103,18 @@
# Assume that the use of the gnu runtime means we have the gnustep
# base library and can use its extensions to build WebServices stuff.
#
-ifeq ($(OBJC_RUNTIME_LIB),gnu)
-APPLE=0
-else
-APPLE=1
+BASEADD=0
+ifeq ($(OBJC_RUNTIME_LIB),apple)
+BASEADD=1
+endif
+ifeq ($(OBJC_RUNTIME_LIB),nx)
+BASEADD=1
+endif
+ifeq ($(OBJC_RUNTIME_LIB),fd)
+BASEADD=1
endif
-ifeq ($(APPLE),1)
+ifeq ($(BASEADD),1)
ADDITIONAL_OBJC_LIBS += -lgnustep-baseadd
WebServices_LIBRARIES_DEPEND_UPON = -lgnustep-baseadd
endif
Modified: libs/webservices/trunk/GWSCoder.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/webservices/trunk/GWSCoder.m?rev=38591&r1=38590&r2=38591&view=diff
==============================================================================
--- libs/webservices/trunk/GWSCoder.m (original)
+++ libs/webservices/trunk/GWSCoder.m Fri May 29 19:01:30 2015
@@ -1064,7 +1064,7 @@
// NSLog(@"End element '%@'", elementName);
top = [_stack lastObject];
- if ([elementName isEqualToString: [top name]] == NO)
+ if ([elementName isEqual: [top name]] == NO)
{
[NSException raise: NSInvalidArgumentException
format: @"Element missmatch found '%@' expecting '%@'",
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
