here comes the big header include rewrite

[monky] / configure.ac.in

diff --git a/configure.ac.in b/configure.ac.in
index 616d609..d7ed523 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,10 +1,8 @@
-dnl $Id$
-
 dnl major, minor and micro version macros.
 m4_define([conky_version_major], [1])
 m4_define([conky_version_minor], [6])
-m4_define([conky_version_micro], [0])
-m4_define([conky_version_tag], []) dnl [] for releases
+m4_define([conky_version_micro], [2])
+m4_define([conky_version_tag], [pre]) dnl [] for releases
 m4_define([conky_version_revision],[_pre@REVISION@])
 m4_define([conky_version],
     [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
@@ -93,6 +91,20 @@ AC_SUBST(BUILD_ARCH)
 
 
 dnl
+dnl BUILD_CONFIG_OUTPUT option
+dnl
+
+AC_ARG_ENABLE([config_output],
+              AC_HELP_STRING([--disable-config-output], [disable if you do not want conky to output a default config (with -C) @<:@default=yes@:>@]),
+              [want_config_output="$enableval"], [want_config_output=yes])
+
+AM_CONDITIONAL(BUILD_CONFIG_OUTPUT, test x$want_config_output = xyes)
+if test x$want_config_output = xyes; then
+  AC_DEFINE(CONFIG_OUTPUT, 1, [Define if you want conky to output a default config (with -C)])
+  AC_CHECK_FUNCS(fopencookie, AM_CONDITIONAL(BUILD_FOR_FOPENCOOKIE, true))
+fi
+
+dnl
 dnl OWN_WINDOW option
 dnl
 
@@ -204,6 +216,19 @@ if test x$want_mpd = xyes; then
 fi
 
 dnl
+dnl MOC
+dnl
+
+AC_ARG_ENABLE([moc],
+              AC_HELP_STRING([--disable-moc], [disable if you do not want MOC support @<:@default=yes@:>@]),
+              [want_moc="$enableval"], [want_moc=yes])
+
+AM_CONDITIONAL(BUILD_MOC, test x$want_moc = xyes)
+if test x$want_moc = xyes; then
+  AC_DEFINE(MOC, 1, [Define if you want MOC support])
+fi
+
+dnl
 dnl XMMS2
 dnl
 
@@ -224,7 +249,7 @@ dnl EVE Skill Monitor
 dnl
 
 AC_ARG_ENABLE([eve],
-              EC_HELP_STRING([--enable-eve], [Eve-Online skill monitor @<:@default=no@:>@]),
+              AC_HELP_STRING([--enable-eve], [Eve-Online skill monitor @<:@default=no@:>@]),
               [want_eve="$enableval"], [want_eve=no])
 
 AM_CONDITIONAL(BUILD_EVE, test x$want_eve = xyes)
@@ -527,6 +552,9 @@ dnl
 
 AC_DEFINE(DEFAULTNETDEV, "eth0", [Default networkdevice])
 AC_DEFINE(CONFIG_FILE, "$HOME/.conkyrc", [Configfile of the user])
+AC_DEFINE(MAX_SPECIALS_DEFAULT, 512, [Default maximum number of special things, e.g. fonts, offsets, aligns, etc.])
+AC_DEFINE(MAX_USER_TEXT_DEFAULT, 16384, [Default maximum size of config TEXT buffer, i.e. below TEXT line.])
+AC_DEFINE(DEFAULT_TEXT_BUFFER_SIZE, 256, [Default size used for temporary, static text buffers])
 
 dnl
 dnl Some functions
@@ -631,7 +659,7 @@ AC_ARG_ENABLE([debug],
 
 if test "x$want_debug" = "xyes" -a $ac_cv_c_compiler_gnu != no; then
   CFLAGS="$CFLAGS -g3"
-  AC_DEFINE([DEBUG], [], [Define for debugging])
+  AC_DEFINE([DEBUG], 1, [Define for debugging])
 fi
 
 dnl
@@ -644,10 +672,10 @@ AC_ARG_ENABLE([testing],
 
 if test "x$want_testing" = "xyes" -a $ac_cv_c_compiler_gnu != no; then
   if test "x$want_debug" = "xyes"; then
-    CFLAGS="$CFLAGS -Wextra -Wunused -Wdeclaration-after-statement -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wold-style-definition -Winline -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -std=c99 -pedantic"
+    CFLAGS="$CFLAGS -Wextra -Wunused -Wdeclaration-after-statement -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wold-style-definition -Winline -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -std=c99 -pedantic -Werror"
     AC_DEFINE([TESTING], [], [Define for testing (enables strict compiler flags)])
   else
-    CFLAGS="$CFLAGS -g3 -Wextra -Wunused -Wdeclaration-after-statement -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wold-style-definition -Winline -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -std=c99 -pedantic"
+    CFLAGS="$CFLAGS -g3 -Wextra -Wunused -Wdeclaration-after-statement -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wold-style-definition -Winline -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -std=c99 -pedantic -Werror"
     AC_DEFINE([TESTING], [], [Define for testing (enables strict compiler flags)])
   fi
 fi
@@ -680,6 +708,7 @@ $PACKAGE $VERSION configured successfully:
   Audacious:        $want_audacious
   BMPx:             $want_bmpx
   MPD:              $want_mpd
+  MOC:              $want_moc
   XMMS2:            $want_xmms2
 
  * General:
@@ -691,4 +720,5 @@ $PACKAGE $VERSION configured successfully:
   SMAPI:            $want_smapi
   nvidia:           $want_nvidia
   eve-online:       $want_eve
+  config-output:    $want_config_output
 EOF