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