Recreate ecpg_config.h with a stamp file created by config.status, same

way pg_config.h is handled.  This avoids reruns of config.status on every
build, if configure has been rerun.

diff --git a/configure b/configure
index 0c25c09912bef83bb7ab9d12f387b7ba0a3ff866..8a7b74f741d596611a083f508bc84db9dd893c3c 100755 (executable)
--- a/configure
+++ b/configure
@@ -28349,6 +28349,7 @@ echo "$as_me: WARNING: *** link for $FILE -- please fix by hand" >&2;}
 # Update timestamp for pg_config.h (see Makefile.global)
 echo >src/include/stamp-h
  ;;
+    "src/interfaces/ecpg/include/ecpg_config.h":H) echo >src/interfaces/ecpg/include/stamp-h ;;
 
   esac
 done # for ac_tag

diff --git a/configure.in b/configure.in
index 3ece4326db6c4fcc2f6d282ca69c8ec02726b8c6..c11591e5ab99d14d63ae252c83d607a988cc7cc9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.588 2009/01/21 10:30:02 mha Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.589 2009/01/22 22:27:12 petere Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -1841,7 +1841,8 @@ AC_CONFIG_HEADERS([src/include/pg_config.h],
 echo >src/include/stamp-h
 ])
 
-AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h])
+AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h],
+                  [echo >src/interfaces/ecpg/include/stamp-h])
 
 AC_OUTPUT
 

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 343f215b03f97e7342b9a30b8c64b89b100ce9e3..10325498f9530b6c4310c6d1dfc6e8b45211c6c0 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.251 2009/01/05 10:25:59 petere Exp $
+# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.252 2009/01/22 22:27:13 petere Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -498,9 +498,11 @@ $(top_builddir)/src/include/pg_config.h: $(top_builddir)/src/include/stamp-h
 $(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/pg_config.h.in $(top_builddir)/config.status
        cd $(top_builddir) && ./config.status src/include/pg_config.h
 
-# Also remake ecpg_config.h from ecpg_config.h.in if the latter changed. Values in it can
-# only change if pg_config.h has changed, so include this file to its dependencies.
-$(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h: $(top_builddir)/src/include/pg_config.h $(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h.in $(top_builddir)/config.status
+# Also remake ecpg_config.h from ecpg_config.h.in if the latter changed, same 
+# logic as above.
+$(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h: $(top_builddir)/src/interfaces/ecpg/include/stamp-h
+
+ $(top_builddir)/src/interfaces/ecpg/include/stamp-h: $(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h.in $(top_builddir)/config.status
        cd $(top_builddir) && ./config.status src/interfaces/ecpg/include/ecpg_config.h
 
 # When configure changes, rerun configure with the same options as

diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile
index 32c7a12d05d4bab6c328223c617f90b2dcefcfb0..29ed1bfd80b70a0da5586d6d1ec0488803cfd4be 100644 (file)
--- a/src/interfaces/ecpg/include/Makefile
+++ b/src/interfaces/ecpg/include/Makefile
@@ -31,5 +31,4 @@ uninstall:
        rm -f '$(DESTDIR)$(includedir)'/$(notdir $(ecpg_config_h))
 
 distclean maintainer-clean:
-       rm -f ecpg_config.h
-
+       rm -f ecpg_config.h stamp-h