X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.ac;h=ba7db9b155bdff560e8d0bb265b24b16558f162f;hb=bfeef58669d84d5da58f5b20c1f4d476ca2c44e4;hp=4e02c50ee8f66d8982b405103a2040209b66a935;hpb=63c59ab32f2485871eb7a85995a4970d8748ae34;p=kconfig-frontends

diff --git a/configure.ac b/configure.ac
index 4e02c50..ba7db9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,14 @@ AC_CONFIG_MACRO_DIR([scripts/.autostuff/m4])
 #----------------------------------------
 # Prepare automake
 
-# 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
-AS_IF(
-    [test "$program_prefix" = NONE],
-    [program_prefix=kconfig-])
-
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 
+# For releases, enable silent rules, unless the user explicitly
+# disables them.
+# For the devel tree, do build with verbose output, unless user
+# explicitly enables silent rules
 AS_IF(
-    [test "$(${srcdir}/scripts/version.sh --internal)" = "hg"],
+    [test "$(${srcdir}/scripts/version.sh --internal)" = "git"],
     [AM_SILENT_RULES],
     [AM_SILENT_RULES([yes])])
 
@@ -63,12 +59,12 @@ AC_ARG_ENABLE(
         [*],   [wall_CFLAGS=""])])
 AC_SUBST([wall_CFLAGS],[${wall_CFLAGS}])
 
-# For releases, do not build with -Werror, unless the user explcitly
+# For releases, do not build with -Werror, unless the user explicitly
 # 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"],
+    [test "$(${srcdir}/scripts/version.sh --internal)" = "git"],
     [werror_CFLAGS=-Werror])
 AC_ARG_ENABLE(
     [werror],
@@ -93,9 +89,7 @@ AC_ARG_ENABLE(
         [yes], [root_menu=Configuration],
         [no],  [root_menu=],
                [# Escape the $ signs, otherwise they would get munged by make
-                # Also, append a space at the end, to separate the package
-                # name from the literal 'Configuration'
-                root_menu="$( echo "$enableval" |sed -r -e 's/\$/\\$$/g;' )"])])
+                root_menu="$( echo "$enableval" |sed -e 's/\$/\\$$/g;' )"])])
 AC_SUBST([root_menu], [${root_menu=Configuration}])
 
 AC_ARG_ENABLE(
@@ -128,6 +122,13 @@ AC_SUBST([enable_L10n], [${enable_L10n:-yes}])
 #----------------------------------------
 # Options to selectively enable/disable frontends
 # All are selected by default
+AC_ARG_ENABLE(
+    [kconfig],
+    [AS_HELP_STRING(
+        [--disable-kconfig],
+        [kconfig, the meta-frontend to all kconfig tools (default=yes)])])
+AC_SUBST([enable_kconfig], [${enable_kconfig:-yes}])
+
 AC_ARG_ENABLE(
     [conf],
     [AS_HELP_STRING(
@@ -217,9 +218,22 @@ AS_IF(
 AS_IF(
     [test "$need_pkgconfig" = "yes"],
     [PKG_PROG_PKG_CONFIG()])
+# Look for `lex'. If it cannot be found, autoconf sets $LEX to ':'.
 AC_PROG_LEX
+AS_IF(
+    [test "$LEX" = ":"],
+    [AC_MSG_ERROR([can not find a lexer generator (such as lex or flex)])])
 AC_SUBST([AM_LFLAGS], ["-L -P zconf"])
+# Look for `yacc'. If it cannot be found, autoconf sets $YACC to 'yacc'.
 AC_PROG_YACC
+AS_IF(
+    [test "$YACC" = "yacc"],
+    [AC_CHECK_PROGS(
+        [YACC_IN_PATH],
+        [yacc])]
+     AS_IF(
+        [test -z "$YACC_IN_PATH"],
+        [AC_MSG_ERROR([can not find a parser generator (such as yacc or bison)])]))
 AC_SUBST([AM_YFLAGS], ["-t -l -p zconf"])
 
 #----------------------------------------
@@ -263,13 +277,22 @@ 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(
             [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(
+        [setupterm],
+        [tinfo],
+        [break])
      AC_SEARCH_LIBS(
         [initscr],
         [ncursesw ncurses curses],
@@ -350,22 +373,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],
@@ -410,6 +433,9 @@ AS_IF(
 
 #----------------------------------------
 # Setup automake conditional build
+AM_CONDITIONAL(
+    [COND_kconfig],
+    [test "$enable_kconfig" = "yes"])
 AM_CONDITIONAL(
     [COND_conf],
     [test "$enable_conf" = "yes"])
@@ -444,26 +470,6 @@ AC_SUBST(
     [KCONFIGPARSER_LIB_VERSION],
     [m4_esyscmd_s([./scripts/version.sh --plain])])
 
-#----------------------------------------
-# Finalise
-AC_CONFIG_FILES([
-    Makefile
-    docs/Makefile
-    libs/Makefile
-    libs/images/Makefile
-    libs/lxdialog/Makefile
-    libs/parser/Makefile
-    frontends/Makefile
-    frontends/conf/Makefile
-    frontends/mconf/Makefile
-    frontends/nconf/Makefile
-    frontends/gconf/Makefile
-    frontends/qconf/Makefile
-    utils/Makefile
-    scripts/Makefile
-])
-AC_OUTPUT
-
 #----------------------------------------
 # Pretty-print the configuration settings
 [fe_list=]
@@ -472,6 +478,15 @@ AS_IF([test "$enable_gconf" = "yes"], [fe_list="$fe_list gconf"])
 AS_IF([test "$enable_mconf" = "yes"], [fe_list="$fe_list mconf"])
 AS_IF([test "$enable_nconf" = "yes"], [fe_list="$fe_list nconf"])
 AS_IF([test "$enable_qconf" = "yes"], [fe_list="$fe_list qconf"])
+# The meta frontend is handled separatly, below, because we do not
+# want it in the list of tools, kcfg_list.
+
+[kcfg_list="$fe_list"]
+AS_IF([test "$enable_utils" = "yes"], [kcfg_list="$kcfg_list diff merge tweak"])
+AS_IF([test "$has_gettext" = "yes"],  [kcfg_list="$kcfg_list gettext"])
+AC_SUBST([kcfg_list], [${kcfg_list}])
+
+AS_IF([test "$enable_kconfig" = "yes"], [fe_list=" kconfig$fe_list"])
 
 [lib_list=]
 AS_IF(
@@ -481,13 +496,19 @@ AS_IF(
     [test "$enable_static" = "yes"],
     [lib_list="$lib_list${lib_list:+,} static"])
 
+#----------------------------------------
+# Finalise
+AC_CONFIG_FILES([
+    Makefile
+])
+AC_OUTPUT
+
 AC_MSG_NOTICE()
 AC_MSG_NOTICE([Configured with:])
 AC_MSG_NOTICE([- parser library     :$lib_list])
 AC_MSG_NOTICE([  - root-menu prompt : $root_menu])
 AC_MSG_NOTICE([  - config prefix    : $config_prefix])
 AC_MSG_NOTICE([- frontends          :$fe_list])
-AC_MSG_NOTICE([  - transform name   : $program_transform_name])
 AC_MSG_NOTICE([  - localised        : $has_gettext])
 AC_MSG_NOTICE([- install utilities  : $enable_utils])
 AC_MSG_NOTICE([- CFLAGS CXXFLAGS    : $wall_CFLAGS $werror_CFLAGS])