Attachment #205412 for bug #286700




dnl FIXME: We should probably check for version >=0.10.36.
  AC_CHECK_PROGS(XGETTEXT, xgettext)

  # Note: share/locale *WAS* always the default, independent of $datadir
  AC_ARG_WITH([locale-dir],
   AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
   [ localedir="${withval}" ],
   [ localedir='${prefix}/share/locale' ]
  )
  exp_localedir="${localedir}"

  AC_SUBST(localedir)
  AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],




dnl
dnl The GNU folks apparently haven't heard that some people don't use
dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
m4_define([info], [doc])
m4_define([infodir], [docdir])
AC_INIT([PostgreSQL], [7.4.26], [pgsql-bugs@postgresql.org])

m4_undefine([info])
AC_SUBST(docdir)

m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.53 is required.
Untested combinations of 'autoconf' and PostgreSQL versions are not
recommended.  You can remove the check from 'configure.in' but it is then
your responsibility whether the result works or not.])])
AC_COPYRIGHT([Copyright 2004 PostgreSQL Global Development Group])
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
AC_CONFIG_AUX_DIR(config)

Return to bug 286700

Lines 153-165 AC_DEFUN([PGAC_CHECK_GETTEXT], Link Here

(-)a/config/programs.m4 (-7 / +7 lines)
153	dnl FIXME: We should probably check for version >=0.10.36.	153	dnl FIXME: We should probably check for version >=0.10.36.
154	AC_CHECK_PROGS(XGETTEXT, xgettext)	154	AC_CHECK_PROGS(XGETTEXT, xgettext)
155		155
156	# Note: share/locale is always the default, independent of $datadir	156	# Note: share/locale WAS always the default, independent of $datadir
157	localedir='${prefix}/share/locale'	157	AC_ARG_WITH([locale-dir],
158	if test x"$prefix" = x"NONE"; then	158	AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
159	exp_localedir="$ac_default_prefix/share/locale"	159	[ localedir="${withval}" ],
160	else	160	[ localedir='${prefix}/share/locale' ]
161	exp_localedir="$prefix/share/locale"	161	)
162	fi	162	exp_localedir="${localedir}"
163		163
164	AC_SUBST(localedir)	164	AC_SUBST(localedir)
165	AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],	165	AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],

Lines 19-35 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros Link Here

(-)a/configure.in (-10 / +1 lines)
19	dnl	19	dnl
20	dnl The GNU folks apparently haven't heard that some people don't use	20	dnl The GNU folks apparently haven't heard that some people don't use
21	dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".	21	dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
22	m4_define([info], [doc])
23	m4_define([infodir], [docdir])
24	AC_INIT([PostgreSQL], [7.4.26], [pgsql-bugs@postgresql.org])	22	AC_INIT([PostgreSQL], [7.4.26], [pgsql-bugs@postgresql.org])
25	m4_undefine([infodir])	23
26	m4_undefine([info])
27	AC_SUBST(docdir)
28
29	m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.53 is required.
30	Untested combinations of 'autoconf' and PostgreSQL versions are not
31	recommended. You can remove the check from 'configure.in' but it is then
32	your responsibility whether the result works or not.])])
33	AC_COPYRIGHT([Copyright 2004 PostgreSQL Global Development Group])	24	AC_COPYRIGHT([Copyright 2004 PostgreSQL Global Development Group])
34	AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])	25	AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
35	AC_CONFIG_AUX_DIR(config)	26	AC_CONFIG_AUX_DIR(config)