Changeset 9639

Timestamp:

Apr 12, 2012, 7:09:22 AM (12 years ago)

Author:

strk

Message:

Use an SQLPP command for pre-processing SQL files (#1694)

The SQLPP command is figured at ./configure time.
It will use cpp(1) or gpp(1) if any is found in that order or
fallback to whatever CPP expands to (usually the compiler with -E)

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• postgis/Makefile.in (modified) (2 diffs)
• raster/rt_pg/Makefile.in (modified) (2 diffs)
• topology/Makefile.in (modified) (2 diffs)

trunk/configure.ac

@@ -28 +28 @@
 AC_PATH_PROG([ANT], [ant], [])
 AC_SUBST([ANT])
+
+dnl
+dnl SQL Preprocessor
+dnl
+AC_PATH_PROG([CPPBIN], [cpp], [])
+if test "x$CPPBIN" != "x"; then
+  SQLPP="${CPPBIN} -traditional-cpp -P"
+else
+  AC_PATH_PROG([GPP], [gpp_], [])
+  if test "x$GPP" != "x"; then
+    SQLPP="${GPP} -C -s \'" dnl Use better string support
+  else
+    SQLPP="${CPP} -traditional-cpp"
+  fi
+fi
+AC_SUBST([SQLPP])
 
 dnl
@@ -1105 +1121 @@
 AC_MSG_RESULT([  C compiler:           ${CC} ${CFLAGS}])
 AC_MSG_RESULT([  C++ compiler:         ${CXX} ${CXXFLAGS}])
+AC_MSG_RESULT([  SQL preprocessor:     ${SQLPP}])
 AC_MSG_RESULT()
 AC_MSG_RESULT([ -------------- Dependencies -------------- ])

trunk/postgis/Makefile.in

@@ -19 +19 @@
 DATA=../spatial_ref_sys.sql
 
-# SQL objects (files requiring C pre-processing)
+# SQL preprocessor
+SQLPP = @SQLPP@
+
+# SQL objects (files requiring pre-processing)
 SQL_OBJS=postgis.sql.in legacy.sql.in legacy_minimal.sql.in 
 
@@ -129 +132 @@
         $(PERL) ../utils/postgis_proc_upgrade.pl $< 2.0 > $@
 
-# Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor 
+# Generate any .sql.in files from .sql.in.c files by running them through the SQL pre-processor 
 $(SQL_OBJS): %.in: %.in.c
-        $(CPP) -traditional-cpp -I../libpgcommon $< | grep -v '^#' > $@
+        $(SQLPP) -I../libpgcommon $< | grep -v '^#' > $@
 
 # SQL objects are also dependent on postgis_config.h for PostgreSQL version

trunk/raster/rt_pg/Makefile.in

@@ -18 +18 @@
 DATA=
 
-# SQL objects (files requiring C pre-processing)
+# SQL preprocessor
+SQLPP = @SQLPP@
+
+# SQL objects (files requiring pre-processing)
 SQL_OBJS=rtpostgis.sql.in rtpostgis_drop.sql.in rtpostgis_upgrade_cleanup.sql.in rtpostgis_legacy.sql.in
 
@@ -88 +91 @@
 $(OBJS): ../../liblwgeom/.libs/liblwgeom.a ../../libpgcommon/libpgcommon.a ../../postgis_config.h ../../postgis_svn_revision.h
 
-# Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor 
+# Generate any .sql.in files from .sql.in.c files by running them through the SQL pre-processor 
 $(SQL_OBJS): %.in: %.in.c
-        $(CPP) -I../../postgis/ -I../../ -traditional-cpp $< | grep -v '^#' > $@
+        $(SQLPP) -I../../postgis/ -I../../ $< | grep -v '^#' > $@
 
 # SQL objects deps here

trunk/topology/Makefile.in

@@ -27 +27 @@
 DATA_built=topology.sql topology_upgrade_20_minor.sql uninstall_topology.sql
 
-# SQL objects (files requiring C pre-processing)
+# SQL preprocessor
+SQLPP = @SQLPP@
+
+# SQL objects (files requiring pre-processing)
 SQL_OBJS = \
   topology.sql \
@@ -74 +77 @@
         sed 's,MODULE_PATHNAME,$$libdir/$*,g' $< >$@
 
-# Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor 
+# Generate any .sql.in files from .sql.in.c files by running them through the SQL pre-processor 
 %.in: %.in.c
-        $(CPP) -traditional-cpp $< | grep -v '^#' > $@
+        $(SQLPP) $< | grep -v '^#' > $@
         
 #Generate upgrade script by stripping things that can't be reinstalled