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

[pkg/abook.git] / configure.in

diff --git a/configure.in b/configure.in
index 7c919f42b52b54323a3772401c86610541fb26e0..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.5pre1)
+AM_INIT_AUTOMAKE(abook, 0.6.0pre2)
 AM_CONFIG_HEADER(config.h)
 
 dnl ---------------
@@ -13,8 +13,12 @@ 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, "$datadir/locale")
@@ -30,6 +34,8 @@ fi
 AC_DEFINE_UNQUOTED(LOCALEDIR, "$abook_localedir", [locale directory])
 AC_SUBST(localedir)
 
+AM_CONDITIONAL(USE_INCLUDED_INTL_H, test x$USE_INCLUDED_LIBINTL = xyes)
+
 dnl ----------------------
 dnl end of gettext support
 dnl ----------------------