The attached patch allows using autoconf 2.60 while retaining the
compatibility with 2.5[2-9]. I tested it with autoconf 2.60 on cygwin
and 2.60a on debian etch.
Ok to apply?
--
Enrico
Log:
Fix compatibility to autoconf 2.60
* configure.ac:
Fix up expansion of ${prefix} in ${pkgdatadir}.
* autogen.sh:
Allow using autoconf 2.60 and 2.60a.
* intl/Makefile.in:
* po/Makefile.in.in:
Add datarootdir definition.
Index: configure.ac
===================================================================
--- configure.ac (revisione 16007)
+++ configure.ac (copia locale)
@@ -285,7 +285,7 @@ AC_FUNC_SELECT_ARGTYPES
### Some information on what just happened
real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
-real_pkgdatadir=`eval "echo \`eval \"echo ${pkgdatadir}\"\`"`
+real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo
${pkgdatadir}\\\"\\\`\"\`"`
real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
VERSION_INFO="Configuration\n\
Host type: ${host}\n\
Index: intl/Makefile.in
===================================================================
--- intl/Makefile.in (revisione 16007)
+++ intl/Makefile.in (copia locale)
@@ -31,6 +31,7 @@ exec_prefix = @exec_prefix@
transform = @program_transform_name@
libdir = @libdir@
includedir = @includedir@
+datarootdir = @datarootdir@
datadir = @datadir@
localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/intl
Index: autogen.sh
===================================================================
--- autogen.sh (revisione 16007)
+++ autogen.sh (copia locale)
@@ -38,12 +38,12 @@ test "$autoversion" != "" && {
}
case $autoversion in
- *' '2.5[2-9])
+ *' '2.5[2-9]|*' '2.60|*' '2.60a)
EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
;;
*)
echo "This autoconf version is not supported by LyX."
- echo "LyX only supports autoconf 2.5[2-9]."
+ echo "LyX only supports autoconf 2.5[2-9]-2.60[a]."
exit 1
;;
esac
Index: po/Makefile.in.in
===================================================================
--- po/Makefile.in.in (revisione 16007)
+++ po/Makefile.in.in (copia locale)
@@ -22,6 +22,7 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
datadir = @datadir@
localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po
