Replaced the global text_object array and count with a text_object_list

[monky] / configure.ac.in

diff --git a/configure.ac.in b/configure.ac.in
index d4d8e44..c7ea864 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -3,7 +3,7 @@ dnl $Id$
 dnl major, minor and micro version macros.
 m4_define([conky_version_major], [1])
 m4_define([conky_version_minor], [5])
-m4_define([conky_version_micro], [1])
+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],
@@ -240,7 +240,7 @@ dnl
 AC_ARG_ENABLE([wlan],
              AC_HELP_STRING([--enable-wlan], [enable if you want wireless support @<:@default=no@:>@]),
              [want_wlan="$enableval"], [want_wlan=no])
-#
+
 AM_CONDITIONAL(BUILD_WLAN, test x$want_wlan = xyes)
 if test x$want_wlan = xyes; then
   AC_CHECK_HEADERS([iwlib.h], [], AC_MSG_ERROR([iwlib.h header not found]))
@@ -249,6 +249,24 @@ if test x$want_wlan = xyes; then
 fi
 
 dnl
+dnl NVIDIA libXNVCtrl support
+dnl
+
+AC_ARG_ENABLE([nvidia],
+               AC_HELP_STRING([--enable-nvidia], [enable if you want nvidia support @<:@default=no@:>@]),
+               [want_nvidia="$enableval"], [want_nvidia=no])
+AM_CONDITIONAL(BUILD_NVIDIA, test x$want_nvidia = xyes)
+if test x$want_nvidia = xyes; then
+       AC_CHECK_HEADERS([NVCtrl/NVCtrl.h], [], AC_MSG_ERROR([NVCtrl/NVCtrl.h header not found]))
+dnl AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryVersion], [] ,[AC_MSG_ERROR([grrr])] )
+dnl AC_CHECK_LIB([XNVCtrl], [XNVCTRLCheckTargetData], [], [AC_MSG_ERROR([grr])])
+dnl ## am I Stupid ??
+dnl ## it won't find the lib for some reason!?
+       LIBS="$LIBS -lXNVCtrl"
+               AC_DEFINE(NVIDIA, 1, [Define if you want nvidia support])
+fi
+
+dnl
 dnl IMLIB2
 dnl
 
@@ -304,19 +322,6 @@ else
 fi
 
 dnl
-dnl debug
-dnl
-
-AC_ARG_ENABLE([debug],
-              AC_HELP_STRING([--enable-debug], [compile with debug symbols @<:@default=no@:>@]),
-              [want_debug="$enableval"], [want_debug=no])
-
-if test "x$want_debug" = "xyes" -a $ac_cv_c_compiler_gnu != no; then
-  CFLAGS="$CFLAGS -g3 -Werror"
-  AC_DEFINE([DEBUG], [], [Define for debugging])
-fi
-
-dnl
 dnl X11
 dnl
 
@@ -483,7 +488,7 @@ dnl
 dnl Some functions
 dnl
 
-AC_CHECK_FUNCS([calloc malloc free popen sysinfo getloadavg memrchr])
+AC_CHECK_FUNCS([calloc malloc free popen sysinfo getloadavg memrchr strndup gethostbyname_r])
 AC_SEARCH_LIBS(clock_gettime, [rt],
                [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define if you have clock_gettime()])],
                [AC_CHECK_FUNCS([gettimeofday], [], [AC_MSG_ERROR([gettimeofday() not available!])])], [])
@@ -570,6 +575,37 @@ dnl
 
 CFLAGS="$CFLAGS -Wall -W"
 
+dnl
+dnl debug
+dnl
+
+AC_ARG_ENABLE([debug],
+              AC_HELP_STRING([--enable-debug], [compile with debug symbols @<:@default=no@:>@]),
+              [want_debug="$enableval"], [want_debug=no])
+
+if test "x$want_debug" = "xyes" -a $ac_cv_c_compiler_gnu != no; then
+  CFLAGS="$CFLAGS -g3 -Werror"
+  AC_DEFINE([DEBUG], [], [Define for debugging])
+fi
+
+dnl
+dnl testing
+dnl
+
+AC_ARG_ENABLE([testing],
+              AC_HELP_STRING([--enable-testing], [use strict compiler flags for testing @<:@default=no@:>@]),
+              [want_testing="$enableval"], [want_testing=no])
+
+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"
+    AC_DEFINE([TESTING], [], [Define for testing (enables strict compiler flags)])
+  else
+    CFLAGS="$CFLAGS -g3 -Werror -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"
+    AC_DEFINE([TESTING], [], [Define for testing (enables strict compiler flags)])
+  fi
+fi
+
 AC_SUBST(CFLAGS)
 AC_SUBST(X11_LIBS)
 
@@ -588,22 +624,23 @@ $PACKAGE $VERSION configured successfully:
  Linker flags:      $LDFLAGS
  Libraries:         $LIBS
 
- * x11:
-  x11 support:      $want_x11
-  xdamage support:  $want_xdamage
-  xdbe support:     $want_double_buffer
-  xft support:      $want_xft
+ * X11:
+  X11 support:      $want_x11
+  XDamage support:  $want_xdamage
+  XDBE support:     $want_double_buffer
+  Xft support:      $want_xft
 
- * music detection:
-  audacious:        $want_audacious
-  bmpx:             $want_bmpx
-  mpd:              $want_mpd
-  xmms2:            $want_xmms2
+ * Music detection:
+  Audacious:        $want_audacious
+  BMPx:             $want_bmpx
+  MPD:              $want_mpd
+  XMMS2:            $want_xmms2
 
- * general:
+ * General:
   hddtemp:          $want_hddtemp
   portmon:          $want_portmon
-  rss:              $want_rss
+  RSS:              $want_rss
   wireless:         $want_wlan
-  smapi:            $want_smapi
+  SMAPI:            $want_smapi
+  nvidia:           $want_nvidia
 EOF