diff --git a/.gitignore b/.gitignore index 4d2fd237..888588cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,46 +1,6 @@ -*.orig *~ .*.swp Doxyfile -Makefile -Makefile.in -aclocal.m4 -autom4te.cache/ -compile -config.guess -config.log -config.status -config.sub -configure -configure.ac -depcomp -install-sh -libtool -ltmain.sh -lua/.deps/ -lua/.libs/ -lua/*.c -lua/*.la -lua/*.lo -lua/*.o -m4/libtool.m4 -m4/ltoptions.m4 -m4/ltsugar.m4 -m4/ltversion.m4 -m4/lt~obsolete.m4 -missing -src/config.h.in -src/conky -src/stamp-h1 -src/.deps/ -src/defconfig.h -src/*.o -src/*.gcda -src/*.gcno -src/*.gcov -conky-*.tar.* -doc/*.html -doc/*.mxml patches/ doc/conky.1 README diff --git a/CMakeLists.txt b/CMakeLists.txt index bd53f4a3..d8884723 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,9 +44,10 @@ configure_file(${CMAKE_MODULE_PATH}/config.h.in ${CMAKE_BINARY_DIR}/config.h) configure_file(${CMAKE_MODULE_PATH}/build.h.in ${CMAKE_BINARY_DIR}/build.h) # Finally, add some code -add_subdirectory(src) add_subdirectory(lua) +add_subdirectory(data) add_subdirectory(doc) +add_subdirectory(src) # Install README into share dir (is this even the right spot? need to revisit # this at some point) diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 01ddd7e3..00000000 --- a/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -# -*- mode: Makefile; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- -# -# Conky, a system monitor, based on torsmo -# -# Any original torsmo code is licensed under the BSD license -# -# All code written since the fork of torsmo is licensed under the GPL -# -# Please see COPYING for details -# -# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen -# Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) -# All rights reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -SUBDIRS = \ - src \ - doc \ - lua \ - data - -AUTOMAKE_OPTIONS = \ - 1.8 \ - dist-bzip2 - -EXTRA_DIST = \ - autogen.sh \ - configure.ac.in \ - config.rpath \ - extras/nano/README \ - extras/nano/conky.nanorc \ - extras/vim/README \ - extras/vim/ftdetect/conkyrc.vim \ - extras/vim/syntax/conkyrc.vim \ - text2c.sh - -ACLOCAL_AMFLAGS = -I m4 - -distclean-local: - /bin/rm -rf *.cache *~ - -Doxyfile: - doxygen -g - sed -e 's/^\(PROJECT_NAME *=\).*$$/\1 conky/' \ - -e 's/^\(PROJECT_NUMBER *=\).*$$/\1 1.6/' \ - -e 's/^\(OPTIMIZE_OUTPUT_FOR_C *=\).*$$/\1 YES/' \ - -e 's/^\(EXTRACT_ALL *=\).*$$/\1 YES/' \ - -e 's/^\(EXTRACT_PRIVATE *=\).*$$/\1 YES/' \ - -e 's/^\(EXTRACT_STATIC *=\).*$$/\1 YES/' \ - -e 's/^\(INPUT *=\).*$$/\1 "src"/' \ - -e 's/^\(SOURCE_BROWSER *=\).*$$/\1 YES/' \ - -e 's/^\(MACRO_EXPANSION *=\).*$$/\1 YES/' \ - -e 's/^\(HAVE_DOT *=\).*$$/\1 YES/' \ - -e 's/^\(CALL_GRAPH *=\).*$$/\1 YES/' \ - -e 's/^\(CALLER_GRAPH *=\).*$$/\1 YES/' -i Doxyfile - -doxy: Doxyfile - doxygen $< - -.PHONY: distclean-local doxy - -# vi:set ts=4 sw=4 noet ai nocindent syntax=automake: diff --git a/autogen.sh b/autogen.sh index 7efbe018..53d0642c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -30,28 +30,3 @@ echo echo "\033[41m\033[34m The Conky autotools build system is now deprecated in favour of CMake. Please see README.cmake for usage instructions." echo - -AUTOCONF=${AUTOCONF:-autoconf} -AUTOMAKE=${AUTOMAKE:-automake} -ACLOCAL=${ACLOCAL:-aclocal} -AUTOHEADER=${AUTOHEADER:-autoheader} -LIBTOOLIZE=${LIBTOOLIZE:-libtoolize} - -# identify a git revision similar to svn based on number of commits, if a git -# working copy. the last svn commit was rev 1274, so we'll pick up from there -if test "$1" != "" && test -d "$1/.git"; then - revision=`git log --since=2008-12-06 --pretty=oneline | wc -l | awk '{print $1 + 1274}'`; -elif test -d ".git"; then - revision=`git log --since=2008-12-06 --pretty=oneline | wc -l | awk '{print $1 + 1274}'`; -else - revision="NONE"; fi - -# generate configure.ac with substituted git revision -sed -e "s/@REVISION@/${revision}/g" < "configure.ac.in" > "configure.ac" - -touch README # in case it doesn't exist -echo Running $ACLOCAL -I m4 ... && $ACLOCAL -I m4 -echo Running $LIBTOOLIZE --force --copy ... && $LIBTOOLIZE --force --copy -echo Running $AUTOHEADER ... && $AUTOHEADER -echo Running $AUTOMAKE --add-missing --copy --gnu ... && $AUTOMAKE --add-missing --copy --gnu -echo Running $AUTOCONF ... && $AUTOCONF diff --git a/config.rpath b/config.rpath deleted file mode 100755 index c492a93b..00000000 --- a/config.rpath +++ /dev/null @@ -1,614 +0,0 @@ -#! /bin/sh -# Output a system dependent set of variables, describing how to set the -# run time search path of shared libraries in an executable. -# -# Copyright 1996-2006 Free Software Foundation, Inc. -# Taken from GNU libtool, 2001 -# Originally by Gordon Matzigkeit , 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# The first argument passed to this file is the canonical host specification, -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld -# should be set by the caller. -# -# The set of defined variables is at the end of this script. - -# Known limitations: -# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer -# than 256 bytes, otherwise the compiler driver will dump core. The only -# known workaround is to choose shorter directory names for the build -# directory and/or the installation directory. - -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -shrext=.so - -host="$1" -host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -# Code taken from libtool.m4's _LT_CC_BASENAME. - -for cc_temp in $CC""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` - -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. - -wl= -if test "$GCC" = yes; then - wl='-Wl,' -else - case "$host_os" in - aix*) - wl='-Wl,' - ;; - darwin*) - case $cc_basename in - xlc*) - wl='-Wl,' - ;; - esac - ;; - mingw* | pw32* | os2*) - ;; - hpux9* | hpux10* | hpux11*) - wl='-Wl,' - ;; - irix5* | irix6* | nonstopux*) - wl='-Wl,' - ;; - newsos6) - ;; - linux*) - case $cc_basename in - icc* | ecc*) - wl='-Wl,' - ;; - pgcc | pgf77 | pgf90) - wl='-Wl,' - ;; - ccc*) - wl='-Wl,' - ;; - como) - wl='-lopt=' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - wl='-Wl,' - ;; - esac - ;; - esac - ;; - osf3* | osf4* | osf5*) - wl='-Wl,' - ;; - sco3.2v5*) - ;; - solaris*) - wl='-Wl,' - ;; - sunos4*) - wl='-Qoption ld ' - ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - wl='-Wl,' - ;; - sysv4*MP*) - ;; - unicos*) - wl='-Wl,' - ;; - uts4*) - ;; - esac -fi - -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. - -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no - -case "$host_os" in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; -esac - -ld_shlibs=yes -if test "$with_gnu_ld" = yes; then - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - case "$host_os" in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we cannot use - # them. - ld_shlibs=no - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - cygwin* | mingw* | pw32*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - interix3*) - hardcode_direct=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - netbsd*) - ;; - solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' - else - ld_shlibs=no - fi - ;; - esac - ;; - sunos4*) - hardcode_direct=yes - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = no; then - hardcode_libdir_flag_spec= - fi -else - case "$host_os" in - aix3*) - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - else - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac - fi - hardcode_direct=yes - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - fi - # Begin _LT_AC_SYS_LIBPATH_AIX. - echo 'int main () { return 0; }' > conftest.c - ${CC} ${LDFLAGS} conftest.c -o conftest - aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` - if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` - fi - if test -z "$aix_libpath"; then - aix_libpath="/usr/lib:/lib" - fi - rm -f conftest.c conftest - # End _LT_AC_SYS_LIBPATH_AIX. - if test "$aix_use_runtimelinking" = yes; then - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - else - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - fi - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - bsdi[45]*) - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - libext=lib - ;; - darwin* | rhapsody*) - hardcode_direct=no - if test "$GCC" = yes ; then - : - else - case $cc_basename in - xlc*) - ;; - *) - ld_shlibs=no - ;; - esac - fi - ;; - dgux*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - freebsd1*) - ld_shlibs=no - ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) - hardcode_direct=yes - hardcode_minus_L=yes - ;; - freebsd* | kfreebsd*-gnu | dragonfly*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - hpux9*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - hpux10*) - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - fi - ;; - hpux11*) - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - ;; - *) - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - netbsd*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - newsos6) - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - openbsd*) - hardcode_direct=yes - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - else - case "$host_os" in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - osf3*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - osf4* | osf5*) - if test "$GCC" = yes; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - # Both cc and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - solaris*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - sunos4*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - ;; - sysv4) - case $host_vendor in - sni) - hardcode_direct=yes # is this really true??? - ;; - siemens) - hardcode_direct=no - ;; - motorola) - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - ;; - sysv4.3*) - ;; - sysv4*MP*) - if test -d /usr/nec; then - ld_shlibs=yes - fi - ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) - ;; - sysv5* | sco3.2v5* | sco5v6*) - hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - ;; - uts4*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - *) - ld_shlibs=no - ;; - esac -fi - -# Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. -libname_spec='lib$name' -case "$host_os" in - aix3*) - ;; - aix4* | aix5*) - ;; - amigaos*) - ;; - beos*) - ;; - bsdi[45]*) - ;; - cygwin* | mingw* | pw32*) - shrext=.dll - ;; - darwin* | rhapsody*) - shrext=.dylib - ;; - dgux*) - ;; - freebsd1*) - ;; - kfreebsd*-gnu) - ;; - freebsd* | dragonfly*) - ;; - gnu*) - ;; - hpux9* | hpux10* | hpux11*) - case $host_cpu in - ia64*) - shrext=.so - ;; - hppa*64*) - shrext=.sl - ;; - *) - shrext=.sl - ;; - esac - ;; - interix3*) - ;; - irix5* | irix6* | nonstopux*) - case "$host_os" in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; - *) libsuff= shlibsuff= ;; - esac - ;; - esac - ;; - linux*oldld* | linux*aout* | linux*coff*) - ;; - linux*) - ;; - knetbsd*-gnu) - ;; - netbsd*) - ;; - newsos6) - ;; - nto-qnx*) - ;; - openbsd*) - ;; - os2*) - libname_spec='$name' - shrext=.dll - ;; - osf3* | osf4* | osf5*) - ;; - solaris*) - ;; - sunos4*) - ;; - sysv4 | sysv4.3*) - ;; - sysv4*MP*) - ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - ;; - uts4*) - ;; -esac - -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` -shlibext=`echo "$shrext" | sed -e 's,^\.,,'` -escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` - -LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <@]), - [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) - AC_CHECK_FUNCS(funopen) -fi - -dnl -dnl OWN_WINDOW option -dnl - -AC_ARG_ENABLE([own_window], - AC_HELP_STRING([--disable-own-window], - [disable if you do not want support for creating own window @<:@default=yes@:>@]), - [dah="$enableval"], [dah=yes]) - -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 -dnl - -AC_ARG_ENABLE([audacious], - AC_HELP_STRING([--enable-audacious=[[yes|no|legacy]]], - [enable audacious player support @<:@default=no@:>@]), - [want_audacious="$enableval"], [want_audacious=no]) - -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]) - conky_CFLAGS="$conky_CFLAGS $Audacious_CFLAGS" - conky_LIBS="$conky_LIBS $Audacious_LIBS" - save_CPPFLAGS="$CPPFLAGS" - 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]) - conky_CFLAGS="$conky_CFLAGS $Audacious_CFLAGS" - conky_LIBS="$conky_LIBS $Audacious_LIBS" - save_CPPFLAGS="$CPPFLAGS" - 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]) - AC_DEFINE(AUDACIOUS_LEGACY, 1, [Define for Audacious Legacy support]) - fi -fi - - -dnl -dnl BMPx -dnl - -AC_ARG_ENABLE([bmpx], - AC_HELP_STRING([--enable-bmpx], [enable if you want BMPx support @<:@default=no@:>@]), - [want_bmpx="$enableval"], [want_bmpx=no]) - -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]) - conky_CFLAGS="$conky_CFLAGS $BMPx_CFLAGS" - conky_LIBS="$conky_LIBS $BMPx_LIBS" - AC_DEFINE(BMPX, 1, [Define if you want BMPx support]) -fi - - -dnl -dnl Support for IBM/Lenovo notebooks -dnl - -AC_ARG_ENABLE([ibm], - AC_HELP_STRING([--enable-ibm], [enable if you want support for IBM/Lenovo notebooks @<:default=no@:>@]), - [want_ibm="$enableval"], [want_ibm=no]) - -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="not supported on $uname" - else - AC_DEFINE(IBM, 1, [Define if you want support for IBM/Lenovo notebooks (SMAPI)]) - fi -fi - - -dnl -dnl Hddtemp -dnl - -AC_ARG_ENABLE([hddtemp], - AC_HELP_STRING([--disable-hddtemp], - [disable if you do not want hddtemp support @<:@default=yes@:>@]), - [want_hddtemp="$enableval"], [want_hddtemp=yes]) - -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="not supported on $uname" - else - AC_DEFINE(HDDTEMP, 1, [Define if you want hddtemp support]) - fi -fi - - -dnl -dnl Apcupsd -dnl - -AC_ARG_ENABLE([apcupsd], - AC_HELP_STRING([--disable-apcupsd], - [disable if you do not want apcupsd support @<:@default=yes@:>@]), - [want_apcupsd="$enableval"], [want_apcupsd=yes]) - -if test x$want_apcupsd = xyes; then - if test x"$uname" != xLinux; then - AC_MSG_NOTICE([apcupsd not supported on $uname... disabling]) - want_apcupsd="not supported on $uname" - else - AC_DEFINE(APCUPSD, 1, [Define if you want apcupsd support]) - fi -fi -AM_CONDITIONAL(BUILD_APCUPSD, test x$want_apcupsd = xyes) - - -dnl -dnl I/O stats -dnl - -AC_ARG_ENABLE([iostats], - AC_HELP_STRING([--enable-iostats], - [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_iostats="not supported on $uname" - else - AC_DEFINE(IOSTATS, 1, [Define if you want support for per-task I/O statistics]) - fi -fi - - -dnl -dnl Math -dnl - -AC_ARG_ENABLE([math], - AC_HELP_STRING([--disable-math], [disable if you do not want math support @<:@default=yes@:>@]), - [want_math="$enableval"], [want_math=yes]) - -AM_CONDITIONAL(BUILD_MATH, test x$want_math = xyes) -if test x$want_math = xyes; then - conky_LIBS="$conky_LIBS -lm" - AC_DEFINE(MATH, 1, [Define if you want math support]) -fi - -dnl -dnl MPD -dnl - -AC_ARG_ENABLE([mpd], - AC_HELP_STRING([--disable-mpd], [disable if you do not want MPD support @<:@default=yes@:>@]), - [want_mpd="$enableval"], [want_mpd=yes]) - -AM_CONDITIONAL(BUILD_MPD, test x$want_mpd = xyes) -if test x$want_mpd = xyes; then - AC_DEFINE(MPD, 1, [Define if you want MPD support]) -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 - -AC_ARG_ENABLE([xmms2], - AC_HELP_STRING([--enable-xmms2], [enable if you want XMMS2 support @<:@default=no@:>@]), - [want_xmms2="$enableval"], [want_xmms2=no]) - -AM_CONDITIONAL(BUILD_XMMS2, test x$want_xmms2 = xyes) -if test x$want_xmms2 = xyes; then - 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 - -AC_ARG_ENABLE([eve], - 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) -if test x$want_eve = xyes; then - 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]) - AC_DEFINE(MY_ENCODING, "ISO-8859-1", [Textencoding to use]) - AC_DEFINE(EVE_OUTPUT_FORMAT, "%s %d in %s", [Eve output format]) -fi - -dnl -dnl RSS -dnl - -AC_ARG_ENABLE([rss], - AC_HELP_STRING([--enable-rss], [enable if you want rss support @<:@default=no@:>@]), - [want_rss="$enableval"], [want_rss=no]) -# -AM_CONDITIONAL(BUILD_RSS, test x$want_rss = xyes) -if test x$want_rss = xyes; then - 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-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]) -# -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 -dnl X11 -dnl - -AC_ARG_ENABLE([x11], - AC_HELP_STRING([--disable-x11], [disable if you do not want X11 support @<:@default=yes@:>@]), - [want_x11="$enableval"], [want_x11=yes]) - -AM_CONDITIONAL(BUILD_X11, test x$want_x11 = xyes) -if test "x$want_x11" = "xyes"; then - if $PKG_CONFIG --exists x11; then - PKG_CHECK_MODULES([X11], [x11]) - conky_CFLAGS="$conky_CFLAGS $X11_CFLAGS" - conky_LIBS="$conky_LIBS $X11_LIBS" - else - dnl non-modular X11 installations - AC_PATH_X - AC_PATH_XTRA - conky_CFLAGS="$conky_CFLAGS $X_CFLAGS" - conky_LIBS="$conky_LIBS $X_LIBS" - conky_LDFLAGS="$conky_LDFLAGS $conky_LIBS $X_PRE_LIBS" - if test "x$no_x" = "xyes"; then - AC_MSG_ERROR([Can't locate your X11 installation]) - fi - AC_CHECK_LIB([X11], [XOpenDisplay], [], AC_MSG_ERROR([Could not find XOpenDisplay in -lX11])) - fi - AC_DEFINE(X11, 1, [Define if you want to use X11]) -fi - -dnl -dnl ARGB -dnl - -AC_ARG_ENABLE([argb], - AC_HELP_STRING([--enable-argb], [enable if you want a argb visual [[default=no]]]), - [want_argb="$enableval"], [want_argb=no]) -if test x$want_argb = xyes; then - AC_DEFINE(USE_ARGB, 1, [Define if you want argb visual support]) -fi - -dnl -dnl IMLIB2 -dnl - -AC_ARG_ENABLE([imlib2], - 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 - want_imlib2=no - else - PKG_CHECK_MODULES([Imlib2], [imlib2]) - conky_CFLAGS="$conky_CFLAGS $Imlib2_CFLAGS" - conky_LIBS="$conky_LIBS $Imlib2_LIBS" - AC_DEFINE(IMLIB2, 1, [Define if you want Imlib2 support]) - fi -fi -AM_CONDITIONAL(BUILD_IMLIB2, test x$want_imlib2 = xyes) - -dnl -dnl Lua -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-cairo], - 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 - PKG_CHECK_MODULES(LUA, lua >= 5.1, [ ],[ - PKG_CHECK_MODULES(LUA51, lua-5.1 >= 5.1, [ ],[ - PKG_CHECK_MODULES(LUA51, lua5.1 >= 5.1) - ]) - ]) - conky_CFLAGS="$conky_CFLAGS $LUA_CFLAGS $LUA51_CFLAGS" - conky_LIBS="$conky_LIBS $LUA_LIBS $LUA51_LIBS" - - 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 - else - if test x$want_lua_cairo = xyes; then - PKG_CHECK_MODULES([cairo], cairo) - PKG_CHECK_MODULES([cairo_xlib], cairo-xlib) - 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 - 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) - if test x$toluapp = xno; then - AC_MSG_ERROR([tolua++ or tolua++5.1 is required for Lua extras.]) - else - AC_SEARCH_LIBS(tolua_error, - [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 - 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 -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])) - 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]) -fi - -dnl -dnl PORT_MONITORS -dnl - -AC_ARG_ENABLE([portmon], - AC_HELP_STRING([--disable-portmon], - [disable if you do not want tcp (ip4) port monitoring @<:@default=yes@:>@]), - [want_portmon="$enableval"], [want_portmon=yes]) - -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="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], [], - [PORT_MONITORS_MISSING=yes]) - if test x"$PORT_MONITORS_MISSING" = xyes; then - AC_MSG_ERROR([missing a needed network header for port monitoring]) - fi - AC_DEFINE(TCP_PORT_MONITOR, 1, [Define if you want tcp port monitoring support]) - fi -fi -AM_CONDITIONAL(BUILD_PORT_MONITORS, test x"$want_portmon" = xyes) - - -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 -dnl - -AC_ARG_ENABLE([double_buffer], - AC_HELP_STRING([--disable-double-buffer], - [disable for no Xdbe double-buffering support @<:@default=yes@:>@]), - [want_double_buffer="$enableval"], [want_double_buffer=yes]) - -if test "x$want_double_buffer" = "xyes"; then - if test "x$want_x11" != "xyes"; then - dnl silently disable if no x11 - want_double_buffer=no - else - if $PKG_CONFIG --exists xext; then - PKG_CHECK_MODULES([Xext],[xext]) - conky_CFLAGS="$conky_CFLAGS $Xext_CFLAGS" - conky_LIBS="$conky_LIBS $Xext_LIBS" - else - dnl non-modular X11 installation - AC_CHECK_LIB([Xext], [XdbeQueryExtension], [conky_LIBS="$conky_LIBS -lXext"], - AC_MSG_ERROR([Could not find XdbeQueryExtension in -lXext])) - fi - AC_DEFINE(HAVE_XDBE, 1, [Define for X11 double-buffering]) - fi -fi - - -dnl -dnl Xdamage Extension -dnl - -AC_ARG_ENABLE([xdamage], - AC_HELP_STRING([--disable-xdamage], - [disable if you do not want Xdamage support @<:@default=yes@:>@]), - [want_xdamage="$enableval"], [want_xdamage=yes]) - -if test "x$want_xdamage" = "xyes"; then - if test "x$want_x11" != "xyes"; then - dnl silently disable if no x11 - want_xdamage=no - else - if $PKG_CONFIG --exists xdamage; then - PKG_CHECK_MODULES([XDamage],[xdamage]) - conky_CFLAGS="$conky_CFLAGS $XDamage_CFLAGS" - conky_LIBS="$conky_LIBS $XDamage_LIBS" - else - dnl non-modular X11 installation - 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]) - fi -fi - - -dnl -dnl Xft -dnl - -AC_ARG_ENABLE([xft], - AC_HELP_STRING([--disable-xft], [disable if you do not want to use Xft @<:@default=yes@:>@]), - [want_xft="$enableval"], [want_xft=yes]) - -if test x$want_xft = "xyes"; then - if test "x$want_x11" != "xyes"; then - dnl silently disable if no x11 - want_xft=no - else - PKG_CHECK_MODULES([Xft], [xft]) - conky_CFLAGS="$conky_CFLAGS $Xft_CFLAGS" - conky_LIBS="$conky_LIBS $Xft_LIBS" - AC_DEFINE(XFT, 1, [Define for Xft support]) - fi -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]) -if test x$want_nvidia = xyes; then - if test "x$want_x11" != "xyes"; then - # do nada - want_nvidia=no - else - 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!? - conky_LIBS="$conky_LIBS -lXNVCtrl" - AC_DEFINE(NVIDIA, 1, [Define if you want nvidia support]) - fi -fi -AM_CONDITIONAL(BUILD_NVIDIA, test x$want_nvidia = xyes) - -dnl -dnl GLIB -dnl - -if test x$WANT_GLIB = xyes; then - PKG_CHECK_MODULES([GLib2], [glib-2.0]) - conky_CFLAGS="$conky_CFLAGS $GLib2_CFLAGS" - conky_LIBS="$conky_LIBS $GLib2_LIBS" -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 - -if test x$WANT_KVM = xyes; then - AC_CHECK_LIB(kvm, kvm_open, - conky_LIBS="$conky_LIBS -lkvm", - AC_MSG_ERROR([Could not find kvm_open in -lkvm.]) - ) -fi - -dnl -dnl devstat -dnl - -if test x$WANT_DEVSTAT = xyes; then - AC_CHECK_LIB(devstat, devstat_getversion, - conky_LIBS="$conky_LIBS -ldevstat", - AC_MSG_ERROR([Cound not find devstat_getversion in -ldevstat.]) - ) -fi - -dnl -dnl OSSLIB for NetBSD/OpenBSD -dnl - -if test x$WANT_OSSLIB = xyes; then - AC_CHECK_LIB(ossaudio, _oss_ioctl, - conky_LIBS="$conky_LIBS -lossaudio", - AC_MSG_ERROR([Could not find oss_ioctl in -lossaudio.]) - ) -fi - -dnl -dnl ALSA for Linux -dnl -AC_ARG_ENABLE([alsa], - AC_HELP_STRING([--disable-alsa], [disable if you do not - want ALSA support @<:@default=yes@:>@]), - [want_alsa="$enableval"], [want_alsa=yes]) - -if test x$want_alsa = xyes; then - AC_CHECK_HEADER(alsa/asoundlib.h,, want_alsa=no) -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 semaphore.h assert.h errno.h time.h]) -AC_CHECK_HEADERS([sys/mount.h], [], [], - [#ifdef HAVE_SYS_PARAM_H - #include - #endif - ]) -# check if we have inotify support -AC_CHECK_HEADERS([sys/inotify.h]) - -dnl -dnl Some defines -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]) -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 $LIBS" - [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define if you have clock_gettime()])], - [AC_CHECK_FUNCS([gettimeofday], [], [AC_MSG_ERROR([gettimeofday() not available!])])], []) - -dnl -dnl Structure checks -dnl - -AC_CHECK_MEMBER([struct statfs.f_fstypename], - [AC_DEFINE(HAVE_STRUCT_STATFS_F_FSTYPENAME, 1, [Define if struct statfs has the f_fstypename member])], - [], - [#include ]) - -dnl -dnl Check for zlib -dnl - -AC_CHECK_HEADER(zlib.h, - [], - [AC_MSG_ERROR([zlib is missing; please install the headers first])]) - - -dnl -dnl Check for OpenMP support -dnl -dnl removed for now due to problems with GCC's OpenMP implementation - -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]) - -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 -dnl - -AC_CHECK_PROGS(db2x_xsltproc_cmd, db2x_xsltproc) -AC_CHECK_PROGS(db2x_manxml_cmd, db2x_manxml) -AC_CHECK_PROGS(xsltproc_cmd, xsltproc) -if test x$db2x_xsltproc_cmd = "x" -o x$xsltproc_cmd = "x"; then - AM_CONDITIONAL(HAVE_DOCSTUFF, false) -else - AM_CONDITIONAL(HAVE_DOCSTUFF, true) -fi - -dnl -dnl kstat in Solaris -dnl - -if test x$WANT_KSTAT = xyes; then - dah=no - AC_CHECK_LIB([kstat], [kstat_open], [dah=yes], []) - - if test x$dah = xyes; then - AC_DEFINE(HAVE_KSTAT, 1, [Define if you have kstat (Solaris)]) - conky_LDFLAGS="$conky_LDFLAGS -lkstat" - fi -fi - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET);], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have and nl_langinfo(CODESET).]) - fi -]) - - -dnl ************************ -dnl * Linker optimizations * -dnl ************************ -AC_MSG_CHECKING([if $LD accepts -O1]) -case `$LD -O1 -v 2>&1 @]), - [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 -O0" - AC_DEFINE([DEBUG], 1, [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 - 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 -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 -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 -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 - -#remove C-only options -conky_CXXFLAGS=`echo $conky_CFLAGS | sed \ - -e 's/-Wdeclaration-after-statement//g' \ - -e 's/-Wbad-function-cast//g' \ - -e 's/-Wstrict-prototypes//g' \ - -e 's/-Wold-style-definition//g' \ - -e 's/-std=c99/-std=c++0x/g'` - -AC_SUBST(conky_CFLAGS) -AC_SUBST(conky_CXXFLAGS) -AC_SUBST(conky_LIBS) -AC_SUBST(X11_LIBS) - -AC_OUTPUT - -dnl -dnl Print summary -dnl -cat << EOF - -$PACKAGE $VERSION configured successfully: - - Installing into: $prefix - System config dir: $sysconfdir - C compiler flags: $conky_CFLAGS - C++ compiler flags:$conky_CXXFLAGS - Libraries: $conky_LIBS - Linker flags: $conky_LDFLAGS - - * X11: - X11 support: $want_x11 - XDamage support: $want_xdamage - XDBE support: $want_double_buffer - Xft support: $want_xft - ARGB support $want_argb - - * Music detection: - Audacious: $want_audacious - BMPx: $want_bmpx - MPD: $want_mpd - MOC: $want_moc - XMMS2: $want_xmms2 - - * General: -dnl OpenMP: $want_openmp - math: $want_math - hddtemp: $want_hddtemp - portmon: $want_portmon - RSS: $want_rss - Curl: $want_curl - Weather - METAR: $want_metar - XOAP: $want_xoap - wireless: $want_wlan - IBM: $want_ibm - nvidia: $want_nvidia - eve-online: $want_eve - config-output: $want_config_output - Imlib2: $want_imlib2 - ALSA mixer: $want_alsa - apcupsd: $want_apcupsd - I/O stats: $want_iostats - - * Lua ($want_lua) bindings: - Cairo: $want_lua_cairo - Imlib2: $want_lua_imlib2 - -EOF diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 00000000..4f41ef1c --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,32 @@ +# vim: ts=4 sw=4 noet ai cindent syntax=cmake +# +# Conky, a system monitor, based on torsmo +# +# Please see COPYING for details +# +# Copyright (c) 2005-2010 Brenden Matthews, et. al. (see AUTHORS) +# All rights reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +if(BUILD_CONFIG_OUTPUT) + # generate defconfig + add_custom_command(OUTPUT defconfig.h COMMAND + ${CMAKE_SOURCE_DIR}/text2c.sh ${CMAKE_CURRENT_SOURCE_DIR}/conky.conf + defconfig.h defconfig DEPENDS conky.conf + ) + add_custom_target(defconfig ALL DEPENDS defconfig.h) + set_source_files_properties(defconfig.h PROPERTIES GENERATED TRUE) +endif(BUILD_CONFIG_OUTPUT) + diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 7eaa935a..00000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# -*- mode: Makefile; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- -# -if HAVE_DOCSTUFF - -DOCS = conky.1 docs.html variables.html config_settings.html lua.html - -CLEANFILES = docs.mxml conky.1 variable.html config_settings.html lua.html - -conky.1: command_options.xml config_settings.xml docs.xml variables.xml lua.xml - ${db2x_xsltproc_cmd} -s man ${srcdir}/docs.xml -o docs.mxml - ${db2x_manxml_cmd} docs.mxml - ${xsltproc_cmd} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${srcdir}/docs.xml > docs.html - man -P 'less -is' ./conky.1 > README - sed -i "s/[[:cntrl:]]\[[0-9]*m//g" README - sed -i "s/\xE2//g" README - sed -i "s/\x80//g" README - sed -i "s/\x90/-/g" README - mv README ${top_srcdir} - ${xsltproc_cmd} ${srcdir}/variables.xsl ${srcdir}/variables.xml > variables.html - ${xsltproc_cmd} ${srcdir}/config_settings.xsl ${srcdir}/config_settings.xml > config_settings.html - ${xsltproc_cmd} ${srcdir}/lua.xsl ${srcdir}/lua.xml > lua.html - -else -conky.1: - -endif - -man_MANS = conky.1 - -EXTRA_DIST = $(DOCS) command_options.xml config_settings.xml docgen.sh docs.xml variables.xml variables.xsl config_settings.xsl lua.xml lua.xsl - -# vi:set ts=4 sw=4 noet ai nocindent syntax=automake: diff --git a/lua/Makefile.am b/lua/Makefile.am deleted file mode 100644 index 45aeac52..00000000 --- a/lua/Makefile.am +++ /dev/null @@ -1,63 +0,0 @@ -# -*- mode: Makefile; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- -# -# Conky, a system monitor, based on torsmo -# -# Please see COPYING for details -# -# Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) -# All rights reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - - -if BUILD_LUA - -if BUILD_LUA_CAIRO - -libcairo_built_sources = libcairo.c - -libcairo = libcairo.la - -libcairo.c: cairo.pkg - ${toluapp} -n cairo -o $@ $(srcdir)/cairo.pkg - -libcairo_la_CFLAGS = $(cairo_CFLAGS) $(cairo_xlib_CFLAGS) $(tolua_CFLAGS) -libcairo_la_LIBADD = $(cairo_LIBS) $(cairo_xlib_LIBS) $(tolua_LIBS) -libcairo_la_SOURCES = cairo.pkg libcairo-helper.h libcairo.c - -endif # BUILD_LUA_CAIRO - -if BUILD_LUA_IMLIB2 - -libimlib2_built_sources = libimlib2.c - -libimlib2 = libimlib2.la - -libimlib2.c: imlib2.pkg - ${toluapp} -n imlib2 -o $@ $(srcdir)/imlib2.pkg - -libimlib2_la_CFLAGS = $(Imlib2_CFLAGS) $(tolua_CFLAGS) -libimlib2_la_LIBADD = $(Imlib2_LIBS) $(tolua_LIBS) -libimlib2_la_SOURCES = imlib2.pkg libimlib2.c - -endif # BUILD_LUA_IMLIB2 - -pkglib_LTLIBRARIES = $(libcairo) $(libimlib2) - -endif # BUILD_LUA - -EXTRA_DIST = libcairo-helper.h -BUILT_SOURCES = $(cairo_built_sources) $(imlib2_built_sources) - -# vi:set ts=4 sw=4 noet ai nocindent syntax=automake: diff --git a/m4/ax_openmp.m4 b/m4/ax_openmp.m4 deleted file mode 100644 index 492675dd..00000000 --- a/m4/ax_openmp.m4 +++ /dev/null @@ -1,98 +0,0 @@ -# =========================================================================== -# http://www.nongnu.org/autoconf-archive/ax_openmp.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_OPENMP([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# This macro tries to find out how to compile programs that use OpenMP a -# standard API and set of compiler directives for parallel programming -# (see http://www-unix.mcs/) -# -# On success, it sets the OPENMP_CFLAGS/OPENMP_CXXFLAGS/OPENMP_F77FLAGS -# output variable to the flag (e.g. -omp) used both to compile *and* link -# OpenMP programs in the current language. -# -# NOTE: You are assumed to not only compile your program with these flags, -# but also link it with them as well. -# -# If you want to compile everything with OpenMP, you should set: -# -# CFLAGS="$CFLAGS $OPENMP_CFLAGS" -# #OR# CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" -# #OR# FFLAGS="$FFLAGS $OPENMP_FFLAGS" -# -# (depending on the selected language). -# -# The user can override the default choice by setting the corresponding -# environment variable (e.g. OPENMP_CFLAGS). -# -# ACTION-IF-FOUND is a list of shell commands to run if an OpenMP flag is -# found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is -# not found. If ACTION-IF-FOUND is not specified, the default action will -# define HAVE_OPENMP. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -AC_DEFUN([AX_OPENMP], [ -AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX - -AC_CACHE_CHECK([for OpenMP flag of _AC_LANG compiler], ax_cv_[]_AC_LANG_ABBREV[]_openmp, [save[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS -ax_cv_[]_AC_LANG_ABBREV[]_openmp=unknown -# Flags to try: -fopenmp (gcc), -openmp (icc), -mp (SGI & PGI), -# -xopenmp (Sun), -omp (Tru64), -qsmp=omp (AIX), none -ax_openmp_flags="-fopenmp -openmp -mp -xopenmp -omp -qsmp=omp none" -if test "x$OPENMP_[]_AC_LANG_PREFIX[]FLAGS" != x; then - ax_openmp_flags="$OPENMP_[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flags" -fi -for ax_openmp_flag in $ax_openmp_flags; do - case $ax_openmp_flag in - none) []_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[] ;; - *) []_AC_LANG_PREFIX[]FLAGS="$save[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flag" ;; - esac - AC_TRY_LINK_FUNC(omp_set_num_threads, - [ax_cv_[]_AC_LANG_ABBREV[]_openmp=$ax_openmp_flag; break]) -done -[]_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS -]) -if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "xunknown"; then - m4_default([$2],:) -else - if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then - OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp - fi - m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])]) -fi -])dnl AX_OPENMP - diff --git a/m4/pkg.m4 b/m4/pkg.m4 deleted file mode 100644 index 1444797c..00000000 --- a/m4/pkg.m4 +++ /dev/null @@ -1,157 +0,0 @@ -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi - -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) -elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])], - [$4]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 02b47848..ab316a38 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,6 +21,10 @@ # include_directories(${conky_includes}) +if(BUILD_CONFIG_OUTPUT) + # include config output dir + include_directories(${CMAKE_BINARY_DIR}/data) +endif(BUILD_CONFIG_OUTPUT) # ensure build.h and config.h aren't in the way if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/config.h) @@ -157,7 +161,7 @@ if(BUILD_ICONV) endif(BUILD_ICONV) if(BUILD_CONFIG_OUTPUT) - set(optional_sources ${optional_sources} defconfig.h conf_cookie.c conf_cookie.h) + set(optional_sources ${optional_sources} conf_cookie.c) endif(BUILD_CONFIG_OUTPUT) add_executable(conky ${conky_sources} ${optional_sources}) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 496357ca..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,177 +0,0 @@ -# -*- mode: Makefile; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- -# -# Conky, a system monitor, based on torsmo -# -# Any original torsmo code is licensed under the BSD license -# -# All code written since the fork of torsmo is licensed under the GPL -# -# Please see COPYING for details -# -# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen -# Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) -# All rights reserved. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -INCLUDES = -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky/conky.conf\" -DPACKAGE_LIBDIR=\"$(pkglibdir)\" - -bin_PROGRAMS = conky - -LIBS = ${conky_LIBS} - -if BUILD_CONFIG_OUTPUT -config_output = defconfig.h -config_cookie = conf_cookie.c conf_cookie.h -if BUILD_X11 -config_input = $(srcdir)/../data/conky.conf -else -config_input = $(srcdir)/../data/conky_no_x11.conf -endif - -conky_DEPENDENCIES = $(config_output) -BUILT_SOURCES = $(config_output) -CLEANFILES = $(config_output) *.gcda *.gcno - -$(config_output): ${config_input} - sh $(srcdir)/../text2c.sh ${config_input} $@ defconfig -endif # BUILD_CONFIG_OUTPUT - -# source files always needed for compiling -mandatory_sources = colours.c colours.h combine.c combine.h common.c common.h \ - conky.cc conky.h core.cc core.h diskio.c diskio.h entropy.c entropy.h \ - exec.c exec.h fs.c fs.h logging.h mail.c mail.h mixer.c mixer.h net_stat.c \ - net_stat.h template.c template.h timed_thread.c timed_thread.h mboxscan.c \ - mboxscan.h prioqueue.c prioqueue.h read_tcp.c read_tcp.h scroll.c scroll.h \ - specials.c specials.h tailhead.c tailhead.h temphelper.c temphelper.h \ - text_object.c text_object.h timeinfo.c timeinfo.h top.c top.h algebra.c \ - algebra.h proc.c proc.h user.c user.h - -# source files only needed when the apropriate option is enabled -audacious = audacious.c audacious.h -bmpx = bmpx.c bmpx.h -ibm = ibm.c ibm.h smapi.c smapi.h -mpd = mpd.c mpd.h libmpdclient.c libmpdclient.h -moc = moc.c moc.h -xmms2 = xmms2.c xmms2.h -linux = linux.c linux.h users.c users.h sony.c sony.h i8k.c i8k.h -solaris = solaris.c -freebsd = freebsd.c freebsd.h bsdapm.c bsdapm.h -netbsd = netbsd.c netbsd.h -openbsd = openbsd.c openbsd.h bsdapm.c bsdapm.h -port_monitors = libtcp-portmon.cc libtcp-portmon.h \ - tcp-portmon.cc tcp-portmon.h -x11 = x11.c x11.h fonts.c fonts.h -hddtemp = hddtemp.c hddtemp.h -eve = eve.c eve.h -ccurl_thread = ccurl_thread.c ccurl_thread.h -rss = rss.c rss.h prss.c prss.h -weather = weather.c weather.h -lua = llua.c llua.h -nvidia = nvidia.c nvidia.h -imlib2 = imlib2.c imlib2.h -apcupsd = apcupsd.c apcupsd.h -iconv = iconv_tools.c iconv_tools.h - -# make sure the files from above are always included in the distfile -EXTRA_DIST = $(audacious) $(bmpx) $(ibm) $(mpd) $(moc) $(xmms2) $(linux) \ - $(solaris) $(freebsd) $(netbsd) $(openbsd) $(port_monitors) \ - $(x11) $(hddtemp) $(eve) $(ccurl_thread) $(rss) $(weather) \ - $(lua) $(nvidia) $(imlib2) $(apcupsd) - -# collect all selected optional sources -optional_sources = -if BUILD_AUDACIOUS -optional_sources += $(audacious) -endif -if BUILD_BMPX -optional_sources += $(bmpx) -endif -if BUILD_IBM -optional_sources += $(ibm) -endif -if BUILD_MPD -optional_sources += $(mpd) -endif -if BUILD_MOC -optional_sources += $(moc) -endif -if BUILD_XMMS2 -optional_sources += $(xmms2) -endif -if BUILD_LINUX -optional_sources += $(linux) -endif -#if BUILD_SOLARIS -#optional_sources += $(solaris) -#endif -if BUILD_FREEBSD -optional_sources += $(freebsd) -endif -#if BUILD_NETBSD -#optional_sources += $(netbsd) -#endif -if BUILD_OPENBSD -optional_sources += $(openbsd) -endif -if BUILD_PORT_MONITORS -optional_sources += $(port_monitors) -endif -if BUILD_X11 -optional_sources += $(x11) -endif -if BUILD_HDDTEMP -optional_sources += $(hddtemp) -endif -if BUILD_EVE -optional_sources += $(eve) -endif -if BUILD_CURL -optional_sources += $(ccurl_thread) -endif -if BUILD_RSS -optional_sources += $(rss) -endif -if BUILD_WEATHER -optional_sources += $(weather) -endif -if BUILD_LUA -optional_sources += $(lua) -endif -if BUILD_NVIDIA -optional_sources += $(nvidia) -endif -if BUILD_IMLIB2 -optional_sources += $(imlib2) -endif -if BUILD_APCUPSD -optional_sources += $(apcupsd) -endif -if BUILD_ICONV -optional_sources += $(iconv) -endif - -# linux takes the standard to the max -if BUILD_LINUX -PTHREAD_LIBS = -lpthread -else -PTHREAD_LIBS = -pthread -endif - -conky_LDFLAGS = $(PTHREAD_LIBS) -lm - -conky_SOURCES = $(config_output) $(config_cookie) \ - $(optional_sources) $(mandatory_sources) - -# vi:set ts=4 sw=4 noet ai nocindent syntax=automake: diff --git a/text2c.sh b/text2c.sh old mode 100644 new mode 100755