X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=configure.in;h=427b09b2f0f399d63ecb1289daea64d51b281597;hb=465ab361f66ef10dd6540da7efa4432928333ec3;hp=b8a13b73b0f230a147d6cbe75ee7bf6079dcc250;hpb=7d0f197384f747d26191efe1cd98405401afc806;p=pkg%2Fabook.git

diff --git a/configure.in b/configure.in
index b8a13b7..427b09b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,14 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.4.13pre1)
+AM_INIT_AUTOMAKE(abook, 0.5.1rc1)
 AM_CONFIG_HEADER(config.h)
 
+AC_DEFINE(HAVE_SNPRINTF, 0, [Define if snprintf is available.])
+AC_DEFINE(HAVE_VSNPRINTF, 0, [Define if vsnprintf is available.])
+AC_DEFINE(HAVE_STDARG_H, 0, [Define if you have the <stdarg.h> header file.])
+AC_DEFINE(HAVE_NCURSES, 0, [Define if you have the <ncurses.h> header file.])
+
 AC_CANONICAL_HOST
 
 AC_PROG_CC
@@ -17,6 +22,7 @@ AC_PROG_INSTALL
 AC_HEADER_STDC
 AC_CHECK_HEADERS(unistd.h locale.h termios.h linux/termios.h sys/ioctl.h)
 AC_CHECK_HEADER(stdarg.h,AC_DEFINE(HAVE_STDARG_H),AC_MSG_ERROR([*** stdarg.h is missing on your system ***]))
+AC_FUNC_STRCOLL
 AC_CHECK_FUNCS(setlocale)
 
 dnl -------------------
@@ -24,7 +30,7 @@ dnl (n)curses detection
 dnl -------------------
 
 abook_cv_curses=/usr
-AC_ARG_WITH(curses, [  --with-curses=DIR          Where ncurses is installed ],
+AC_ARG_WITH(curses, [  --with-curses=DIR       Where ncurses is installed ],
 	[if test $withval != yes; then
 		abook_cv_curses=$withval
 	fi
@@ -45,12 +51,36 @@ dnl --------------------------
 dnl end of (n)curses detection
 dnl --------------------------
 
+dnl ------------------
+dnl readline detection
+dnl ------------------
+
+abook_cv_readline=/usr
+AC_ARG_WITH(readline, [  --with-readline=DIR     Where readline is installed ],
+	[if test $withval != yes; then
+		abook_cv_readline=$withval
+	fi
+	if test x$abook_cv_readline != x/usr; then
+		LDFLAGS="-L${abook_cv_readline}/lib $LDFLAGS"
+		CPPFLAGS="$CPPFLAGS -I${abook_cv_readline}/include"
+	fi])
+
+AC_LIB_READLINE
+
+if test x$ac_cv_lib_readline = xno -o x$ac_cv_lib_readline_history = xno; then
+	AC_MSG_ERROR([*** readline library not found or it doesn't support history ***])
+fi
+
+dnl -------------------------
+dnl end of readline detection
+dnl -------------------------
+
 AC_CHECK_FUNCS(resizeterm)
 
 AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF)],)
 AC_CHECK_FUNC(vsnprintf, [AC_DEFINE(HAVE_VSNPRINTF)],)
 
-AC_ARG_ENABLE(debug, [  --enable-debug	Enable debugging support ], [case "${enableval}" in
+AC_ARG_ENABLE(debug, [  --enable-debug          Enable debugging support ], [case "${enableval}" in
 	yes) debug=true ;;
 	no) debug=false ;;
 	*) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
@@ -61,19 +91,9 @@ if test x$debug = xtrue; then
 	CFLAGS="-g $CFLAGS"
 fi
 
-AC_ARG_ENABLE(nonascii, [  --disable-nonascii    Disable usage of non-ascii characters ], [case "${enableval}" in
-	yes) nonascii=true ;;
-	no) nonascii=false ;;
-	*) AC_MSG_ERROR(bad value ${enableval} for --disable-nonascii) ;;
-	esac], [nonascii=true])
-
-if test x$nonascii = xfalse; then
-	AC_DEFINE(USE_ASCII_ONLY)
-fi
-
 if test x$GCC = xyes; then
 	CFLAGS="-Wall $CFLAGS"
 fi
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile abook.spec)