X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=configure.in;h=d75364f6e0b272a110f7e25b0e8a029efb2b05c1;hb=47ca9ac04785f2d48d28886cbc4e2802b19dd9cf;hp=70f81d44d8c40ef20f17b30e5194f0090c85db7f;hpb=064920c49cdf2a8f8cea68a1fa4e277b9cfe0a93;p=pkg%2Fabook.git

diff --git a/configure.in b/configure.in
index 70f81d4..d75364f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,14 +1,9 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.5.1)
+AM_INIT_AUTOMAKE(abook, 0.5.4)
 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
@@ -20,11 +15,26 @@ fi
 AC_C_INLINE
 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_CHECK_HEADERS(unistd.h locale.h termios.h sys/ioctl.h)
+AC_CHECK_HEADER(stdarg.h,AC_DEFINE(HAVE_STDARG_H, 1, [Define if you have the <stdarg.h> header file.]),AC_MSG_ERROR([*** stdarg.h is missing on your system ***]))
 AC_FUNC_STRCOLL
 AC_CHECK_FUNCS(setlocale)
 
+ac_widec_funcs=yes
+AC_CHECK_HEADER(wchar.h,[
+	ac_have_wchar_h=yes
+	AC_DEFINE(HAVE_WCHAR_H, 1, [Define if you have the <wchar.h> header file.])],
+	[ac_have_wchar_h=no])
+AC_CHECK_FUNCS(mbtowc wcwidth mbrtowc mbsinit,,ac_widec_funcs=no)
+AC_CHECK_DECLS(wcwidth)
+AC_CHECK_TYPE(wchar_t,,ac_widec_funcs=no)
+
+if test x$ac_widec_funcs = xyes -a x$ac_have_wchar_h = xyes; then
+	ac_widec_possible=yes
+else
+	ac_widec_possible=no
+fi
+
 dnl -------------------
 dnl (n)curses detection
 dnl -------------------
@@ -39,13 +49,21 @@ AC_ARG_WITH(curses, [  --with-curses=DIR       Where ncurses is installed ],
 		CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include"
 	fi])
 
-AC_CHECK_LIB(ncurses, initscr,
-	[LIBS="$LIBS -lncurses"
-	if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
-		CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+AC_CHECK_LIB(ncursesw, initscr,
+	[LIBS="$LIBS -lncursesw"
+	if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
+		CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
 	fi
-	AC_CHECK_HEADERS(ncurses.h)],
-	[CF_CURSES_LIBS])
+	AC_CHECK_HEADERS(ncurses.h)],[
+	ac_widec_possible=no
+	AC_CHECK_LIB(ncurses, initscr,
+		[LIBS="$LIBS -lncurses"
+		if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
+			CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+		fi
+		AC_CHECK_HEADERS(ncurses.h)],
+		[CF_CURSES_LIBS])
+	])
 
 dnl --------------------------
 dnl end of (n)curses detection
@@ -75,10 +93,13 @@ dnl -------------------------
 dnl end of readline detection
 dnl -------------------------
 
+if test x$ac_widec_possible = xyes; then
+	AC_DEFINE(HANDLE_MULTIBYTE, 1, [Handle multibyte characters])
+fi
+
 AC_CHECK_FUNCS(resizeterm)
 
-AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF)],)
-AC_CHECK_FUNC(vsnprintf, [AC_DEFINE(HAVE_VSNPRINTF)],)
+AC_CHECK_FUNCS(snprintf vsnprintf)
 
 AC_ARG_ENABLE(debug, [  --enable-debug          Enable debugging support ], [case "${enableval}" in
 	yes) debug=true ;;
@@ -87,7 +108,7 @@ AC_ARG_ENABLE(debug, [  --enable-debug          Enable debugging support ], [cas
 	esac], [debug=false])
 
 if test x$debug = xtrue; then
-	CPPFLAGS="-DDEBUG $CPPFLAGS"
+	CPPFLAGS="-DDEBUG=1 $CPPFLAGS"
 	CFLAGS="-g $CFLAGS"
 fi