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.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16021 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/autogen.sh b/autogen.sh
index 31494bbc79d1dd2c6b239a990c4cc17c85ad63f9..d3d346d3bc9fed2377be5ec05816e3191b921811 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -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

diff --git a/configure.ac b/configure.ac
index d6ab6510eeabe96bf1469e6eaa887f0c9ba16947..6d854b9f2ab6fde825a2d9359ddc5b123c42ae72 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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\

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 14a4a874a933aec4c306e826b13f6fbfbc79eb07..986e135e5f47ca3a46ae4f2b99f9839d5d9d3f3c 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -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

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index c628cabe01fd5ca65b80be8b3f856cae96694057..80305c5bf228d2d246d4243fc53214f76aa05acc 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -22,6 +22,7 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po