Updated to latest autotools: automake-1.11.6, autoconf-2.68 $ autoreconf -f

[pkg/abook.git] / configure.in

diff --git a/configure.in b/configure.in
index f35534c55bd559e366925843a0807d25cb0463f0..432e4790226522e0dfb6bc136016bbcdb3c18ffa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,20 +1,25 @@
 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 ---------------
 dnl gettext support
 dnl ---------------
 
+AC_USE_SYSTEM_EXTENSIONS
 AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION(0.14.1)
+AM_GNU_GETTEXT_VERSION([0.18.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")
@@ -131,6 +136,8 @@ AC_CHECK_FUNCS(resizeterm)
 
 AC_CHECK_FUNCS(snprintf vsnprintf)
 
+AC_CHECK_FUNCS(strcasestr, AC_DEFINE(HAVE_STRCASESTR))
+
 AC_ARG_ENABLE(debug, [  --enable-debug          Enable debugging support ], [case "${enableval}" in
        yes) debug=true ;;
        no) debug=false ;;
@@ -147,4 +154,3 @@ if test x$GCC = xyes; then
 fi
 
 AC_OUTPUT(Makefile abook.spec intl/Makefile po/Makefile.in)
-