X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.ac;h=68e0794e467413ffe9ca0eb427d65546504c5976;hb=138bc9fd61d8f01a48bde070afd42249ec119d57;hp=ab2f572e36d1d35d3b663c3732a9f28d2f40193e;hpb=878364dfe76dcc13579a7b4170940944d7c4a254;p=kconfig-frontends

diff --git a/configure.ac b/configure.ac
index ab2f572..68e0794 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ([2.67])
 AC_INIT(
     [kconfig-frontends],
     [m4_esyscmd_s([./scripts/version.sh])],
-    [nobody@nowhere.org])
+    [yann.morin.1998@free.fr])
 AC_CONFIG_SRCDIR([frontends/conf/conf.c])
 # Use a config.h to avoid brazilions -DHAVE_FOO on compile lines
 AC_CONFIG_HEADERS([scripts/.autostuff/config.h])
@@ -19,6 +19,15 @@ 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
 
 #----------------------------------------
@@ -28,6 +37,31 @@ LT_INIT([disable-static])
 
 #---------------------------------------------------------------------------
 # Set misc options
+
+# By default, do not build with -Wall, unless the user asks for it
+AC_ARG_ENABLE(
+    [wall],
+    [AS_HELP_STRING(
+        [--enable-wall],
+        [build with -Wall (default=no)])],
+    [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
+AC_ARG_ENABLE(
+    [werror],
+    [AS_HELP_STRING(
+        [--enable-werror],
+        [build with -Werror (default=no)])],
+    [AS_CASE(
+        ["$enableval"],
+        [yes], [werror_CFLAGS=-Werror],
+        [*],   [werror_CFLAGS=""])])
+AC_SUBST([werror_CFLAGS],[${werror_CFLAGS}])
+
 # Although there is a default (="linux") in the code, we do provide
 # a default here, to get a consistent autostuff behavior
 AC_ARG_ENABLE(
@@ -58,6 +92,13 @@ AC_ARG_ENABLE(
                 [config_prefix=$enableval])])
 AC_SUBST([config_prefix], [${config_prefix-CONFIG_}])
 
+AC_ARG_ENABLE(
+    [utils],
+    [AS_HELP_STRING(
+        [--disable-utils],
+        [install utilities to manage .config files (default=no)])])
+AC_SUBST([enable_utils], [${enable_utils:-yes}])
+
 #----------------------------------------
 # Options to selectively enable/disable frontends
 # All are selected by default
@@ -111,6 +152,10 @@ AC_ARG_ENABLE(
      done])
 AC_SUBST([enable_frontends])
 
+#----------------------------------------
+# What extra CFLAGS we will be using
+AC_SUBST([kf_CFLAGS], ["$wall_CFLAGS $werror_CFLAGS"])
+
 #----------------------------------------
 # Dependencies that will be needed, depending on the frontends
 AS_CASE(
@@ -155,7 +200,7 @@ AC_SUBST([AM_YFLAGS], ["-t -l -p zconf"])
 # Check for standard headers
 AC_HEADER_STDC
 AC_HEADER_STDBOOL
-AC_CHECK_HEADERS([ fcntl.h libintl.h limits.h locale.h ])
+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
 
@@ -170,17 +215,18 @@ AC_CHECK_FUNCS([ gettimeofday mkdir regcomp setlocale uname ])
 
 #----------------------------------------
 # Check for gettext, for the kconfig frontends
-AC_SUBST([GETTEXT])
+AC_SUBST([intl_CPPFLAGS])
 AC_CHECK_HEADERS(
     [libintl.h],
     [ac_ct_gettext_hdr=$ac_header; break],
-    [AC_MSG_WARN([libintl is missing, frontends will not be localised])])
+    [AC_MSG_WARN([libintl is missing, frontends will not be localised])
+     intl_CPPFLAGS=-DKBUILD_NO_NLS])
 AS_IF(
     [test -n "$ac_ct_gettext_hdr"],
     [AC_CHECK_DECL(
         [gettext],,
         [AC_MSG_WARN([gettext is missing, frontends will not be localised])
-         GETTEXT=-DKBUILD_NO_NLS],
+         intl_CPPFLAGS=-DKBUILD_NO_NLS],
         [#include <$ac_ct_gettext_hdr>])])
 
 #----------------------------------------
@@ -277,14 +323,30 @@ AS_IF(
     [PKG_CHECK_MODULES(
         [qt4],
         [QtCore QtGui Qt3Support],
-        [has_qt=yes],
+        [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)])],
-            [has_qt=no])])])
+            [has_qt=no; need_moc=no])])])
+
+AC_ARG_VAR([MOC], [Qt meta object compiler (moc) command])
+AS_IF(
+    [test "$need_moc" = "yes" -o "$need_moc" = "auto"],
+    [QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir`
+     AC_PATH_PROGS(
+        [MOC],
+        [moc-qt4 moc],,
+        [$QT4_BINDIR:$PATH])
+     AS_IF(
+        [test -n "$MOC"],
+        [has_moc=yes],
+        [AS_IF(
+            [test "$need_moc" = "yes"],
+            [AC_MSG_ERROR([could not find moc (frontend: qconf)])],
+            [has_moc=no])])])
 
 AS_IF(
-    [test "$has_qt" = "no" ],
+    [test "$has_qt" = "no" -o "$has_moc" = "no"],
     [enable_qconf=no])
 
 #----------------------------------------
@@ -310,6 +372,13 @@ AS_IF(
     [need_lxdialog=yes],
     [need_lxdialog=no])
 
+#----------------------------------------
+# Check if the images library should be built
+AS_IF(
+    [test "$enable_gconf" = "yes" -o "$enable_qconf" = "yes"],
+    [need_images=yes],
+    [need_images=no])
+
 #----------------------------------------
 # Setup automake conditional build
 AM_CONDITIONAL(
@@ -330,6 +399,12 @@ AM_CONDITIONAL(
 AM_CONDITIONAL(
     [COND_lxdialog],
     [test "$need_lxdialog" = "yes"])
+AM_CONDITIONAL(
+    [COND_images],
+    [test "$need_images" = "yes"])
+AM_CONDITIONAL(
+    [COND_utils],
+    [test "$enable_utils" = "yes"])
 
 #----------------------------------------
 # Get the version to apply to the parser shared library
@@ -341,6 +416,7 @@ AC_SUBST(
 # Finalise
 AC_CONFIG_FILES([
     Makefile
+    docs/Makefile
     libs/Makefile
     libs/images/Makefile
     libs/lxdialog/Makefile
@@ -351,31 +427,34 @@ AC_CONFIG_FILES([
     frontends/nconf/Makefile
     frontends/gconf/Makefile
     frontends/qconf/Makefile
+    utils/Makefile
+    scripts/Makefile
 ])
 AC_OUTPUT
 
+#----------------------------------------
+# Pretty-print the configuration settings
+[fe_list=]
+AS_IF([test "$enable_conf"  = "yes"], [fe_list="$fe_list conf" ])
+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"])
+
+[lib_list=]
+AS_IF(
+    [test "$enable_shared" = "yes"],
+    [lib_list="$lib_list shared (version: $KCONFIGPARSER_LIB_VERSION)"])
+AS_IF(
+    [test "$enable_static" = "yes"],
+    [lib_list="$lib_list${lib_list:+,} static"])
+
 AC_MSG_NOTICE()
 AC_MSG_NOTICE([Configured with:])
-AC_MSG_NOTICE([- root-menu prompt: '$root_menu'])
-AC_MSG_NOTICE([- config prefix:    '$config_prefix'])
-AC_MSG_NOTICE([- frontends:])
-AS_IF([test "$enable_conf" = "yes"],
-      [AC_MSG_NOTICE([  - conf:  yes])],
-      [AC_MSG_NOTICE([  - conf:  no])])
-AS_IF([test "$enable_gconf" = "yes"],
-      [AC_MSG_NOTICE([  - gconf: yes])],
-      [AC_MSG_NOTICE([  - gconf: no])])
-AS_IF([test "$enable_mconf" = "yes"],
-      [AC_MSG_NOTICE([  - mconf: yes])],
-      [AC_MSG_NOTICE([  - mconf: no])])
-AS_IF([test "$enable_nconf" = "yes"],
-      [AC_MSG_NOTICE([  - nconf: yes])],
-      [AC_MSG_NOTICE([  - nconf: no])])
-AS_IF([test "$enable_qconf" = "yes"],
-      [AC_MSG_NOTICE([  - qconf: yes])],
-      [AC_MSG_NOTICE([  - qconf: no])])
-AC_MSG_NOTICE([- parser library:])
-AS_IF([test "$enable_shared" = "yes"],
-      [AC_MSG_NOTICE([  - shared: yes, versioned $KCONFIGPARSER_LIB_VERSION])],
-      [AC_MSG_NOTICE([  - shared: no])])
-AC_MSG_NOTICE([  - static: $enable_static])
+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([- install utilities  : $enable_utils])
+AC_MSG_NOTICE([- CFLAGS CXXFLAGS    : $wall_CFLAGS $werror_CFLAGS])