1 |
patrick 09/10/03 16:27:59 |
2 |
|
3 |
Added: postgresql-7.4.26-autoconf.patch |
4 |
Log: |
5 |
Bump to 7.4.26 |
6 |
(Portage version: 2.2_rc42/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-db/postgresql-base/files/postgresql-7.4.26-autoconf.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.4.26-autoconf.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-base/files/postgresql-7.4.26-autoconf.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: postgresql-7.4.26-autoconf.patch |
15 |
=================================================================== |
16 |
diff --git a/config/programs.m4 b/config/programs.m4 |
17 |
index ae3b91a..6af24d2 100644 |
18 |
--- a/config/programs.m4 |
19 |
+++ b/config/programs.m4 |
20 |
@@ -153,13 +153,13 @@ AC_DEFUN([PGAC_CHECK_GETTEXT], |
21 |
dnl FIXME: We should probably check for version >=0.10.36. |
22 |
AC_CHECK_PROGS(XGETTEXT, xgettext) |
23 |
|
24 |
- # Note: share/locale is always the default, independent of $datadir |
25 |
- localedir='${prefix}/share/locale' |
26 |
- if test x"$prefix" = x"NONE"; then |
27 |
- exp_localedir="$ac_default_prefix/share/locale" |
28 |
- else |
29 |
- exp_localedir="$prefix/share/locale" |
30 |
- fi |
31 |
+ # Note: share/locale *WAS* always the default, independent of $datadir |
32 |
+ AC_ARG_WITH([locale-dir], |
33 |
+ AC_HELP_STRING([--with-locale-dir],[Set path to locale files]), |
34 |
+ [ localedir="${withval}" ], |
35 |
+ [ localedir='${prefix}/share/locale' ] |
36 |
+ ) |
37 |
+ exp_localedir="${localedir}" |
38 |
|
39 |
AC_SUBST(localedir) |
40 |
AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"], |
41 |
diff --git a/configure.in b/configure.in |
42 |
index f7bdec3..c8b5b7e 100644 |
43 |
--- a/configure.in |
44 |
+++ b/configure.in |
45 |
@@ -19,17 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros |
46 |
dnl |
47 |
dnl The GNU folks apparently haven't heard that some people don't use |
48 |
dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". |
49 |
-m4_define([info], [doc]) |
50 |
-m4_define([infodir], [docdir]) |
51 |
AC_INIT([PostgreSQL], [7.4.26], [pgsql-bugs@××××××××××.org]) |
52 |
-m4_undefine([infodir]) |
53 |
-m4_undefine([info]) |
54 |
-AC_SUBST(docdir) |
55 |
- |
56 |
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.53 is required. |
57 |
-Untested combinations of 'autoconf' and PostgreSQL versions are not |
58 |
-recommended. You can remove the check from 'configure.in' but it is then |
59 |
-your responsibility whether the result works or not.])]) |
60 |
+ |
61 |
AC_COPYRIGHT([Copyright 2004 PostgreSQL Global Development Group]) |
62 |
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) |
63 |
AC_CONFIG_AUX_DIR(config) |