On 11/25/06, James Youngman <[EMAIL PROTECTED]> wrote:
I am using gettext version 0.14.6. Its version of po/Makefile.in.in uses @MKINSTALLDIRS@, but the m4 files in current gnulib do not substitute that variable. This means that the generated po/Makefile contains a naked @[EMAIL PROTECTED]
I have installed the attached patch to findutils in order to work around the problem for the time being. James.
2006-11-25 James Youngman <[EMAIL PROTECTED]> * m4/mkinstalldirs.m4: Added this file. It's an excerpt from an old version of gnulib's m4/nls.po file. The current version of gnulib does not expand MKINSTALLDIRS, but gettext-0.14.6's version of po/Makefile.in.in expects it to be expanded. This m4 file fills the gap. Index: configure.in =================================================================== RCS file: /cvsroot/findutils/findutils/configure.in,v retrieving revision 1.101 diff -u -r1.101 configure.in --- configure.in 6 Aug 2006 21:20:07 -0000 1.101 +++ configure.in 25 Nov 2006 17:07:18 -0000 @@ -87,6 +87,14 @@ gl_INIT + + +dnl Older versions of gnulib/m4/nls.m4 provide AM_MKINSTALLDIRS. +dnl The current version of gnulib does not, but the version of +dnl po/Makefile.in.in that comes with gettext-0.14.6 expects +dnl that @MKINSTALLDIRS@ will be expanded. +AM_MKINSTALLDIRS + dnl lib/regexprops needs to be a native program, because we need to dnl run it in order to generate the documentation about the properties dnl of regular expressions. See lib/Makefile.am. Index: m4/mkinstalldirs.m4 =================================================================== RCS file: m4/mkinstalldirs.m4 diff -N m4/mkinstalldirs.m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ m4/mkinstalldirs.m4 25 Nov 2006 17:07:19 -0000 @@ -0,0 +1,40 @@ +dnl Copyright (C) 1995-2003, 2005,2006 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <[EMAIL PROTECTED]>, 1995-2000. +dnl Bruno Haible <[EMAIL PROTECTED]>, 2000-2003. +# Originally taken from nls.m4 serial 2 (gettext-0.14.3) + +AC_PREREQ(2.50) + +AC_DEFUN([AM_MKINSTALLDIRS], +[ + dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing. + m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])]) + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but $(top_srcdir). + dnl Try to locate it. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) +])
_______________________________________________ Bug-findutils mailing list [email protected] http://lists.gnu.org/mailman/listinfo/bug-findutils
