diff options
| -rw-r--r-- | config/programs.m4 | 10 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 3 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-misc.c | 3 |
4 files changed, 3 insertions, 24 deletions
diff --git a/config/programs.m4 b/config/programs.m4 index e8ff0e79731..fb9793fac1a 100644 --- a/config/programs.m4 +++ b/config/programs.m4 @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/config/programs.m4,v 1.19 2005/12/04 03:52:28 momjian Exp $ +# $PostgreSQL: pgsql/config/programs.m4,v 1.20 2006/05/23 19:28:45 momjian Exp $ # PGAC_PATH_FLEX @@ -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 diff --git a/configure b/configure index 8fc832d8be1..eae07f74166 100755 --- a/configure +++ b/configure @@ -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 6ef9fcf4555..5ccfbfefd28 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 f2af0e3b949..5c113ae988d 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.126 2006/05/18 18:19:47 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.127 2006/05/23 19:28:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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); |