diff options
Diffstat (limited to 'remove-expat.patch')
-rw-r--r-- | remove-expat.patch | 260 |
1 files changed, 260 insertions, 0 deletions
diff --git a/remove-expat.patch b/remove-expat.patch new file mode 100644 index 000000000000..ea81e1a2129d --- /dev/null +++ b/remove-expat.patch @@ -0,0 +1,260 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -81,7 +81,7 @@ + 3ds/libformat3ds.la collision/libcollision.la hardcopy/libhardcopy.la \ + threads/libthreads.la shaders/libshaders.la \ + shadows/libshadows.la geo/libgeo.la foreignfiles/libforeignfiles.la \ +- xml/libxml.la xml/expat/libexpat.la profiler/libprofiler.la \ ++ xml/libxml.la profiler/libprofiler.la \ + vrml97/libvrml97.la scxml/libscxml.la $(SUPERGLULIBADD) + endif + endif +@@ -126,7 +126,6 @@ + geo/all-geo-cpp.cpp \ + foreignfiles/all-foreignfiles-cpp.cpp \ + xml/all-xml-cpp.cpp \ +- xml/expat/all-expat-c.c \ + profiler/all-profiler-cpp.cpp \ + vrml97/all-vrml97-cpp.cpp \ + scxml/all-scxml-cpp.cpp \ +@@ -162,7 +161,7 @@ + 3ds/format3ds.lst collision/collision.lst hardcopy/hardcopy.lst \ + threads/threads.lst shaders/shaders.lst \ + shadows/shadows.lst geo/geo.lst foreignfiles/foreignfiles.lst \ +- xml/xml.lst xml/expat/expat.lst profiler/profiler.lst \ ++ xml/xml.lst profiler/profiler.lst \ + vrml97/vrml97.lst scxml/scxml.lst $(SUPERGLULSTADD) + + # ************************************************************************** +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -113,7 +113,7 @@ + collision/collision.lst hardcopy/hardcopy.lst \ + threads/threads.lst shaders/shaders.lst shadows/shadows.lst \ + geo/geo.lst foreignfiles/foreignfiles.lst xml/xml.lst \ +- xml/expat/expat.lst profiler/profiler.lst vrml97/vrml97.lst \ ++ profiler/profiler.lst vrml97/vrml97.lst \ + scxml/scxml.lst $(am__DEPENDENCIES_1) + am__coin@COIN_MAJOR_VERSION@@SUFFIX@_lib_SOURCES_DIST = tidbits.cpp \ + share/gl/CoinGLPerformance.cpp actions/all-actions-cpp.cpp \ +@@ -134,7 +134,7 @@ + threads/all-threads-cpp.cpp shaders/all-shaders-cpp.cpp \ + shadows/all-shadows-cpp.cpp geo/all-geo-cpp.cpp \ + foreignfiles/all-foreignfiles-cpp.cpp xml/all-xml-cpp.cpp \ +- xml/expat/all-expat-c.c profiler/all-profiler-cpp.cpp \ ++ profiler/all-profiler-cpp.cpp \ + vrml97/all-vrml97-cpp.cpp scxml/all-scxml-cpp.cpp + @MAC_FRAMEWORK_FALSE@am__objects_1 = tidbits.$(OBJEXT) \ + @MAC_FRAMEWORK_FALSE@ CoinGLPerformance.$(OBJEXT) +@@ -173,7 +173,6 @@ + @MAC_FRAMEWORK_TRUE@ all-geo-cpp.$(OBJEXT) \ + @MAC_FRAMEWORK_TRUE@ all-foreignfiles-cpp.$(OBJEXT) \ + @MAC_FRAMEWORK_TRUE@ all-xml-cpp.$(OBJEXT) \ +-@MAC_FRAMEWORK_TRUE@ all-expat-c.$(OBJEXT) \ + @MAC_FRAMEWORK_TRUE@ all-profiler-cpp.$(OBJEXT) \ + @MAC_FRAMEWORK_TRUE@ all-vrml97-cpp.$(OBJEXT) \ + @MAC_FRAMEWORK_TRUE@ all-scxml-cpp.$(OBJEXT) tidbits.$(OBJEXT) \ +@@ -218,7 +217,6 @@ + @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ geo/libgeo.la \ + @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ foreignfiles/libforeignfiles.la \ + @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ xml/libxml.la \ +-@HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ xml/expat/libexpat.la \ + @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ profiler/libprofiler.la \ + @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ vrml97/libvrml97.la \ + @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ scxml/libscxml.la \ +@@ -242,7 +240,7 @@ + threads/all-threads-cpp.cpp shaders/all-shaders-cpp.cpp \ + shadows/all-shadows-cpp.cpp geo/all-geo-cpp.cpp \ + foreignfiles/all-foreignfiles-cpp.cpp xml/all-xml-cpp.cpp \ +- xml/expat/all-expat-c.c profiler/all-profiler-cpp.cpp \ ++ profiler/all-profiler-cpp.cpp \ + vrml97/all-vrml97-cpp.cpp scxml/all-scxml-cpp.cpp + @MAC_FRAMEWORK_FALSE@am__objects_3 = tidbits.lo CoinGLPerformance.lo + @MAC_FRAMEWORK_TRUE@am__objects_3 = all-actions-cpp.lo all-base-cpp.lo \ +@@ -263,7 +261,7 @@ + @MAC_FRAMEWORK_TRUE@ all-threads-cpp.lo all-shaders-cpp.lo \ + @MAC_FRAMEWORK_TRUE@ all-shadows-cpp.lo all-geo-cpp.lo \ + @MAC_FRAMEWORK_TRUE@ all-foreignfiles-cpp.lo all-xml-cpp.lo \ +-@MAC_FRAMEWORK_TRUE@ all-expat-c.lo all-profiler-cpp.lo \ ++@MAC_FRAMEWORK_TRUE@ all-profiler-cpp.lo \ + @MAC_FRAMEWORK_TRUE@ all-vrml97-cpp.lo all-scxml-cpp.lo \ + @MAC_FRAMEWORK_TRUE@ tidbits.lo CoinGLPerformance.lo + am_libCoin@SUFFIX@_la_OBJECTS = $(am__objects_3) +@@ -298,8 +296,6 @@ + @AMDEP_TRUE@ ./$(DEPDIR)/all-errors-cpp.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/all-events-cpp.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/all-events-cpp.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/all-expat-c.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/all-expat-c.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/all-fields-cpp.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/all-fields-cpp.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/all-fonts-cpp.Plo \ +@@ -686,7 +682,7 @@ + @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ 3ds/libformat3ds.la collision/libcollision.la hardcopy/libhardcopy.la \ + @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ threads/libthreads.la shaders/libshaders.la \ + @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ shadows/libshadows.la geo/libgeo.la foreignfiles/libforeignfiles.la \ +-@HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ xml/libxml.la xml/expat/libexpat.la profiler/libprofiler.la \ ++@HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ xml/libxml.la profiler/libprofiler.la \ + @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ vrml97/libvrml97.la scxml/libscxml.la $(SUPERGLULIBADD) + + @HACKING_DYNAMIC_MODULES_TRUE@@MAC_FRAMEWORK_FALSE@libCoin@SUFFIX@_la_LIBADD = +@@ -736,7 +732,6 @@ + @MAC_FRAMEWORK_TRUE@ geo/all-geo-cpp.cpp \ + @MAC_FRAMEWORK_TRUE@ foreignfiles/all-foreignfiles-cpp.cpp \ + @MAC_FRAMEWORK_TRUE@ xml/all-xml-cpp.cpp \ +-@MAC_FRAMEWORK_TRUE@ xml/expat/all-expat-c.c \ + @MAC_FRAMEWORK_TRUE@ profiler/all-profiler-cpp.cpp \ + @MAC_FRAMEWORK_TRUE@ vrml97/all-vrml97-cpp.cpp \ + @MAC_FRAMEWORK_TRUE@ scxml/all-scxml-cpp.cpp \ +@@ -765,7 +760,7 @@ + 3ds/format3ds.lst collision/collision.lst hardcopy/hardcopy.lst \ + threads/threads.lst shaders/shaders.lst \ + shadows/shadows.lst geo/geo.lst foreignfiles/foreignfiles.lst \ +- xml/xml.lst xml/expat/expat.lst profiler/profiler.lst \ ++ xml/xml.lst profiler/profiler.lst \ + vrml97/vrml97.lst scxml/scxml.lst $(SUPERGLULSTADD) + + @MACOSX_10_2FF_FALSE@LibtoolLinkArgs = -no-undefined +@@ -939,8 +934,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/all-errors-cpp.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/all-events-cpp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/all-events-cpp.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/all-expat-c.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/all-expat-c.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/all-fields-cpp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/all-fields-cpp.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/all-fonts-cpp.Plo@am__quote@ +@@ -1042,30 +1035,6 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o all-engines-c.lo `test -f 'engines/all-engines-c.c' || echo '$(srcdir)/'`engines/all-engines-c.c + +-all-expat-c.o: xml/expat/all-expat-c.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT all-expat-c.o -MD -MP -MF "$(DEPDIR)/all-expat-c.Tpo" -c -o all-expat-c.o `test -f 'xml/expat/all-expat-c.c' || echo '$(srcdir)/'`xml/expat/all-expat-c.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/all-expat-c.Tpo" "$(DEPDIR)/all-expat-c.Po"; else rm -f "$(DEPDIR)/all-expat-c.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xml/expat/all-expat-c.c' object='all-expat-c.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/all-expat-c.Po' tmpdepfile='$(DEPDIR)/all-expat-c.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o all-expat-c.o `test -f 'xml/expat/all-expat-c.c' || echo '$(srcdir)/'`xml/expat/all-expat-c.c +- +-all-expat-c.obj: xml/expat/all-expat-c.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT all-expat-c.obj -MD -MP -MF "$(DEPDIR)/all-expat-c.Tpo" -c -o all-expat-c.obj `if test -f 'xml/expat/all-expat-c.c'; then $(CYGPATH_W) 'xml/expat/all-expat-c.c'; else $(CYGPATH_W) '$(srcdir)/xml/expat/all-expat-c.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/all-expat-c.Tpo" "$(DEPDIR)/all-expat-c.Po"; else rm -f "$(DEPDIR)/all-expat-c.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xml/expat/all-expat-c.c' object='all-expat-c.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/all-expat-c.Po' tmpdepfile='$(DEPDIR)/all-expat-c.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o all-expat-c.obj `if test -f 'xml/expat/all-expat-c.c'; then $(CYGPATH_W) 'xml/expat/all-expat-c.c'; else $(CYGPATH_W) '$(srcdir)/xml/expat/all-expat-c.c'; fi` +- +-all-expat-c.lo: xml/expat/all-expat-c.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT all-expat-c.lo -MD -MP -MF "$(DEPDIR)/all-expat-c.Tpo" -c -o all-expat-c.lo `test -f 'xml/expat/all-expat-c.c' || echo '$(srcdir)/'`xml/expat/all-expat-c.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/all-expat-c.Tpo" "$(DEPDIR)/all-expat-c.Plo"; else rm -f "$(DEPDIR)/all-expat-c.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xml/expat/all-expat-c.c' object='all-expat-c.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/all-expat-c.Plo' tmpdepfile='$(DEPDIR)/all-expat-c.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o all-expat-c.lo `test -f 'xml/expat/all-expat-c.c' || echo '$(srcdir)/'`xml/expat/all-expat-c.c +- + .cpp.o: + @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +--- Coin-3.1.3/src/xml/Makefile.am 2010-03-02 15:20:09.000000000 +0200 ++++ Coin-3.1.3/src/xml/Makefile.am 2018-08-27 14:20:04.119896615 +0300 +@@ -1,6 +1,6 @@ + ## Process this file with automake to generate Makefile.in. + +-SUBDIRS = expat ++SUBDIRS = + + RegularSources = \ + document.cpp \ +--- a/src/xml/Makefile.in ++++ b/src/xml/Makefile.in +@@ -422,7 +422,7 @@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ +-SUBDIRS = expat ++SUBDIRS = + RegularSources = \ + document.cpp \ + element.cpp \ +--- a/src/xml/document.cpp ++++ b/src/xml/document.cpp +@@ -42,8 +42,8 @@ + #include <Inventor/C/XML/parser.h> + #include <Inventor/lists/SbList.h> + #include <Inventor/SbString.h> ++#include <expat.h> + +-#include "expat/expat.h" + #include "utils.h" + #include "elementp.h" + +--- a/configure ++++ b/configure +@@ -31523,7 +31523,7 @@ + elements/GL:glelements engines errors events fields fonts glue io \ + manips misc lists nodekits navigation nodes shapenodes projectors \ + sensors shaders upgraders hardcopy shadows geo foreignfiles collision \ +- xml xml/expat:expat profiler 3ds:format3ds scxml; \ ++ xml profiler 3ds:format3ds scxml; \ + do + case $dir in + *:* ) +@@ -32308,7 +32308,7 @@ + + # ************************************************************************** + +-ac_config_files="$ac_config_files Makefile bin/Makefile include/Makefile include/Inventor/Makefile include/Inventor/C/Makefile include/Inventor/C/XML/Makefile include/Inventor/C/base/Makefile include/Inventor/C/errors/Makefile include/Inventor/C/glue/Makefile include/Inventor/C/threads/Makefile include/Inventor/VRMLnodes/Makefile include/Inventor/XML/Makefile include/Inventor/actions/Makefile include/Inventor/bundles/Makefile include/Inventor/caches/Makefile include/Inventor/collision/Makefile include/Inventor/details/Makefile include/Inventor/draggers/Makefile include/Inventor/elements/Makefile include/Inventor/engines/Makefile include/Inventor/errors/Makefile include/Inventor/events/Makefile include/Inventor/fields/Makefile include/Inventor/lists/Makefile include/Inventor/lock/Makefile include/Inventor/manips/Makefile include/Inventor/misc/Makefile include/Inventor/nodekits/Makefile include/Inventor/nodes/Makefile include/Inventor/projectors/Makefile include/Inventor/sensors/Makefile include/Inventor/system/Makefile include/Inventor/threads/Makefile include/Inventor/tools/Makefile include/Inventor/scxml/Makefile include/Inventor/annex/Makefile include/Inventor/annex/HardCopy/Makefile include/Inventor/annex/ForeignFiles/Makefile include/Inventor/annex/FXViz/Makefile include/Inventor/annex/FXViz/elements/Makefile include/Inventor/annex/FXViz/nodes/Makefile include/Inventor/annex/Profiler/Makefile include/Inventor/annex/Profiler/elements/Makefile include/Inventor/annex/Profiler/engines/Makefile include/Inventor/annex/Profiler/nodes/Makefile include/Inventor/annex/Profiler/nodekits/Makefile include/Inventor/annex/Profiler/utils/Makefile data/Makefile data/draggerDefaults/Makefile data/shaders/Makefile data/shaders/lights/Makefile data/shaders/vsm/Makefile data/scxml/Makefile data/scxml/navigation/Makefile man/Makefile man/man1/Makefile man/man3/Makefile html/Makefile src/Makefile src/base/Makefile src/actions/Makefile src/bundles/Makefile src/caches/Makefile src/collision/Makefile src/details/Makefile src/draggers/Makefile src/elements/Makefile src/elements/GL/Makefile src/engines/Makefile src/errors/Makefile src/events/Makefile src/fields/Makefile src/fonts/Makefile src/glue/Makefile src/io/Makefile src/manips/Makefile src/misc/Makefile src/lists/Makefile src/navigation/Makefile src/nodekits/Makefile src/nodes/Makefile src/projectors/Makefile src/3ds/Makefile src/sensors/Makefile src/upgraders/Makefile src/shapenodes/Makefile src/threads/Makefile src/extensions/Makefile src/vrml97/Makefile src/hardcopy/Makefile src/shaders/Makefile src/shadows/Makefile src/geo/Makefile src/foreignfiles/Makefile src/xml/Makefile src/xml/expat/Makefile src/profiler/Makefile src/scxml/Makefile src/doc/Makefile testsuite/Makefile cfg/gendsp.pl" ++ac_config_files="$ac_config_files Makefile bin/Makefile include/Makefile include/Inventor/Makefile include/Inventor/C/Makefile include/Inventor/C/XML/Makefile include/Inventor/C/base/Makefile include/Inventor/C/errors/Makefile include/Inventor/C/glue/Makefile include/Inventor/C/threads/Makefile include/Inventor/VRMLnodes/Makefile include/Inventor/XML/Makefile include/Inventor/actions/Makefile include/Inventor/bundles/Makefile include/Inventor/caches/Makefile include/Inventor/collision/Makefile include/Inventor/details/Makefile include/Inventor/draggers/Makefile include/Inventor/elements/Makefile include/Inventor/engines/Makefile include/Inventor/errors/Makefile include/Inventor/events/Makefile include/Inventor/fields/Makefile include/Inventor/lists/Makefile include/Inventor/lock/Makefile include/Inventor/manips/Makefile include/Inventor/misc/Makefile include/Inventor/nodekits/Makefile include/Inventor/nodes/Makefile include/Inventor/projectors/Makefile include/Inventor/sensors/Makefile include/Inventor/system/Makefile include/Inventor/threads/Makefile include/Inventor/tools/Makefile include/Inventor/scxml/Makefile include/Inventor/annex/Makefile include/Inventor/annex/HardCopy/Makefile include/Inventor/annex/ForeignFiles/Makefile include/Inventor/annex/FXViz/Makefile include/Inventor/annex/FXViz/elements/Makefile include/Inventor/annex/FXViz/nodes/Makefile include/Inventor/annex/Profiler/Makefile include/Inventor/annex/Profiler/elements/Makefile include/Inventor/annex/Profiler/engines/Makefile include/Inventor/annex/Profiler/nodes/Makefile include/Inventor/annex/Profiler/nodekits/Makefile include/Inventor/annex/Profiler/utils/Makefile data/Makefile data/draggerDefaults/Makefile data/shaders/Makefile data/shaders/lights/Makefile data/shaders/vsm/Makefile data/scxml/Makefile data/scxml/navigation/Makefile man/Makefile man/man1/Makefile man/man3/Makefile html/Makefile src/Makefile src/base/Makefile src/actions/Makefile src/bundles/Makefile src/caches/Makefile src/collision/Makefile src/details/Makefile src/draggers/Makefile src/elements/Makefile src/elements/GL/Makefile src/engines/Makefile src/errors/Makefile src/events/Makefile src/fields/Makefile src/fonts/Makefile src/glue/Makefile src/io/Makefile src/manips/Makefile src/misc/Makefile src/lists/Makefile src/navigation/Makefile src/nodekits/Makefile src/nodes/Makefile src/projectors/Makefile src/3ds/Makefile src/sensors/Makefile src/upgraders/Makefile src/shapenodes/Makefile src/threads/Makefile src/extensions/Makefile src/vrml97/Makefile src/hardcopy/Makefile src/shaders/Makefile src/shadows/Makefile src/geo/Makefile src/foreignfiles/Makefile src/xml/Makefile src/profiler/Makefile src/scxml/Makefile src/doc/Makefile testsuite/Makefile cfg/gendsp.pl" + + + cat >confcache <<\_ACEOF +@@ -33211,7 +33211,6 @@ + "src/geo/Makefile") CONFIG_FILES="$CONFIG_FILES src/geo/Makefile" ;; + "src/foreignfiles/Makefile") CONFIG_FILES="$CONFIG_FILES src/foreignfiles/Makefile" ;; + "src/xml/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/Makefile" ;; +- "src/xml/expat/Makefile") CONFIG_FILES="$CONFIG_FILES src/xml/expat/Makefile" ;; + "src/profiler/Makefile") CONFIG_FILES="$CONFIG_FILES src/profiler/Makefile" ;; + "src/scxml/Makefile") CONFIG_FILES="$CONFIG_FILES src/scxml/Makefile" ;; + "src/doc/Makefile") CONFIG_FILES="$CONFIG_FILES src/doc/Makefile" ;; +--- a/configure.ac ++++ b/configure.ac +@@ -1951,7 +1951,7 @@ + elements/GL:glelements engines errors events fields fonts glue io \ + manips misc lists nodekits navigation nodes shapenodes projectors \ + sensors shaders upgraders hardcopy shadows geo foreignfiles collision \ +- xml xml/expat:expat profiler 3ds:format3ds scxml; \ ++ xml profiler 3ds:format3ds scxml; \ + do + case $dir in + *:* ) +@@ -2383,7 +2383,6 @@ + src/geo/Makefile + src/foreignfiles/Makefile + src/xml/Makefile +- src/xml/expat/Makefile + src/profiler/Makefile + src/scxml/Makefile + src/doc/Makefile +--- a/configure ++++ b/configure +@@ -21224,6 +21224,8 @@ + if $sim_ac_enable_system_expat; then + + $as_echo "#define HAVE_SYSTEM_EXPAT 1" >>confdefs.h ++LIBS="$LIBS -lexpat" ++COIN_EXTRA_LIBS="$COIN_EXTRA_LIBS -lexpat" + + + if test x"${sim_ac_configuration_settings+set}" = x"set"; then +diff -Nurb Coin-3.1.3.orig/configure.ac Coin-3.1.3/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -434,6 +434,8 @@ + if $sim_ac_enable_system_expat; then + AC_DEFINE([HAVE_SYSTEM_EXPAT], 1, [Define this if you want to use a system installation of expat]) + SIM_AC_CONFIGURATION_SETTING([Use system expat], [Yes]) ++ LIBS="$LIBS -lexpat" ++ COIN_EXTRA_LIBS="$COIN_EXTRA_LIBS -lexpat" + else + SIM_AC_CONFIGURATION_SETTING([Use system expat], [No (default)]) + fi |