X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=configure.in;h=432e4790226522e0dfb6bc136016bbcdb3c18ffa;hb=5bfbf53150fcd37f368fe5cc0baacff9822f7e2b;hp=8345ae69810c171e9b5a9ffd4745cf67cf70e32c;hpb=6c7ddff73683d66390f1c41e351445bce4067644;p=pkg%2Fabook.git

diff --git a/configure.in b/configure.in
index 8345ae6..432e479 100644
--- a/configure.in
+++ b/configure.in
@@ -1,24 +1,29 @@
 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 ---------------
 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, "$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 ])
@@ -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)
-