Synchronise with v4.2

[kconfig-frontends] / configure.ac

diff --git a/configure.ac b/configure.ac
index 814d8c81bbbdf41099438d503f701e596ef3a0db..f534297bdb98639a994194b075a383cc9c45eba3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_CONFIG_MACRO_DIR([scripts/.autostuff/m4])
 #----------------------------------------
 # Prepare automake
 
-# We want to allow the user to override our default program-prefix,
+# We want to allow the user to override our default program-prefix,
 # so we must set-it now, before automake has a chance to interpret
 # it, but after the options are parsed, so as not to overwrite the
 # value (if any) set by the user
@@ -278,7 +278,9 @@ AS_IF(
      LIBS=
      AC_CHECK_HEADERS(
         [ncursesw/curses.h ncurses/ncurses.h ncurses/curses.h ncurses.h curses.h],
-        [CURSES_LOC=$ac_header; ncurses_mconf_CPPFLAGS=-DCURSES_LOC=\\\"$ac_header\\\"; break])
+        [CURSES_LOC=$ac_header
+         ncurses_mconf_CPPFLAGS=-DCURSES_LOC=\\\"$ac_header\\\"
+         break # Stupid syntax-coloring in vim: "])
      AS_IF(
         [test -z "$CURSES_LOC"],
         [AS_IF(
@@ -288,6 +290,10 @@ AS_IF(
      AS_CASE(
         [$CURSES_LOC],
         [ncursesw/*],[ncurses_mconf_CPPFLAGS="$ncurses_mconf_CPPFLAGS -DNCURSES_WIDECHAR=1"])
+     AC_SEARCH_LIBS(
+        [setupterm],
+        [tinfo],
+        [break])
      AC_SEARCH_LIBS(
         [initscr],
         [ncursesw ncurses curses],
@@ -298,10 +304,6 @@ 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])