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.

4 files changed, 9 insertions, 6 deletions

diff --git a/configure b/configure
index 0c25c09912..8a7b74f741 100755
--- 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 736953ac87..3c8a7a8fd5 100644
--- a/configure.in
+++ b/configure.in
@@ -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 38f12851c5..ff27dd903d 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -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 32c7a12d05..29ed1bfd80 100644
--- 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