mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
in port/pg_config_paths.h.
This commit is contained in:
Bruce Momjian 2006-05-23 19:28:45 +00:00
parent c8f345024d
commit 5d9062f939
4 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/programs.m4
View File

@ -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

11
configure vendored
View File

@ -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

3
src/include/pg_config.h.in
View File

@ -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

3
src/interfaces/libpq/fe-misc.c
View File

@ -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);