#
dnl major, minor and micro version macros.
m4_define([conky_version_major], [1])
-m4_define([conky_version_minor], [7])
-m4_define([conky_version_micro], [3])
+m4_define([conky_version_minor], [8])
+m4_define([conky_version_micro], [0])
m4_define([conky_version_tag], [pre]) dnl [] for releases
m4_define([conky_version_revision],[_pre@REVISION@])
m4_define([conky_version],
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
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
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
if test x$want_iostats = xyes; then
if test x"$uname" != xLinux; then
AC_MSG_NOTICE([iostats not supported on $uname... disabling])
- want_iostats=no
+ want_iostats="not supported on $uname"
else
AC_DEFINE(IOSTATS, 1, [Define if you want support for per-task I/O statistics])
fi
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])
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], no)
+ AC_CHECK_PROGS(toluapp, [tolua++ tolua++5.1 tolua++-5.1], no)
if test x$toluapp = xno; then
- AC_MSG_ERROR([tolua++ or tolua++5.1 is required for Lua extras.])
+ AC_MSG_ERROR([tolua++, tolua++5.1, or tolua++-5.1 is required for Lua extras.])
else
AC_SEARCH_LIBS(tolua_error,
- [tolua++ tolua++5.1],
+ [tolua++-5.1 tolua++ tolua++5.1],
[
AC_SUBST(tolua_LIBS, "${LIBS}")
AC_SUBST(tolua_CFLAGS, "${CFLAGS}")
],
AC_MSG_ERROR([tolua_error not found]),
- $LUA51_LIBS)
+ [$LUA_LIBS $LUA51_LIBS])
fi
conky_LIBS="$conky_LIBS $tolua_LIBS"
tolua_CFLAGS="$tolua_CFLAGS $LUA_CFLAGS $LUA51_CFLAGS"
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], [],
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
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>
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], conky_LIBS="$conky_LIBS -lrt"
+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!])])], [])
[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
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)
XMMS2: $want_xmms2
* General:
- OpenMP: $want_openmp
+dnl OpenMP: $want_openmp
math: $want_math
hddtemp: $want_hddtemp
portmon: $want_portmon