From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Mon, 30 Nov 2009 20:37:56 +0000 (+0000)
Subject: Fix warnings from cpp during sql file build as reported by kneufeld
X-Git-Tag: 1.5.0b1~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ece3a6e51215228d8e1d6f8d6b255b17c1408ece;p=postgis

Fix warnings from cpp during sql file build as reported by kneufeld


git-svn-id: http://svn.osgeo.org/postgis/trunk@4943 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/configure.ac b/configure.ac
index b49c088d4..48ca952dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -393,9 +393,12 @@ if test "$FOUND_LIBXML2" = "1"; then
 	AC_SUBST([POSTGIS_LIBXML2_VERSION])
 fi
 
-
-
-
+POSTGIS_HAVE_LIBXML2=0
+if test "x$HAVE_LIBXML2" = "x1"; then
+	POSTGIS_HAVE_LIBXML2=1
+fi
+AC_DEFINE([POSTGIS_HAVE_LIBXML2])
+AC_SUBST([POSTGIS_HAVE_LIBXML2])
 
 
 dnl ===========================================================================
diff --git a/postgis/sqldefines.h.in b/postgis/sqldefines.h.in
index 07fc95364..af0be9349 100644
--- a/postgis/sqldefines.h.in
+++ b/postgis/sqldefines.h.in
@@ -22,6 +22,6 @@
 /* 
  * libxml2 support
  */
-#define HAVE_LIBXML2 @HAVE_LIBXML2@
+#define HAVE_LIBXML2 @POSTGIS_HAVE_LIBXML2@
 
 #endif /* _LWPGIS_DEFINES */
diff --git a/postgis/uninstall_postgis.sql.in.c b/postgis/uninstall_postgis.sql.in.c
index 54b6ce17e..04a55866c 100644
--- a/postgis/uninstall_postgis.sql.in.c
+++ b/postgis/uninstall_postgis.sql.in.c
@@ -250,6 +250,12 @@ DROP FUNCTION ST_AsGML(geometry, int4);
 DROP FUNCTION AsGML(geometry, int4);
 DROP FUNCTION _ST_AsGML(int4, geometry, int4, int4);
 
+#if HAVE_LIBXML2
+DROP FUNCTION ST_GeomFromGML(text);
+DROP FUNCTION ST_GMLToSQL(text);
+DROP FUNCTION ST_GeomFromKML(text);
+#endif
+
 -----------------------------------------------------------------------
 -- SVG OUTPUT
 -----------------------------------------------------------------------