Allow GUI to build when base has been configured without libxml2

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@39113 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2015-11-01 23:09:40 +00:00
parent 1501023c3b
commit 23533e0570
3 changed files with 16 additions and 4 deletions

View file

@ -1,3 +1,10 @@
2015-11-01 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GNUmakefile.preamble:
* Source/GSXibLoader.m:
Check to see if base was built with libxml2 before trying to use
classes which depend on it.
2015-11-01 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSImage.m: Alter loading of image by name so that before we

View file

@ -41,7 +41,8 @@ ADDITIONAL_CPPFLAGS = \
-DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
-DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \
-DGNUSTEP_TARGET_OS=\"$(GNUSTEP_TARGET_OS)\" \
-DLIBRARY_COMBO=\"$(LIBRARY_COMBO)\"
-DLIBRARY_COMBO=\"$(LIBRARY_COMBO)\" \
-DGNUSTEP_BASE_HAVE_LIBXML=$(GNUSTEP_BASE_HAVE_LIBXML) \
ifneq ($(BACKEND_BUNDLE),)
ADDITIONAL_CPPFLAGS += -DBACKEND_BUNDLE=1

View file

@ -1077,10 +1077,13 @@
- (NSData *) _preProcessXib: (NSData *)data
{
NSData *result = data;
NSData *result = nil;
#if GNUSTEP_BASE_HAVE_LIBXML
NSXMLDocument *document = [[NSXMLDocument alloc] initWithData:data
options:0
error:NULL];
result = data;
if (document == nil)
{
NSLog(@"%s:DOCUMENT IS NIL: %@\n", __PRETTY_FUNCTION__, document);
@ -1236,12 +1239,13 @@
RELEASE(document);
}
}
#endif
return result;
}
- (id) initForReadingWithData: (NSData*)data
{
#if GNUSTEP_BASE_HAVE_LIBXML
NSXMLParser *theParser;
NSData *theData = data;
@ -1277,7 +1281,7 @@
NS_ENDHANDLER
DESTROY(theParser);
#endif
return self;
}