From: Jaakko Heinonen <jheinonen@users.sourceforge.net>
Date: Fri, 1 Sep 2006 10:00:22 +0000 (+0000)
Subject: * compatibility fix for autoconf < 2.60 (Cedric Duval)
X-Git-Tag: upstream/0.6.1~2^2~96
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=2f122c20219c2e2bdfdc8e6143288afb37bcb39f;p=pkg%2Fabook.git

* compatibility fix for autoconf < 2.60 (Cedric Duval)
---

diff --git a/configure.in b/configure.in
index 7c54564..93ccef9 100644
--- a/configure.in
+++ b/configure.in
@@ -13,12 +13,16 @@ AM_GNU_GETTEXT_VERSION(0.14.1)
 
 AC_DEFUN([ABOOK_EXPAND_PREFIX], [
 	$1=$2
+	dnl expanding twice, since from autoconf 2.60 on, $datadir refers to
+	dnl $datarootdir which in turn refers to $prefix
 	$1=`(	test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-		eval echo \""[$]$1"\"	)`
+		eval tmp_abook_prefix=\""[$]$1"\"
+		eval echo $tmp_abook_prefix
+		)`
 ])
 
-ABOOK_EXPAND_PREFIX(abook_localedir, "$datarootdir/locale")
-localedir="\$(datarootdir)/locale"
+ABOOK_EXPAND_PREFIX(abook_localedir, "$datadir/locale")
+localedir="\$(datadir)/locale"
 
 AC_ARG_WITH(localedir,
 	[  --with-localedir=PATH      Where the locale files are installed ])