Fix crash in mail stuff due to bad free().
[monky] / configure.ac.in
index 6253181..a08ef7f 100644 (file)
@@ -1,9 +1,11 @@
+# -*- mode: Makefile; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+#
 dnl major, minor and micro version macros.
 m4_define([conky_version_major], [1])
-m4_define([conky_version_minor], [7])
-m4_define([conky_version_micro], [2])
+m4_define([conky_version_minor], [8])
+m4_define([conky_version_micro], [1])
 m4_define([conky_version_tag], [pre]) dnl [] for releases
-m4_define([conky_version_revision],[_pre@REVISION@])
+m4_define([conky_version_revision],[_rc1])
 m4_define([conky_version],
     [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
       conky_version_tag(), [pre],
@@ -32,6 +34,7 @@ AC_PROG_LD
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 AM_PROG_LIBTOOL
+AM_PROG_CC_C_O
 
 AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
 if test x"$HAVE_PKGCONFIG" = x"no"; then
@@ -120,6 +123,20 @@ if test $dah != "no"; then
   AC_DEFINE(OWN_WINDOW, 1, [Define if you want support for window creating])
 fi
 
+dnl
+dnl NCURSES option
+dnl
+
+AC_ARG_ENABLE([ncurses],
+              AC_HELP_STRING([--disable-ncurses], [disable if you do not want ncurses support in conky @<:@default=yes@:>@]),
+              [want_ncurses="$enableval"], [want_ncurses=yes])
+
+AM_CONDITIONAL(BUILD_NCURSES, test x$want_ncurses = xyes)
+if test x$want_ncurses = xyes; then
+      conky_LIBS="$conky_LIBS -lncurses"
+      AC_DEFINE(NCURSES, 1, [Define for ncurses support])
+fi
+
 
 dnl
 dnl Audacious Media Player
@@ -132,7 +149,7 @@ 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])
+      PKG_CHECK_MODULES([Audacious], [audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0])
       conky_CFLAGS="$conky_CFLAGS $Audacious_CFLAGS"
       conky_LIBS="$conky_LIBS $Audacious_LIBS"
       save_CPPFLAGS="$CPPFLAGS"
@@ -184,7 +201,7 @@ AM_CONDITIONAL(BUILD_IBM, test x$want_ibm = xyes)
 if test x$want_ibm = xyes; then
        if test x"$uname" != xLinux; then
                AC_MSG_NOTICE([support for IBM/Lenovo notebooks not supported on $uname... disabling])
-               want_ibm=no
+               want_ibm="not supported on $uname"
        else
                AC_DEFINE(IBM, 1, [Define if you want support for IBM/Lenovo notebooks (SMAPI)])
        fi
@@ -204,7 +221,7 @@ AM_CONDITIONAL(BUILD_HDDTEMP, test x$want_hddtemp = xyes)
 if test x$want_hddtemp = xyes; then
   if test x"$uname" != xLinux; then
       AC_MSG_NOTICE([hddtemp not supported on $uname... disabling])
-      want_hddtemp=no
+      want_hddtemp="not supported on $uname"
   else
       AC_DEFINE(HDDTEMP, 1, [Define if you want hddtemp support])
   fi
@@ -223,7 +240,7 @@ AC_ARG_ENABLE([apcupsd],
 if test x$want_apcupsd = xyes; then
   if test x"$uname" != xLinux; then
       AC_MSG_NOTICE([apcupsd not supported on $uname... disabling])
-      want_apcupsd=no
+      want_apcupsd="not supported on $uname"
   else
       AC_DEFINE(APCUPSD, 1, [Define if you want apcupsd support])
   fi
@@ -237,13 +254,13 @@ dnl
 
 AC_ARG_ENABLE([iostats],
               AC_HELP_STRING([--enable-iostats],
-                             [enable if you want support for per-task I/O statistics @<:@default=no@:>@]),
-              [want_iostats="$enableval"], [want_iostats=no])
+                             [enable if you want support for per-task I/O statistics @<:@default=yes@:>@]),
+              [want_iostats="$enableval"], [want_iostats=yes])
 
 if test x$want_iostats = xyes; then
   if test x"$uname" != xLinux; then
       AC_MSG_NOTICE([iostats not supported on $uname... disabling])
-      want_apcupsd=no
+      want_iostats="not supported on $uname"
   else
       AC_DEFINE(IOSTATS, 1, [Define if you want support for per-task I/O statistics])
   fi
@@ -300,13 +317,21 @@ AC_ARG_ENABLE([xmms2],
 
 AM_CONDITIONAL(BUILD_XMMS2, test x$want_xmms2 = xyes)
 if test x$want_xmms2 = xyes; then
-  PKG_CHECK_MODULES([XMMS2], [xmms2-client])
+  PKG_CHECK_MODULES([XMMS2], [xmms2-client] >= [0.6])
     conky_CFLAGS="$conky_CFLAGS $XMMS2_CFLAGS"
     conky_LIBS="$conky_LIBS $XMMS2_LIBS"
     AC_DEFINE(XMMS2, 1, [Define if you want XMMS2 support])
 fi
 
 dnl
+dnl libcurl, see below for more (this has to be above the other uses of want_curl)
+dnl
+
+AC_ARG_ENABLE([curl],
+               AC_HELP_STRING([--enable-curl], [enable if you want curl support @<:@default=no@:>@]),
+               [want_curl="$enableval"], [want_curl=no])
+
+dnl
 dnl EVE Skill Monitor
 dnl
 
@@ -316,10 +341,8 @@ AC_ARG_ENABLE([eve],
 
 AM_CONDITIONAL(BUILD_EVE, test x$want_eve = xyes)
 if test x$want_eve = xyes; then
-       PKG_CHECK_MODULES([libxml2], libxml-2.0)
-       PKG_CHECK_MODULES([libcurl], libcurl)
-       conky_CFLAGS="$conky_CFLAGS $libxml2_CFLAGS $libcurl_CFLAGS"
-       conky_LIBS="$conky_LIBS $libxml2_LIBS $libcurl_LIBS"
+       want_curl=yes
+       want_libxml2=yes
        AC_DEFINE(EVE, 1, [Define if you want Eve-Online Skill monitor support])
        AC_DEFINE(EVEURL_TRAINING, "http://api.eve-online.com/char/SkillInTraining.xml.aspx", [Eve training URL])
        AC_DEFINE(EVEURL_SKILLTREE, "http://api.eve-online.com/eve/Skilltree.xml.aspx", [Eve skilltree URL])
@@ -338,28 +361,36 @@ 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([libxml2], libxml-2.0)
-       PKG_CHECK_MODULES([libcurl], libcurl)
-       conky_CFLAGS="$conky_CFLAGS $libxml2_CFLAGS $libcurl_CFLAGS"
-       conky_LIBS="$conky_LIBS $libxml2_LIBS $libcurl_LIBS"
-       AC_DEFINE(RSS, 1, [Define if you want rss support])
+       want_curl=yes
+       want_libxml2=yes
+       AC_DEFINE(RSS, 1, [Define if you want Curl support])
 fi
 
 dnl
 dnl WEATHER
 dnl
 
-AC_ARG_ENABLE([weather],
-             AC_HELP_STRING([--enable-weather], [enable if you want weather support @<:@default=no@:>@]),
-             [want_weather="$enableval"], [want_weather=no])
+AC_ARG_ENABLE([weather-metar],
+             AC_HELP_STRING([--enable-weather-metar], [enable if you want METAR weather support @<:@default=no@:>@]),
+             [want_metar="$enableval"], [want_metar=no])
+
+AC_ARG_ENABLE([weather-xoap],
+             AC_HELP_STRING([--enable-weather-xoap], [enable if you want XOAP weather support (also enables METAR) @<:@default=no@:>@]),
+             [want_xoap="$enableval"], [want_xoap=no])
 #
-AM_CONDITIONAL(BUILD_WEATHER, test x$want_weather = xyes)
-if test x$want_weather = xyes; then
-       WANT_GLIB=yes
-       PKG_CHECK_MODULES([libcurl], libcurl)
-       conky_CFLAGS="$conky_CFLAGS $libcurl_CFLAGS"
-       conky_LIBS="$conky_LIBS $libcurl_LIBS"
-       AC_DEFINE(WEATHER, 1, [Define if you want weather support])
+if test x$want_xoap = xyes; then
+       want_metar=yes
+fi
+AM_CONDITIONAL(BUILD_WEATHER, test x$want_metar = xyes)
+AM_CONDITIONAL(BUILD_XOAP, test x$want_xoap = xyes)
+if test x$want_metar = xyes; then
+       if test x$want_xoap = xyes; then
+               want_libxml2=yes
+               AC_DEFINE(XOAP, 1, [Define if you want XOAP weather support])
+               AC_DEFINE(XOAP_FILE, "$HOME/.xoaprc", [User xoap keys file])
+       fi
+       want_curl=yes
+       AC_DEFINE(WEATHER, 1, [Define if you want METAR weather support])
 fi
 
 dnl
@@ -392,12 +423,38 @@ if test "x$want_x11" = "xyes"; then
 fi
 
 dnl
+dnl ARGB
+dnl
+
+AC_ARG_ENABLE([argb],
+              AC_HELP_STRING([--disable-argb], [disable if you do not want a argb visual @<:@default=yes@:>@]),
+              [want_argb="$enableval"], [want_argb=yes])
+
+if test x$want_argb = xyes; then
+    if test "x$want_x11" != "xyes"; then
+       dnl silently disable if no x11
+       want_argb=no
+    else
+       AC_DEFINE(USE_ARGB, 1, [Define if you want argb visual support])
+    fi
+fi
+
+dnl
 dnl IMLIB2
 dnl
 
 AC_ARG_ENABLE([imlib2],
-                         AC_HELP_STRING([--enable-imlib2], [enable if you want Imlib2 support (also enables Lua Imlib2 support if lua-extras enabled) [[default=no]]]),
+                         AC_HELP_STRING([--enable-imlib2], [enable if you want Imlib2 support [[default=no]]]),
                          [want_imlib2="$enableval"], [want_imlib2=no])
+AC_ARG_ENABLE([lua-imlib2],
+             AC_HELP_STRING([--enable-lua-imlib2], [enable if you want Lua Imlib2 bindings for Conky @<:@default=no@:>@]),
+             [want_lua_imlib2="$enableval"], [want_lua_imlib2=no])
+
+# if lua-imlib2 is enabled, we must force imlib2
+if test x$want_lua_imlib2 = xyes; then
+       want_imlib2=yes
+fi
+
 if test x$want_imlib2 = xyes; then
        if test "x$want_x11" != "xyes"; then
                dnl silently disable if no x11
@@ -418,12 +475,14 @@ dnl
 AC_ARG_ENABLE([lua],
              AC_HELP_STRING([--enable-lua], [enable if you want Lua scripting support @<:@default=yes@:>@]),
              [want_lua="$enableval"], [want_lua=yes])
-AC_ARG_ENABLE([lua-extras],
-             AC_HELP_STRING([--enable-lua-extras], [enable if you want to install Lua extras (including bindings) @<:@default=no@:>@]),
-             [want_lua_extras="$enableval"], [want_lua_extras=no])
 AC_ARG_ENABLE([lua-cairo],
-             AC_HELP_STRING([--enable-lua-cairo], [enable if you want Lua Cairo bindings for Conky (requires lua-extras enabled) @<:@default=no@:>@]),
+             AC_HELP_STRING([--enable-lua-cairo], [enable if you want Lua Cairo bindings for Conky @<:@default=no@:>@]),
              [want_lua_cairo="$enableval"], [want_lua_cairo=no])
+need_tolua=no
+if test x$want_lua_cairo = xyes -o x$want_lua_imlib2 = xyes; then
+       need_tolua=yes
+       want_lua=yes
+fi
 
 AM_CONDITIONAL(BUILD_LUA, test x$want_lua = xyes)
 if test x$want_lua = xyes; then
@@ -435,12 +494,8 @@ if test x$want_lua = xyes; then
        conky_CFLAGS="$conky_CFLAGS $LUA_CFLAGS $LUA51_CFLAGS"
        conky_LIBS="$conky_LIBS $LUA_LIBS $LUA51_LIBS"
 
-       want_lua_imlib2="$want_imlib2"
-       if test x$want_lua_extras != xyes; then
-               want_lua_cairo=no
-               want_lua_imlib2=no
-       else
-               AC_CHECK_PROG(HAVE_TOLUAPP, tolua++, yes, no)
+       if test x$need_tolua = xyes; then
+               AC_DEFINE(LUA_EXTRAS, 1, [Define if you want Lua extras])
                if test "x$want_x11" != "xyes"; then
                        dnl silently disable if no x11
                        want_lua_cairo=no
@@ -448,30 +503,35 @@ if test x$want_lua = xyes; then
                        if test x$want_lua_cairo = xyes; then
                                PKG_CHECK_MODULES([cairo], cairo)
                                PKG_CHECK_MODULES([cairo_xlib], cairo-xlib)
-                               if test x"$HAVE_TOLUAPP" = x"no"; then
-                                       AC_MSG_ERROR([tolua++ is required for Lua Cairo support.])
-                               else
-                                       AC_CHECK_PROGS(toluapp, tolua++)
-                                       AC_DEFINE(HAVE_LUA_CAIRO, 1, [Define if you want Lua Cairo bindings for Conky])
-                               fi
+                               AC_DEFINE(HAVE_LUA_CAIRO, 1, [Define if you want Lua Cairo bindings for Conky])
                                libcairo_CFLAGS="$libcairo_CFLAGS $cairo_CFLAGS $cairo_xlib_CFLAGS"
                                libcairo_LIBS="$libcairo_LIBS $cairo_LIBS $cairo_xlib_LIBS"
                        fi
                        if test x$want_imlib2 = xyes; then
-                               if test x"$HAVE_TOLUAPP" = x"no"; then
-                                       AC_MSG_ERROR([tolua++ is required for Lua Imlib2 support.])
-                               else
-                                       want_lua_imlib2=yes
-                                       AC_CHECK_PROGS(toluapp, tolua++)
-                                       AC_DEFINE(HAVE_LUA_IMLIB2, 1, [Define if you want Lua Imlib2 bindings for Conky])
-                               fi
+                               AC_DEFINE(HAVE_LUA_IMLIB2, 1, [Define if you want Lua Imlib2 bindings for Conky])
                        fi
                fi
+               AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1 tolua++-5.1], no)
+               if test x$toluapp = xno; then
+                       AC_MSG_ERROR([tolua++, tolua++5.1, or tolua++-5.1 is required for Lua extras.])
+               else
+                       AC_SEARCH_LIBS(tolua_error,
+                                                  [tolua++-5.1 tolua++ tolua++5.1],
+                                                  [
+                                                       AC_SUBST(tolua_LIBS, "${LIBS}")
+                                                       AC_SUBST(tolua_CFLAGS, "${CFLAGS}")
+                                                       ],
+                                                  AC_MSG_ERROR([tolua_error not found]),
+                                                  [$LUA_LIBS $LUA51_LIBS])
+               fi
+               conky_LIBS="$conky_LIBS $tolua_LIBS"
+               tolua_CFLAGS="$tolua_CFLAGS $LUA_CFLAGS $LUA51_CFLAGS"
+               tolua_LIBS="$tolua_LIBS $LUA_LIBS $LUA51_LIBS"
        fi
-       AM_CONDITIONAL(BUILD_LUA_CAIRO, test x$want_lua_cairo = xyes)
-       AM_CONDITIONAL(BUILD_LUA_IMLIB2, test x$want_lua_imlib2 = xyes)
        AC_DEFINE(HAVE_LUA, 1, [Define if you want Lua scripting support])
 fi
+AM_CONDITIONAL(BUILD_LUA_CAIRO, test x$want_lua_cairo = xyes)
+AM_CONDITIONAL(BUILD_LUA_IMLIB2, test x$want_lua_imlib2 = xyes)
 
 dnl
 dnl Wireless extensions
@@ -484,8 +544,9 @@ AC_ARG_ENABLE([wlan],
 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]))
-  AC_CHECK_LIB([iw], [iw_sockets_open], [conky_LIBS="$conky_LIBS -liw"], AC_MSG_ERROR([iw_sockets_open not found]))
-       AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
+  AC_CHECK_LIB([iw], [iw_sockets_open], [conky_LIBS="-liw $conky_LIBS"],
+               AC_MSG_ERROR([iw_sockets_open not found]), [$conky_LIBS])
+  AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
 fi
 
 dnl
@@ -500,7 +561,7 @@ AC_ARG_ENABLE([portmon],
 if test x"$want_portmon" = xyes; then
   if test x"$uname" != xLinux; then
       AC_MSG_NOTICE([port monitors not supported on $uname... disabling])
-      want_portmon=no
+      want_portmon="not supported on $uname"
   else
         AC_CHECK_FUNCS([getnameinfo], [], AC_MSG_ERROR([getnameinfo function not found]))
         AC_CHECK_HEADERS([netdb.h netinet/in.h netinet/tcp.h sys/socket.h arpa/inet.h], [],
@@ -519,12 +580,14 @@ dnl
 dnl ICONV
 dnl
 
+m4_pattern_allow([AM_ICONV])
 AM_ICONV
 if test "$am_cv_func_iconv" != yes; then
   AC_MSG_WARN([Could not find libiconv])
 else
   conky_LIBS="$conky_LIBS $LIBICONV"
 fi
+AM_CONDITIONAL(BUILD_ICONV, test "$am_cv_func_iconv" = yes)
 
 dnl
 dnl Xext Double-buffering Extension
@@ -574,7 +637,7 @@ if test "x$want_xdamage" = "xyes"; then
         conky_LIBS="$conky_LIBS $XDamage_LIBS"
       else
         dnl non-modular X11 installation
-        AC_CHECK_LIB([Xdamage], [XDamageQueryExtension], [conky_LIBS="$conky_LIBS -lXdamage"],
+               AC_CHECK_LIB([Xdamage], [XDamageQueryExtension], [conky_LIBS="$conky_LIBS -lXdamage"],
                      AC_MSG_ERROR([Could not find XDamageQueryExtension in -lXdamage]))
       fi
       AC_DEFINE(HAVE_XDAMAGE, 1, [Define for X11 Xdamage extension])
@@ -636,6 +699,28 @@ if test x$WANT_GLIB = xyes; then
 fi
 
 dnl
+dnl libcurl
+dnl
+
+if test x$want_curl = xyes; then
+       PKG_CHECK_MODULES([libcurl], libcurl)
+       conky_CFLAGS="$conky_CFLAGS $libcurl_CFLAGS"
+       conky_LIBS="$conky_LIBS $libcurl_LIBS"
+       AC_DEFINE(HAVE_CURL, 1, [Define if you want Curl support])
+fi
+AM_CONDITIONAL(BUILD_CURL, test x$want_curl = xyes)
+
+dnl
+dnl libx
+dnl
+
+if test x$want_libxml2 = xyes; then
+       PKG_CHECK_MODULES([libxml2], libxml-2.0)
+       conky_CFLAGS="$conky_CFLAGS $libxml2_CFLAGS"
+       conky_LIBS="$conky_LIBS $libxml2_LIBS"
+fi
+
+dnl
 dnl KVM
 dnl
 
@@ -682,15 +767,12 @@ fi
 if test x$want_alsa = xyes; then
     AC_CHECK_LIB(asound, snd_pcm_open,conky_LIBS="$conky_LIBS -lasound", want_alsa=no)
 fi
-if test x$want_alsa = xyes; then
-AC_DEFINE(MIXER_IS_ALSA, 1, [Define if the mixers use ALSA])
-fi
 dnl
 dnl Some headers
 dnl
 
 AC_CHECK_HEADERS([signal.h unistd.h sys/utsname.h sys/stat.h linux/soundcard.h alsa/asoundlib.h dirent.h mcheck.h \
-      sys/statfs.h sys/param.h pthread.h assert.h errno.h time.h])
+      sys/statfs.h sys/param.h pthread.h semaphore.h assert.h errno.h time.h])
 AC_CHECK_HEADERS([sys/mount.h], [], [],
      [#ifdef HAVE_SYS_PARAM_H
       #include <sys/param.h>
@@ -708,13 +790,14 @@ 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])
+AC_DEFINE(MAX_NET_INTERFACES, 16, [Maximum number of network devices])
 
 dnl
 dnl Some functions
 dnl
 
 AC_CHECK_FUNCS([calloc malloc free popen sysinfo getloadavg memrchr strndup gethostbyname_r])
-AC_SEARCH_LIBS(clock_gettime, [rt],
+AC_SEARCH_LIBS(clock_gettime, [rt], conky_LIBS="$conky_LIBS $LIBS"
                [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define if you have clock_gettime()])],
                [AC_CHECK_FUNCS([gettimeofday], [], [AC_MSG_ERROR([gettimeofday() not available!])])], [])
 
@@ -739,26 +822,26 @@ AC_CHECK_HEADER(zlib.h,
 dnl
 dnl Check for OpenMP support
 dnl
+dnl removed for now due to problems with GCC's OpenMP implementation
 
-AC_ARG_ENABLE([openmp],
-             AC_HELP_STRING([--enable-openmp], [enable if you want OpenMP support @<:@default=no@:>@]),
-             [want_openmp="$enableval"], [want_openmp=no])
+dnl AC_ARG_ENABLE([openmp],
+dnl          AC_HELP_STRING([--enable-openmp], [enable if you want OpenMP support @<:@default=no@:>@]),
+dnl          [want_openmp="$enableval"], [want_openmp=no])
 
-if test x$want_openmp = xyes; then
-       AX_OPENMP([
-         gcc_version=`$CC -dumpversion`
-         gcc_major=`echo $gcc_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-         gcc_minor=`echo $gcc_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-         dnl check that the gcc version is >=4.3, if we're using gcc
-         if test ! "x$GCC" = "xyes" -o $gcc_major -ge 4 -a $gcc_minor -ge 3; then
-           AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])
-           conky_CFLAGS="$conky_CFLAGS $OPENMP_CFLAGS"
-         else
-           want_openmp=no
-         fi
-
-       ])
-fi
+dnl if test x$want_openmp = xyes; then
+dnl    AX_OPENMP([
+dnl      gcc_version=`$CC -dumpversion`
+dnl      gcc_major=`echo $gcc_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+dnl      gcc_minor=`echo $gcc_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+dnl      dnl check that the gcc version is >=4.3, if we're using gcc
+dnl      if test ! "x$GCC" = "xyes" -o $gcc_major -ge 4 -a $gcc_minor -ge 3; then
+dnl        AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])
+dnl        conky_CFLAGS="$conky_CFLAGS $OPENMP_CFLAGS"
+dnl      else
+dnl        want_openmp=no
+dnl      fi
+dnl    ])
+dnl fi
 
 dnl
 dnl Check doc stuff
@@ -834,7 +917,7 @@ AC_ARG_ENABLE([debug],
               [want_debug="$enableval"], [want_debug=no])
 
 if test "x$want_debug" = "xyes" -a $ac_cv_c_compiler_gnu != no; then
-  conky_CFLAGS="$conky_CFLAGS -g3"
+  conky_CFLAGS="$conky_CFLAGS -g3 -O0"
   AC_DEFINE([DEBUG], 1, [Define for debugging])
 fi
 
@@ -851,11 +934,28 @@ if test "x$want_testing" = "xyes" -a $ac_cv_c_compiler_gnu != no; then
     conky_CFLAGS="$conky_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
-    conky_CFLAGS="$conky_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"
+    conky_CFLAGS="$conky_CFLAGS -O0 -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
 
+dnl
+dnl profiling
+dnl
+
+AC_ARG_ENABLE([profiling],
+             AC_HELP_STRING([--enable-profiling], [specify compiler flags for use with gprof and gcov @<:@default=no@:>@]),
+             [want_profiling="$enableval"], [want_profiling=no])
+
+if test "x$want_profiling" = "xyes" -a $ac_cv_c_compiler_gnu != no; then
+  if test "x$want_debug" = "xyes"; then
+    conky_CFLAGS="$conky_CFLAGS -pg -fprofile-arcs -ftest-coverage"
+  else
+    conky_CFLAGS="$conky_CFLAGS -g3 -pg -fprofile-arcs -ftest-coverage"
+  fi
+  AC_DEFINE([PROFILING], [], [Define for profiling (gprof and gcov) support])
+fi
+
 AC_SUBST(conky_CFLAGS)
 AC_SUBST(conky_LIBS)
 AC_SUBST(X11_LIBS)
@@ -880,6 +980,7 @@ $PACKAGE $VERSION configured successfully:
   XDamage support:  $want_xdamage
   XDBE support:     $want_double_buffer
   Xft support:      $want_xft
+  ARGB support      $want_argb
 
  * Music detection:
   Audacious:        $want_audacious
@@ -889,12 +990,15 @@ $PACKAGE $VERSION configured successfully:
   XMMS2:            $want_xmms2
 
  * General:
-  OpenMP:           $want_openmp
+dnl  OpenMP:           $want_openmp
   math:             $want_math
   hddtemp:          $want_hddtemp
   portmon:          $want_portmon
   RSS:              $want_rss
-  Weather (METAR):  $want_weather
+  Curl:             $want_curl
+  Weather
+    METAR:          $want_metar
+    XOAP:           $want_xoap
   wireless:         $want_wlan
   IBM:              $want_ibm
   nvidia:           $want_nvidia
@@ -904,6 +1008,7 @@ $PACKAGE $VERSION configured successfully:
   ALSA mixer:       $want_alsa
   apcupsd:          $want_apcupsd
   I/O stats:        $want_iostats
+  ncurses:          $want_ncurses
 
  * Lua ($want_lua) bindings:
   Cairo:            $want_lua_cairo