Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9c4b69e

Browse files
committed
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 everybuild, if configure has been rerun.
1 parent3cb5d65 commit9c4b69e

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

‎configure

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28349,6 +28349,7 @@ echo "$as_me: WARNING: *** link for $FILE -- please fix by hand" >&2;}
2834928349
# Update timestamp for pg_config.h (see Makefile.global)
2835028350
echo >src/include/stamp-h
2835128351
;;
28352+
"src/interfaces/ecpg/include/ecpg_config.h":H) echo >src/interfaces/ecpg/include/stamp-h ;;
2835228353

2835328354
esac
2835428355
done # for ac_tag

‎configure.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.588 2009/01/21 10:30:02 mha Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.589 2009/01/22 22:27:12 petere Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -1841,7 +1841,8 @@ AC_CONFIG_HEADERS([src/include/pg_config.h],
18411841
echo >src/include/stamp-h
18421842
])
18431843

1844-
AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h])
1844+
AC_CONFIG_HEADERS([src/interfaces/ecpg/include/ecpg_config.h],
1845+
[echo >src/interfaces/ecpg/include/stamp-h])
18451846

18461847
AC_OUTPUT
18471848

‎src/Makefile.global.in

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.251 2009/01/05 10:25:59 petere Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.252 2009/01/22 22:27:13 petere Exp $
33

44
#------------------------------------------------------------------------------
55
# 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
498498
$(top_builddir)/src/include/stamp-h:$(top_srcdir)/src/include/pg_config.h.in$(top_builddir)/config.status
499499
cd$(top_builddir)&& ./config.status src/include/pg_config.h
500500

501-
# Also remake ecpg_config.h from ecpg_config.h.in if the latter changed. Values in it can
502-
# only change if pg_config.h has changed, so include this file to its dependencies.
503-
$(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
501+
# Also remake ecpg_config.h from ecpg_config.h.in if the latter changed, same
502+
# logic as above.
503+
$(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h:$(top_builddir)/src/interfaces/ecpg/include/stamp-h
504+
505+
$(top_builddir)/src/interfaces/ecpg/include/stamp-h:$(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h.in$(top_builddir)/config.status
504506
cd$(top_builddir)&& ./config.status src/interfaces/ecpg/include/ecpg_config.h
505507

506508
# When configure changes, rerun configure with the same options as

‎src/interfaces/ecpg/include/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,4 @@ uninstall:
3131
rm -f'$(DESTDIR)$(includedir)'/$(notdir$(ecpg_config_h))
3232

3333
distcleanmaintainer-clean:
34-
rm -f ecpg_config.h
35-
34+
rm -f ecpg_config.h stamp-h

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp