projects / monky / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 5a4331c..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],
@@ -114,21 +114,21 @@ AC_ARG_ENABLE([audacious],
 
 AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes -o x$want_audacious = xlegacy)
 if test x$want_audacious = xyes; then
-      PKG_CHECK_MODULES([AUDACIOUS], [audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0])
-      CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS"
-      LIBS="$LIBS $AUDACIOUS_LIBS"
+      PKG_CHECK_MODULES([Audacious], [audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0])
+      CFLAGS="$CFLAGS $Audacious_CFLAGS"
+      LIBS="$LIBS $Audacious_LIBS"
       save_CPPFLAGS="$CPPFLAGS"
-      CPPFLAGS="$AUDACIOUS_CFLAGS -I`pkg-config --variable=audacious_include_dir audacious`/audacious"
+      CPPFLAGS="$Audacious_CFLAGS -I`pkg-config --variable=audacious_include_dir audacious`/audacious"
       AC_CHECK_HEADERS([audacious/audctrl.h audacious/dbus.h glib.h glib-object.h],
                        [], AC_MSG_ERROR([required header(s) not found]))
       CPPFLAGS="$save_CPPFLAGS"
       AC_DEFINE(AUDACIOUS, 1, [Define for Audacious support])
 else if test x$want_audacious = xlegacy; then
-      PKG_CHECK_MODULES([AUDACIOUS], [audacious < 1.4.0 glib-2.0])
-      CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS"
-      LIBS="$LIBS $AUDACIOUS_LIBS"
+      PKG_CHECK_MODULES([Audacious], [audacious < 1.4.0 glib-2.0])
+      CFLAGS="$CFLAGS $Audacious_CFLAGS"
+      LIBS="$LIBS $Audacious_LIBS"
       save_CPPFLAGS="$CPPFLAGS"
-      CPPFLAGS="$AUDACIOUS_CFLAGS -I`pkg-config --variable=audacious_include_dir audacious`/audacious"
+      CPPFLAGS="$Audacious_CFLAGS -I`pkg-config --variable=audacious_include_dir audacious`/audacious"
       AC_CHECK_HEADERS([audacious/beepctrl.h glib.h], [], AC_MSG_ERROR([required  header(s) not found]))
       CPPFLAGS="$save_CPPFLAGS"
       AC_DEFINE(AUDACIOUS, 1, [Define for Audacious support])
@@ -147,9 +147,9 @@ AC_ARG_ENABLE([bmpx],
 
 AM_CONDITIONAL(BUILD_BMPX, test x$want_bmpx = xyes)
 if test x$want_bmpx = xyes; then
-  PKG_CHECK_MODULES([BMPX], [bmp-2.0 >= 0.14.0])
-  CFLAGS="$CFLAGS $BMPX_CFLAGS"
-  LIBS="$LIBS $BMPX_LIBS"
+  PKG_CHECK_MODULES([BMPx], [bmp-2.0 >= 0.14.0])
+  CFLAGS="$CFLAGS $BMPx_CFLAGS"
+  LIBS="$LIBS $BMPx_LIBS"
   AC_DEFINE(BMPX, 1, [Define if you want BMPx support])
 fi
 
@@ -213,9 +213,10 @@ AC_ARG_ENABLE([rss],
 AM_CONDITIONAL(BUILD_RSS, test x$want_rss = xyes)
 if test x$want_rss = xyes; then
        WANT_GLIB=yes
-       PKG_CHECK_MODULES(RSS, libxml-2.0 libcurl,,exit)
-       CFLAGS="$CFLAGS $RSS_CFLAGS"
-       LIBS="$LIBS $RSS_LIBS"
+       PKG_CHECK_MODULES([libxml2], libxml-2.0)
+       PKG_CHECK_MODULES([libcurl], libcurl)
+       CFLAGS="$CFLAGS $libxml2_CFLAGS $libcurl_CFLAGS"
+       LIBS="$LIBS $libxml2_LIBS $libcurl_LIBS"
        AC_DEFINE(RSS, 1, [Define if you want rss support])
 fi
 
@@ -239,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]))
@@ -248,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
 
@@ -303,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
 
@@ -360,9 +366,9 @@ if test "x$want_double_buffer" = "xyes"; then
       want_double_buffer=no
     else
       if $PKG_CONFIG --exists xext; then
-        PKG_CHECK_MODULES([XEXT],[xext])
-        CFLAGS="$CFLAGS $XEXT_CFLAGS"
-        LIBS="$LIBS $XEXT_LIBS"
+        PKG_CHECK_MODULES([Xext],[xext])
+        CFLAGS="$CFLAGS $Xext_CFLAGS"
+        LIBS="$LIBS $Xext_LIBS"
       else
         dnl non-modular X11 installation
         AC_CHECK_LIB([Xext], [XdbeQueryExtension], [LIBS="$LIBS -lXext"],
@@ -388,9 +394,9 @@ if test "x$want_xdamage" = "xyes"; then
       want_xdamage=no
     else
       if $PKG_CONFIG --exists xdamage; then
-        PKG_CHECK_MODULES([XDAMAGE],[xdamage])
-        CFLAGS="$CFLAGS $XDAMAGE_CFLAGS"
-        LIBS="$LIBS $XDAMAGE_LIBS"
+        PKG_CHECK_MODULES([XDamage],[xdamage])
+        CFLAGS="$CFLAGS $XDamage_CFLAGS"
+        LIBS="$LIBS $XDamage_LIBS"
       else
         dnl non-modular X11 installation
         AC_CHECK_LIB([Xdamage], [XDamageQueryExtension], [LIBS="$LIBS -lXdamage"],
@@ -414,9 +420,9 @@ if test x$want_xft = "xyes"; then
       dnl silently disable if no x11
       want_xft=no
     else
-      PKG_CHECK_MODULES(XFT, [xft])
-      CFLAGS="$CFLAGS $XFT_CFLAGS"
-      LIBS="$LIBS $XFT_LIBS"
+      PKG_CHECK_MODULES([Xft], [xft])
+      CFLAGS="$CFLAGS $Xft_CFLAGS"
+      LIBS="$LIBS $Xft_LIBS"
       AC_DEFINE(XFT, 1, [Define for Xft support])
     fi
 fi
@@ -426,9 +432,9 @@ dnl GLIB
 dnl
 
 if test x$WANT_GLIB = xyes; then
-       PKG_CHECK_MODULES([GLIB], [glib-2.0])
-        CFLAGS="$CFLAGS $GLIB_CFLAGS"
-       LIBS="$LIBS $GLIB_LIBS"
+       PKG_CHECK_MODULES([GLib2], [glib-2.0])
+        CFLAGS="$CFLAGS $GLib2_CFLAGS"
+       LIBS="$LIBS $GLib2_LIBS"
 fi
 
 dnl
@@ -482,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!])])], [])
@@ -569,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)
 
@@ -587,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
Unnamed repository; edit this file to name it for gitweb.