X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=configure.in;h=f5d609775af8486bb6a49332acd68b33912f165f;hb=b1b41dce461ab21ae9a2bd26d7a00a381a5f81f8;hp=0ba524c8bd284aa4c6d8a2c7a52dbabe4e28d1c1;hpb=6e541862e5e10bbc7e71dcafa4ff60f19272c66f;p=pkg%2Fabook.git

diff --git a/configure.in b/configure.in
index 0ba524c..f5d6097 100644
--- a/configure.in
+++ b/configure.in
@@ -4,10 +4,8 @@ AC_INIT(abook.c)
 AM_INIT_AUTOMAKE(abook, 0.5.2pre)
 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.])
+dnl AC_DEFINE(HAVE_STDARG_H, 0, [Define if you have the <stdarg.h> header file.])
+dnl AC_DEFINE(HAVE_NCURSES_H, 0, [Define if you have the <ncurses.h> header file.])
 
 AC_CANONICAL_HOST
 
@@ -21,13 +19,17 @@ 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_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_have_wchar_h=no])
-AC_CHECK_FUNCS(mbtowc wcwidth,,ac_widec_funcs=no)
+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
@@ -36,16 +38,6 @@ else
 	ac_widec_possible=no
 fi
 
-AC_ARG_ENABLE(widec, [  --enable-widec          Enable wide character support (experimental) ], [case "${enableval}" in
-	yes) ac_widec_support=true ;;
-	no) ac_widec_support=false ;;
-	*) AC_MSG_ERROR(bad value ${enableval} for --enable-widec) ;;
-	esac], [ac_widec_support=false])
-
-if test x$ac_widec_support = xtrue -a x$ac_widec_possible != xyes; then
-	AC_MSG_ERROR(Wide character support is not possible due to missing wide character functions or wchar.h)
-fi
-
 dnl -------------------
 dnl (n)curses detection
 dnl -------------------
@@ -60,15 +52,13 @@ AC_ARG_WITH(curses, [  --with-curses=DIR       Where ncurses is installed ],
 		CPPFLAGS="$CPPFLAGS -I${abook_cv_curses}/include"
 	fi])
 
-if test x$ac_widec_support = xtrue; then
-	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)],[
-		AC_MSG_ERROR("Wide character support is not possible due to missing ncursesw library. Please install it or disable wide character support")])
-else
+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)],[
+	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
@@ -76,7 +66,7 @@ else
 		fi
 		AC_CHECK_HEADERS(ncurses.h)],
 		[CF_CURSES_LIBS])
-fi
+	])
 
 dnl --------------------------
 dnl end of (n)curses detection
@@ -106,14 +96,13 @@ dnl -------------------------
 dnl end of readline detection
 dnl -------------------------
 
-if test x$ac_widec_support = xtrue; then
+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 ;;