diff options
| author | Bruce Momjian | 2006-05-23 19:28:45 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2006-05-23 19:28:45 +0000 |
| commit | 38d0adc33f2cfe705a063a9708507ba513e298a2 (patch) | |
| tree | ae3962f316fb72041ded6c990ab6290909e35dbb | |
| parent | d529377da6ad2c0da9fc05e45a11ebad45bf9ffd (diff) | |
Avoid duplicate definition of LOCALEDIR in pg_config.h, already defined
in port/pg_config_paths.h.
| -rw-r--r-- | config/programs.m4 | 8 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 3 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-misc.c | 1 |
4 files changed, 1 insertions, 22 deletions
diff --git a/config/programs.m4 b/config/programs.m4 index 8467e5b620..6e0948b254 100644 --- a/config/programs.m4 +++ b/config/programs.m4 @@ -164,15 +164,7 @@ dnl FIXME: We should probably check for version >=0.10.36. # Note: share/locale is always the default, independent of $datadir localedir='${prefix}/share/locale' - if test x"$prefix" = x"NONE"; then - exp_localedir="$ac_default_prefix/share/locale" - else - exp_localedir="$prefix/share/locale" - fi - AC_SUBST(localedir) - AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"], - [Define to the location of locale files.]) ])# PGAC_CHECK_GETTEXT @@ -22083,17 +22083,6 @@ done # Note: share/locale is always the default, independent of $datadir localedir='${prefix}/share/locale' - if test x"$prefix" = x"NONE"; then - exp_localedir="$ac_default_prefix/share/locale" - else - exp_localedir="$prefix/share/locale" - fi - - - -cat >>confdefs.h <<_ACEOF -#define LOCALEDIR "$exp_localedir" -_ACEOF fi diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 6ef9fcf455..5ccfbfefd2 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -531,9 +531,6 @@ /* Define to build with Kerberos 5 support. (--with-krb5) */ #undef KRB5 -/* Define to the location of locale files. */ -#undef LOCALEDIR - /* Define as the maximum alignment requirement of any C data type. */ #undef MAXIMUM_ALIGNOF diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index b1328a7078..1b4dd57ced 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -60,6 +60,7 @@ #include "libpq-int.h" #include "pqsignal.h" #include "mb/pg_wchar.h" +#include "pg_config_paths.h" static int pqPutMsgBytes(const void *buf, size_t len, PGconn *conn); |