X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=configure.in;h=5f2325d04bd34c2f753d9d673fbed88735a177ab;hb=7c88cafcd333277b6bfd55370a5ec1c5b76c2b0d;hp=7c919f42b52b54323a3772401c86610541fb26e0;hpb=38ff22ec1490994fa63f4d38a6b9e90b55909511;p=pkg%2Fabook.git

diff --git a/configure.in b/configure.in
index 7c919f4..5f2325d 100644
--- 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")
@@ -30,6 +35,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 ----------------------
@@ -121,6 +128,33 @@ dnl -------------------------
 dnl end of readline detection
 dnl -------------------------
 
+dnl ------------------
+dnl vformat detection
+dnl ------------------
+
+AC_ARG_ENABLE(vformat, [  --enable-vformat          Use libvformat is available ], [case "${enableval}" in
+	yes) vformat=true ;;
+	no) vformat=false ;;
+	*) AC_MSG_ERROR(bad value ${enableval} for --enable-vformat) ;;
+	esac], [vformat=false])
+VFORMAT="no"
+if test x$vformat = xtrue; then
+   AC_CHECK_HEADER([vf_iface.h], [
+     AC_CHECK_LIB([vformat], [vf_read_file], [
+     MODULES="$MODULES m_vcf"
+     VFORMAT="yes"
+     LDFLAGS="-lvformat $LDFLAGS"
+     CFLAGS="-DVFORMAT=1 $CFLAGS"
+  ])
+])
+fi
+AC_SUBST(VFORMAT)
+
+dnl -------------------------
+dnl end of vformat detection
+dnl -------------------------
+
+
 if test x$ac_widec_possible = xyes; then
 	AC_DEFINE(HANDLE_MULTIBYTE, 1, [Handle multibyte characters])
 fi
@@ -129,6 +163,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 ;;
@@ -145,4 +181,3 @@ if test x$GCC = xyes; then
 fi
 
 AC_OUTPUT(Makefile abook.spec intl/Makefile po/Makefile.in)
-