Avoid duplicate definition of LOCALEDIR in pg_config.h, already defined

in port/pg_config_paths.h.

diff --git a/config/programs.m4 b/config/programs.m4
index e8ff0e797317380b724a50e78abeac686c348c62..fb9793fac1a4888cfb2df7aee1ec89c18e3f6f0d 100644 (file)
--- 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 8fc832d8be10776ba2b238e8116854630e191d78..eae07f741663916665f5554d584f2ca90bfd835c 100755 (executable)
--- 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 6ef9fcf45552fd5fb3d52537a7a5c928db7785ca..5ccfbfefd28f5b72e75d3a7f1ba43d1cb55773be 100644 (file)
--- 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 f2af0e3b94925bb00d1cdd149620d5a9056fe2fc..5c113ae988de3f878646f4a663cb50b6415c849c 100644 (file)
--- 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);