Merge remote-tracking branch 'upstream/master' into upstream

[pkg/abook.git] / configure.in

diff --git a/configure.in b/configure.in
index 8345ae69810c171e9b5a9ffd4745cf67cf70e32c..105cf5542bc33797f834ba5c071606996a134fd1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.5.5)
+AM_INIT_AUTOMAKE(abook, 0.6.0pre2)
 AM_CONFIG_HEADER(config.h)
 
 dnl ---------------
@@ -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 ])