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 b49c088d4655cf2b8d846bd5809be943fb7653e3..48ca952dd6b02795754b89fcdafaacd54ea8021e 100644 (file)
--- 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 07fc95364e28215970f01f95a830d28d6f2be1f1..af0be9349aa6e0a0323246e1c3b5e55439a55fd3 100644 (file)
--- 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 54b6ce17e6853cc988d21b108071f8bcdd511062..04a55866cfd73f3fd56ff70a7c06ed20865ee2a6 100644 (file)
--- 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
 -----------------------------------------------------------------------