From 693d3167f41a26b096b8d70928f07619561e4e29 Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Fri, 24 Nov 2006 01:18:11 +0000
Subject: [PATCH] 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/branches/BRANCH_1_4_X@16022 a592a061-630c-0410-9148-cb99ea01b6c8
---
 autogen.sh        | 4 ++--
 configure.ac      | 2 +-
 intl/Makefile.in  | 1 +
 po/Makefile.in.in | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 2e545dd935..2fb7da412c 100755
--- 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 02b0500d10..777bd1e40f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -291,7 +291,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 14a4a874a9..986e135e5f 100644
--- 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 b32e83ad3b..43d4c5a283 100644
--- 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