[postgis-commits] svn - r2775 - in trunk: . lwgeom

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2008-05-14 10:19:50 -0700 (Wed, 14 May 2008)
New Revision: 2775

Removed:
   trunk/lwgeom/sqldefines.h
Modified:
   trunk/GNUmakefile
Log:
Fixes for previous commit: Alter GNUmakefile to understand that Makefile.config no longer exists, plus remove lwgeom/sqldefines.h as it is generated by autoconf

Modified: trunk/GNUmakefile
===================================================================
--- trunk/GNUmakefile	2008-05-14 17:10:19 UTC (rev 2774)
+++ trunk/GNUmakefile	2008-05-14 17:19:50 UTC (rev 2775)
@@ -1,10 +1,10 @@
 #-----------------------------------------------------
 #
-# Configuration directives are in Makefile.config
+# Configuration directives are in postgis_config.h 
 #
 #-----------------------------------------------------
 
-all: Makefile.config liblwgeom loaderdumper utils 
+all: liblwgeom loaderdumper utils 
 
 install: all liblwgeom-install loaderdumper-install 
 
@@ -18,7 +18,7 @@
 	rm -f config.log config.cache config.status Makefile.config
 	rm -f config.h
 
-maintainer-clean: Makefile.config
+maintainer-clean: 
 	@echo '------------------------------------------------------'
 	@echo 'This command is intended for maintainers to use; it'
 	@echo 'deletes files that may need special tools to rebuild.'
@@ -35,7 +35,7 @@
 test-clean:
 	$(MAKE) -C regress clean
 
-liblwgeom: Makefile.config
+liblwgeom: 
 	$(MAKE) -C lwgeom 
 
 liblwgeom-clean:
@@ -47,7 +47,7 @@
 liblwgeom-uninstall:
 	$(MAKE) -C lwgeom uninstall
 
-loaderdumper: Makefile.config
+loaderdumper:
 	$(MAKE) -C loader
 
 loaderdumper-clean:
@@ -59,7 +59,7 @@
 loaderdumper-uninstall:
 	$(MAKE) -C loader uninstall
 
-templategis: Makefile.config
+templategis:
 	$(MAKE) -C extras/template_gis
 
 templategis-clean:
@@ -71,10 +71,10 @@
 templategis-uninstall:
 	$(MAKE) -C extras/template_gis uninstall
 
-docs: Makefile.config
+docs: 
 	$(MAKE) -C doc 
 
-docs-clean: Makefile.config
+docs-clean:
 	$(MAKE) -C doc clean
 
 
@@ -93,10 +93,4 @@
 config.status: configure
 	./configure
 
-Makefile.config: Makefile.config.in config.status 
-	./config.status
-
-config.h: config.h.in config.status
-	./config.status
-
 .PHONY: utils

Deleted: trunk/lwgeom/sqldefines.h
===================================================================
--- trunk/lwgeom/sqldefines.h	2008-05-14 17:10:19 UTC (rev 2774)
+++ trunk/lwgeom/sqldefines.h	2008-05-14 17:19:50 UTC (rev 2775)
@@ -1,46 +0,0 @@
-#ifndef _LWPGIS_DEFINES
-#define _LWPGIS_DEFINES
-
-/*
- * Define just the version numbers; otherwise we get some strange substitutions in lwpostgis.sql.in
- */
-#define POSTGIS_PGSQL_VERSION 83
-#define POSTGIS_GEOS_VERSION 30
-#define POSTGIS_PROJ_VERSION 46
-
-/*
- * Define the build date and the version number
- * (these substitiutions are done with extra quotes sinces CPP
- * won't substitute within apostrophes)
- */
-#define _POSTGIS_SQL_SELECT_POSTGIS_VERSION 'SELECT ''1.4 USE_GEOS=1 USE_PROJ=1 USE_STATS=1''::text AS version'
-#define _POSTGIS_SQL_SELECT_POSTGIS_BUILD_DATE 'SELECT ''2008-05-14 08:59:43''::text AS version'
-
-
-#define CREATEFUNCTION CREATE OR REPLACE FUNCTION
-
-#if POSTGIS_PGSQL_VERSION > 72
-# define _IMMUTABLE_STRICT IMMUTABLE STRICT
-# define _IMMUTABLE IMMUTABLE
-# define _STABLE_STRICT STABLE STRICT
-# define _STABLE STABLE
-# define _VOLATILE_STRICT VOLATILE STRICT
-# define _VOLATILE VOLATILE
-# define _STRICT STRICT
-# define _SECURITY_DEFINER SECURITY DEFINER
-#else 
-# define _IMMUTABLE_STRICT  with(iscachable,isstrict)
-# define _IMMUTABLE with(iscachable)
-# define _STABLE_STRICT with(isstrict)
-# define _STABLE 
-# define _VOLATILE_STRICT with(isstrict)
-# define _VOLATILE 
-# define _STRICT with(isstrict)
-# define _SECURITY_DEFINER 
-#endif 
-
-#if POSTGIS_PGSQL_VERSION >= 73
-# define HAS_SCHEMAS 1
-#endif
-
-#endif /* _LWPGIS_DEFINES */