Commit5d9062f

committed

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

in port/pg_config_paths.h.

1 parentc8f3450 commit5d9062fCopy full SHA for 5d9062f

File tree

-24

lines changed

-24

lines changed

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/config/programs.m4,v 1.19 2005/12/04 03:52:28 momjian Exp $`
	`1`	`+# $PostgreSQL: pgsql/config/programs.m4,v 1.20 2006/05/23 19:28:45 momjian Exp $`
`2`	`2`
`3`	`3`
`4`	`4`	`# PGAC_PATH_FLEX`
`@@ -164,15 +164,7 @@ dnl FIXME: We should probably check for version >=0.10.36.`
`164`	`164`
`165`	`165`	`# Note: share/locale is always the default, independent of $datadir`
`166`	`166`	`localedir='${prefix}/share/locale'`
`167`		`- if test x"$prefix" = x"NONE"; then`
`168`		`- exp_localedir="$ac_default_prefix/share/locale"`
`169`		`- else`
`170`		`- exp_localedir="$prefix/share/locale"`
`171`		`- fi`
`172`		`-`
`173`	`167`	`AC_SUBST(localedir)`
`174`		`-AC_DEFINE_UNQUOTED(LOCALEDIR,["$exp_localedir"],`
`175`		`-[Define to the location of locale files.])`
`176`	`168`	`])# PGAC_CHECK_GETTEXT`
`177`	`169`
`178`	`170`

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -22083,17 +22083,6 @@ done`
`22083`	`22083`
`22084`	`22084`	`# Note: share/locale is always the default, independent of $datadir`
`22085`	`22085`	`localedir='${prefix}/share/locale'`
`22086`		`- if test x"$prefix" = x"NONE"; then`
`22087`		`- exp_localedir="$ac_default_prefix/share/locale"`
`22088`		`- else`
`22089`		`- exp_localedir="$prefix/share/locale"`
`22090`		`- fi`
`22091`		`-`
`22092`		`-`
`22093`		`-`
`22094`		`-cat >>confdefs.h <<_ACEOF`
`22095`		`-#define LOCALEDIR "$exp_localedir"`
`22096`		`-_ACEOF`
`22097`	`22086`
`22098`	`22087`
`22099`	`22088`	`fi`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -531,9 +531,6 @@`
`531`	`531`	`/* Define to build with Kerberos 5 support. (--with-krb5) */`
`532`	`532`	`#undef KRB5`
`533`	`533`
`534`		`-/* Define to the location of locale files. */`
`535`		`-#undef LOCALEDIR`
`536`		`-`
`537`	`534`	`/* Define as the maximum alignment requirement of any C data type. */`
`538`	`535`	`#undef MAXIMUM_ALIGNOF`
`539`	`536`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`* Portions Copyright (c) 1994, Regents of the University of California`
`24`	`24`	`*`
`25`	`25`	`* IDENTIFICATION`
`26`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.126 2006/05/18 18:19:47 momjian Exp $`
	`26`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.127 2006/05/2319:28:45 momjian Exp $`
`27`	`27`	`*`
`28`	`28`	`*-------------------------------------------------------------------------`
`29`	`29`	`*/`
`@@ -60,6 +60,7 @@`
`60`	`60`	`#include"libpq-int.h"`
`61`	`61`	`#include"pqsignal.h"`
`62`	`62`	`#include"mb/pg_wchar.h"`
	`63`	`+#include"pg_config_paths.h"`
`63`	`64`
`64`	`65`
`65`	`66`	`staticintpqPutMsgBytes(constvoidbuf,size_tlen,PGconnconn);`

Comments

(0)