|
 |
b352c10 |
diff -up SimGear-2.0.0/configure.ac.expat SimGear-2.0.0/configure.ac
|
|
|
b352c10 |
--- SimGear-2.0.0/configure.ac.expat 2011-04-20 14:57:01.357414861 -0400
|
|
|
b352c10 |
+++ SimGear-2.0.0/configure.ac 2011-04-20 14:57:43.666878328 -0400
|
|
|
b352c10 |
@@ -295,6 +295,16 @@ AM_CONDITIONAL(HAVE_GLUT, test "x$have_g
|
|
 |
4f218ee |
opengl_LIBS="$LIBS"
|
|
|
4f218ee |
LIBS="$base_LIBS"
|
|
|
4f218ee |
|
|
|
4f218ee |
+dnl check for expat library
|
|
|
4f218ee |
+EXPAT_OK="no"
|
|
|
4f218ee |
+expat_LIBS=""
|
|
|
4f218ee |
+save_LIBS=$LIBS
|
|
|
4f218ee |
+LIBS="$LIBS $thread_LIBS"
|
|
|
4f218ee |
+AC_SEARCH_LIBS(XML_GetFeatureList, expat)
|
|
|
4f218ee |
+EXPAT_OK="$ac_cv_search_XML_GetFeatureList"
|
|
|
4f218ee |
+expat_LIBS="$LIBS"
|
|
|
4f218ee |
+LIBS=$save_LIBS
|
|
|
4f218ee |
+
|
|
|
4f218ee |
dnl check for OpenAL libraries
|
|
|
4f218ee |
OPENAL_OK="no"
|
|
|
4f218ee |
ALUT_OK="no"
|
|
|
b352c10 |
@@ -408,6 +418,7 @@ fi
|
|
|
4f218ee |
LIBS="$base_LIBS"
|
|
|
4f218ee |
|
|
|
4f218ee |
AC_SUBST(base_LIBS)
|
|
|
4f218ee |
+AC_SUBST(expat_LIBS)
|
|
|
4f218ee |
AC_SUBST(openal_LIBS)
|
|
|
4f218ee |
AC_SUBST(opengl_LIBS)
|
|
|
4f218ee |
AC_SUBST(thread_LIBS)
|
|
|
b352c10 |
diff -up SimGear-2.0.0/simgear/xml/Makefile.am.expat SimGear-2.0.0/simgear/xml/Makefile.am
|
|
|
b352c10 |
--- SimGear-2.0.0/simgear/xml/Makefile.am.expat 2011-04-20 14:57:01.367414734 -0400
|
|
|
b352c10 |
+++ SimGear-2.0.0/simgear/xml/Makefile.am 2011-04-20 14:57:01.388414468 -0400
|
|
|
b352c10 |
@@ -5,22 +5,13 @@ lib_LTLIBRARIES = libsgxml.la
|
|
|
4f218ee |
include_HEADERS = \
|
|
|
4f218ee |
easyxml.hxx
|
|
|
4f218ee |
|
|
|
4f218ee |
-noinst_HEADERS = \
|
|
|
4f218ee |
- xmltok_impl.c xmltok_ns.c
|
|
|
4f218ee |
-
|
|
|
4f218ee |
libsgxml_la_SOURCES = \
|
|
|
4f218ee |
- asciitab.h \
|
|
|
4f218ee |
- easyxml.cxx \
|
|
|
4f218ee |
- hashtable.h hashtable.c \
|
|
|
4f218ee |
- iasciitab.h latin1tab.h nametab.h utf8tab.h xmldef.h \
|
|
|
4f218ee |
- xmlparse.h xmlparse.c \
|
|
|
4f218ee |
- xmlrole.h xmlrole.c \
|
|
|
4f218ee |
- xmltok.h xmltok.c \
|
|
|
4f218ee |
- xmltok_impl.h
|
|
|
4f218ee |
+ easyxml.cxx
|
|
|
4f218ee |
|
|
|
4f218ee |
libsgxml_la_LDFLAGS = -release @VERSION@ -module
|
|
|
4f218ee |
|
|
|
b352c10 |
libsgxml_la_LIBADD = \
|
|
|
b352c10 |
+ $(expat_LIBS) \
|
|
|
b352c10 |
$(top_builddir)/simgear/structure/libsgstructure.la
|
|
|
b352c10 |
|
|
|
4f218ee |
INCLUDES = -I$(top_srcdir)
|
|
|
b352c10 |
diff -up SimGear-2.0.0/simgear/xml/easyxml.cxx.expat SimGear-2.0.0/simgear/xml/easyxml.cxx
|
|
|
b352c10 |
--- SimGear-2.0.0/simgear/xml/easyxml.cxx.expat 2011-04-20 14:59:57.673181770 -0400
|
|
|
b352c10 |
+++ SimGear-2.0.0/simgear/xml/easyxml.cxx 2011-04-20 15:00:05.680080530 -0400
|
|
|
4f218ee |
@@ -9,7 +9,7 @@
|
|
|
4f218ee |
#include <string.h> // strcmp()
|
|
|
4f218ee |
|
|
|
4f218ee |
#include "easyxml.hxx"
|
|
|
4f218ee |
-#include "xmlparse.h"
|
|
|
4f218ee |
+#include <expat.h>
|
|
|
4f218ee |
|
|
|
4f218ee |
#include <fstream>
|
|
|
4f218ee |
#include <iostream>
|