[Abook-cvs] abook configure.in,1.53,1.54

[Jaakko H. <jhe...@us...>]

Update of /cvsroot/abook/abook
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11286

Modified Files:
	configure.in 
Log Message:
* compatibility fix for autoconf < 2.60 (Cedric Duval)


Index: configure.in
===================================================================
RCS file: /cvsroot/abook/abook/configure.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- configure.in	24 Aug 2006 09:46:08 -0000	1.53
+++ configure.in	1 Sep 2006 10:00:22 -0000	1.54
@@ -13,12 +13,16 @@
 
 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 ])