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

[pkg/abook.git] / configure.in

diff --git a/configure.in b/configure.in
index 7ac1006aaecec30f20c25b69d1fafcdb53cddc59..105cf5542bc33797f834ba5c071606996a134fd1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,9 +8,8 @@ dnl ---------------
 dnl gettext support
 dnl ---------------
 
-AC_USE_SYSTEM_EXTENSIONS
 AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT_VERSION(0.14.1)
 
 AC_DEFUN([ABOOK_EXPAND_PREFIX], [
        $1=$2
@@ -128,31 +127,6 @@ 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])
-if test x$vformat = xtrue; then
-   AC_CHECK_HEADER([vf_iface.h], [
-     AC_CHECK_LIB([vformat], [vf_read_file], [
-     MODULES="$MODULES m_vcf"
-     AC_DEFINE(HAVE_VFORMAT,1,[Defined if the vformat library is available])
-     have_vformat=yes
-  ])
-])
-fi
-AM_CONDITIONAL(ENABLE_VFORMAT_SUPPORT,test x"$have_vformat" = "xyes")
-
-dnl -------------------------
-dnl end of vformat detection
-dnl -------------------------
-
-
 if test x$ac_widec_possible = xyes; then
        AC_DEFINE(HANDLE_MULTIBYTE, 1, [Handle multibyte characters])
 fi
@@ -161,8 +135,6 @@ 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 ;;
@@ -179,3 +151,4 @@ if test x$GCC = xyes; then
 fi
 
 AC_OUTPUT(Makefile abook.spec intl/Makefile po/Makefile.in)
+