misc: we use git now, not mercurial

[kconfig-frontends] / configure.ac

diff --git a/configure.ac b/configure.ac
index f177892386a7304cab3ab90efc6eac066c2f803b..ad0cf5fb78e7626f71b8d30aef1accb61d1586ea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AS_IF(
 AM_INIT_AUTOMAKE([foreign])
 
 AS_IF(
-    [test "$(${srcdir}/scripts/version.sh --internal)" = "hg"],
+    [test "$(${srcdir}/scripts/version.sh --internal)" = "git"],
     [AM_SILENT_RULES],
     [AM_SILENT_RULES([yes])])
 
@@ -68,7 +68,7 @@ AC_SUBST([wall_CFLAGS],[${wall_CFLAGS}])
 # For the devel tree, do build with -Werror by default, unless user
 # explicitly disables -Werror
 AS_IF(
-    [test "$(${srcdir}/scripts/version.sh --internal)" = "hg"],
+    [test "$(${srcdir}/scripts/version.sh --internal)" = "git"],
     [werror_CFLAGS=-Werror])
 AC_ARG_ENABLE(
     [werror],
@@ -257,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],
@@ -280,6 +283,10 @@ AS_IF(
             [test "$need_curses" = "yes"],
             [AC_MSG_ERROR([could not find curses library (frontends: mconf/nconf)])],
             [has_curses=no])])
+     AC_SEARCH_LIBS(
+        [setupterm],
+        [tinfo],
+        [break])
      ncurses_LIBS="$LIBS"
      LIBS=$LIBS_old])