configure: fixup extended colors in wide-char-enabled ncurses

[kconfig-frontends] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8896d258edaf4f20e208990b62403b5c8f2b32c1..8b5bc5d0bd94f6d9e4b817e996cf894b1d6ae581 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AS_IF(
     [test "$program_prefix" = NONE],
     [program_prefix=kconfig-])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])
 
 AS_IF(
     [test "$(${srcdir}/scripts/version.sh --internal)" = "hg"],
@@ -50,19 +50,26 @@ LT_INIT([disable-static])
 #---------------------------------------------------------------------------
 # Set misc options
 
-# By default, do not build with -Wall, unless the user asks for it
+# By default, do build with -Wall, unless the user asks not to
+[wall_CFLAGS=-Wall]
 AC_ARG_ENABLE(
     [wall],
     [AS_HELP_STRING(
-        [--enable-wall],
-        [build with -Wall (default=no)])],
+        [--disable-wall],
+        [build with -Wall (default=yes)])],
     [AS_CASE(
         ["$enableval"],
         [yes], [wall_CFLAGS=-Wall],
         [*],   [wall_CFLAGS=""])])
 AC_SUBST([wall_CFLAGS],[${wall_CFLAGS}])
 
-# By default, do not build with -Werror, unless the user asks for it
+# For releases, do not build with -Werror, unless the user explcitly
+# requests to build with -Werror.
+# For the devel tree, do build with -Werror by default, unless user
+# explicitly disables -Werror
+AS_IF(
+    [test "$(${srcdir}/scripts/version.sh --internal)" = "hg"],
+    [werror_CFLAGS=-Werror])
 AC_ARG_ENABLE(
     [werror],
     [AS_HELP_STRING(
@@ -215,23 +222,6 @@ AC_SUBST([AM_LFLAGS], ["-L -P zconf"])
 AC_PROG_YACC
 AC_SUBST([AM_YFLAGS], ["-t -l -p zconf"])
 
-#----------------------------------------
-# Check for standard headers
-AC_HEADER_STDC
-AC_HEADER_STDBOOL
-AC_CHECK_HEADERS([ fcntl.h limits.h locale.h ])
-AC_CHECK_HEADERS([ stdlib.h string.h sys/time.h unistd.h ])
-AC_TYPE_SIZE_T
-
-#----------------------------------------
-# Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_FUNC_ALLOCA
-AC_CHECK_FUNCS([ bzero memmove memset ])
-AC_CHECK_FUNCS([ strcasecmp strchr strcspn strdup strncasecmp strpbrk strrchr strspn strtol ])
-AC_CHECK_FUNCS([ gettimeofday mkdir regcomp setlocale uname ])
-
 #----------------------------------------
 # Check for gettext, for the kconfig frontends
 [has_gettext="$enable_L10n"]
@@ -267,19 +257,22 @@ AC_SUBST([intl_LIBS])
 # Check for ncurses, for the mconf & nconf frontends
 AS_IF(
     [test "$need_curses" = "yes" -o "$need_curses" = "auto"],
-    [AC_SUBST([CURSES_LOC])
+    [AC_SUBST([ncurses_mconf_CPPFLAGS])
      AC_SUBST([ncurses_LIBS])
      LIBS_old="$LIBS"
      LIBS=
      AC_CHECK_HEADERS(
         [ncursesw/curses.h ncurses/ncurses.h ncurses/curses.h ncurses.h curses.h],
-        [CURSES_LOC=$ac_header; break])
+        [CURSES_LOC=$ac_header; ncurses_mconf_CPPFLAGS=-DCURSES_LOC=\\\"$ac_header\\\"; break])
      AS_IF(
         [test -z "$CURSES_LOC"],
         [AS_IF(
             [test "$need_curses" = "yes"],
             [AC_MSG_ERROR([could not find curses headers (frontends: mconf/nconf)])],
             [has_curses=no])])
+     AS_CASE(
+        [$CURSES_LOC],
+        [ncursesw/*],[ncurses_mconf_CPPFLAGS="$ncurses_mconf_CPPFLAGS -DNCURSES_WIDECHAR=1"])
      AC_SEARCH_LIBS(
         [initscr],
         [ncursesw ncurses curses],
@@ -301,12 +294,12 @@ AS_IF(
 # Check for libpanel and libmenu, for the nconf frontend
 AS_IF(
     [test "$need_panel_menu" = "yes" -o "$need_panel_menu" = "auto"],
-    [AC_SUBST([ncurses_extra_LIBS])
-     AC_SUBST([ncurses_extra_CPPFLAGS])
+    [AC_SUBST([ncurses_nconf_CPPFLAGS])
+     AC_SUBST([ncurses_panel_menu_LIBS])
      AS_CASE(
         [$CURSES_LOC],
-        [ncursesw/*],[ncurses_extra_CPPFLAGS="-I/usr/include/ncursesw"],
-        [ncurses/*],[ncurses_extra_CPPFLAGS="-I/usr/include/ncurses"])
+        [ncursesw/*],[ncurses_nconf_CPPFLAGS="-I/usr/include/ncursesw"],
+        [ncurses/*],[ncurses_nconf_CPPFLAGS="-I/usr/include/ncurses"])
      LIBS_old="$LIBS"
      LIBS=
      AC_SEARCH_LIBS(
@@ -331,7 +324,7 @@ AS_IF(
             [test "$need_panel_menu" = "yes"],
             [AC_MSG_ERROR([could not find libmenu library (frontend: nconf)])],
             [has_panel_menu=no])])
-     ncurses_extra_LIBS="$LIBS"
+     ncurses_panel_menu_LIBS="$LIBS"
      LIBS=$LIBS_old])
 
 AS_IF(