- mass commit: cosmetics (removed trailing white spaces)

[packages/gdal.git] / gdal-xerces.patch

diff --git a/gdal-xerces.patch b/gdal-xerces.patch
index 3641632ac986d721bd48eafadc5e10ca4768d5a9..ae342614f94f05a99bf49bfd3c32d5a144f5f48b 100644 (file)
--- a/gdal-xerces.patch
+++ b/gdal-xerces.patch
@@ -1,10 +1,18 @@
---- gdal-1.1.8/ogr/ogrsf_frmts/gml/gmlreaderp.h.orig   Wed Mar  6 21:08:02 2002
-+++ gdal-1.1.8/ogr/ogrsf_frmts/gml/gmlreaderp.h        Sun Jan 26 14:37:19 2003
-@@ -46,6 +46,7 @@
+--- gdal-1.1.8/configure.in.orig       2003-05-16 00:05:10.000000000 +0200
++++ gdal-1.1.8/configure.in    2003-05-16 00:10:51.000000000 +0200
+@@ -747,8 +747,13 @@
+     fi
+   fi
  
- #include "gmlreader.h"
+-  echo '#include <util/PlatformUtils.hpp>' > conftest.cpp
+-  echo 'int main() {  XMLPlatformUtils::Initialize(); }' >> conftest.cpp
++  cat > conftest.cpp <<EOF
++#include <util/PlatformUtils.hpp>
++#ifdef XERCES_CPP_NAMESPACE_USE
++XERCES_CPP_NAMESPACE_USE
++#endif
++int main() {  XMLPlatformUtils::Initialize(); }
++EOF
+   CMD="${CXX} ${XERCES_INCLUDE} ${CPPFLAGS} -o conftest conftest.cpp $LIBS"
  
-+#undef INFINITY
- #include <dom/DOMString.hpp>
- #include <util/PlatformUtils.hpp>
- #include <sax2/DefaultHandler.hpp>
+   if test -z "`$CMD 2>&1`" ; then