diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 3 | ||||
| -rw-r--r-- | src/common/Makefile | 1 | ||||
| -rw-r--r-- | src/common/config_info.c | 6 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 3 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 7 |
5 files changed, 5 insertions, 15 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 9b28b8af431..e4db3e80af3 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -74,9 +74,6 @@ endif # not PGXS vpathsearch = `for f in $(addsuffix /$(1),$(subst :, ,. $(VPATH))); do test -r $$f && echo $$f && break; done` -# Saved arguments from configure -configure_args = @configure_args@ - ########################################################################## # diff --git a/src/common/Makefile b/src/common/Makefile index e757fb73996..ab98f4faafb 100644 --- a/src/common/Makefile +++ b/src/common/Makefile @@ -31,7 +31,6 @@ include $(top_builddir)/src/Makefile.global # don't include subdirectory-path-dependent -I and -L switches STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS)) STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS)) -override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\"" override CPPFLAGS += -DVAL_CC="\"$(CC)\"" override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\"" override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\"" diff --git a/src/common/config_info.c b/src/common/config_info.c index c75a642fb2c..8a5dc64ec36 100644 --- a/src/common/config_info.c +++ b/src/common/config_info.c @@ -124,11 +124,7 @@ get_configdata(const char *my_exec_path, size_t *configdata_len) i++; configdata[i].name = pstrdup("CONFIGURE"); -#ifdef VAL_CONFIGURE - configdata[i].setting = pstrdup(VAL_CONFIGURE); -#else - configdata[i].setting = pstrdup(_("not recorded")); -#endif + configdata[i].setting = pstrdup(CONFIGURE_ARGS); i++; configdata[i].name = pstrdup("CC"); diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index be39cfde4bb..60dcf42974f 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -42,6 +42,9 @@ Changing BLCKSZ requires an initdb. */ #undef BLCKSZ +/* Saved arguments from configure */ +#undef CONFIGURE_ARGS + /* Define to the default TCP port number on which the server listens and to which clients will try to connect. This can be overridden at run-time, but it's convenient if your clients have the right default compiled in. diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 90352c1a7fe..8412ef298ea 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -195,6 +195,7 @@ sub GenerateFiles ALIGNOF_SHORT => 2, AC_APPLE_UNIVERSAL_BUILD => undef, BLCKSZ => 1024 * $self->{options}->{blocksize}, + CONFIGURE_ARGS => '"' . $self->GetFakeConfigure() . '"', DEF_PGPORT => $port, DEF_PGPORT_STR => qq{"$port"}, ENABLE_GSS => $self->{options}->{gss} ? 1 : undef, @@ -538,12 +539,6 @@ sub GenerateFiles $self->GenerateConfigHeader('src/include/pg_config_ext.h', \%define, 0); $self->GenerateConfigHeader('src/interfaces/ecpg/include/ecpg_config.h', \%define, 0); - open(my $f, '>>', 'src/include/pg_config.h') - || confess "Could not write to src/include/pg_config.h\n"; - print $f "\n"; - print $f "#define VAL_CONFIGURE \"" . $self->GetFakeConfigure() . "\"\n"; - close($f); - $self->GenerateDefFile( "src/interfaces/libpq/libpqdll.def", "src/interfaces/libpq/exports.txt", |