Synchronise with v4.5

[kconfig-frontends] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2f1817ef69ca9be2c526a2c25ab00dfe6a164f40..c404185721a4ece992cd44e87fe90cbfaa6cf3e4 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
@@ -290,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],
@@ -300,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])
 
@@ -374,22 +374,22 @@ AS_IF(
 AS_IF(
     [test "$need_qt" = "yes" -o "$need_qt" = "auto"],
     [PKG_CHECK_MODULES(
-        [qt4],
-        [QtCore QtGui Qt3Support],
+        [Qt5],
+        [Qt5Core Qt5Gui Qt5Widgets],
         [has_qt=yes; need_moc="$need_qt"],
         [AS_IF(
             [test "$need_qt" = "yes"],
-            [AC_MSG_ERROR([could not find QT4 headers and/or libraries (frontend: qconf)])],
+            [AC_MSG_ERROR([could not find Qt5 headers and/or libraries (frontend: qconf)])],
             [has_qt=no; need_moc=no])])])
 
-AC_ARG_VAR([MOC], [Qt meta object compiler (moc) command])
+AC_ARG_VAR([MOC], [Qt5 meta object compiler (moc) command])
 AS_IF(
     [test "$need_moc" = "yes" -o "$need_moc" = "auto"],
-    [QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir`
+    [QT5_BINDIR=`$PKG_CONFIG Qt5Core --variable host_bins`
      AC_PATH_PROGS(
         [MOC],
-        [moc-qt4 moc],,
-        [$QT4_BINDIR:$PATH])
+        [moc-qt5 moc],,
+        [$QT5_BINDIR:$PATH])
      AS_IF(
         [test -n "$MOC"],
         [has_moc=yes],