Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 09:44:04 +00:00
Code Issues Releases Activity

Merge pull request #3 from jwm-art-net/1.9.1

Browse Source 
1.9.1 autotools modernizations
This commit is contained in:
labath 2013-01-15 12:57:39 -08:00
commit 5d2857e0bc
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac.in
View File

@ -13,9 +13,9 @@ m4_define([conky_version],
[ifelse(conky_version_tag(), [], [], [conky_version_tag()])])]) [ifelse(conky_version_tag(), [], [], [conky_version_tag()])])])
AC_INIT([Conky], [conky_version()], [brenden1@users.sourceforge.net]) AC_INIT([Conky], [conky_version()], [brenden1@users.sourceforge.net])
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE(conky, conky_version()) AC_CONFIG_HEADERS(src/config.h)
AM_CONFIG_HEADER(src/config.h)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
dnl prevent libtool setting LTCFLAGS to default of -g -O2 when CFLAGS unset. dnl prevent libtool setting LTCFLAGS to default of -g -O2 when CFLAGS unset.
@ -488,7 +488,7 @@ fi
AM_CONDITIONAL(BUILD_LUA, test x$want_lua = xyes) AM_CONDITIONAL(BUILD_LUA, test x$want_lua = xyes)
if test x$want_lua = xyes; then if test x$want_lua = xyes; then
PKG_CHECK_MODULES(LUA, lua >= 5.1, [ ],[ PKG_CHECK_MODULES(LUA, lua == 5.1, [ ],[
PKG_CHECK_MODULES(LUA51, lua-5.1 >= 5.1, [ ],[ PKG_CHECK_MODULES(LUA51, lua-5.1 >= 5.1, [ ],[
PKG_CHECK_MODULES(LUA51, lua5.1 >= 5.1) PKG_CHECK_MODULES(LUA51, lua5.1 >= 5.1)
]) ])

2
src/Makefile.am
View File

@ -25,7 +25,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
INCLUDES = -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky/conky.conf\" -DPACKAGE_LIBDIR=\"$(pkglibdir)\" AM_CPPFLAGS = -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky/conky.conf\" -DPACKAGE_LIBDIR=\"$(pkglibdir)\"
bin_PROGRAMS = conky bin_PROGRAMS = conky

3
src/common.c
View File

@ -110,7 +110,8 @@ void to_real_path(char *dest, const char *source)
snprintf(dest, DEFAULT_TEXT_BUFFER_SIZE, "%s/%s", homedir, tmp); snprintf(dest, DEFAULT_TEXT_BUFFER_SIZE, "%s/%s", homedir, tmp);
} else { } else {
NORM_ERR("$HOME environment variable doesn't exist"); NORM_ERR("$HOME environment variable doesn't exist");
strncpy(dest, source, DEFAULT_TEXT_BUFFER_SIZE); /*strncpy(dest, source, DEFAULT_TEXT_BUFFER_SIZE);*/
strncpy(dest, tmp, DEFAULT_TEXT_BUFFER_SIZE);
} }
} else if (dest != source) { //see changelog 2009-06-29 if you doubt that this check is necessary } else if (dest != source) { //see changelog 2009-06-29 if you doubt that this check is necessary
strncpy(dest, source, DEFAULT_TEXT_BUFFER_SIZE); strncpy(dest, source, DEFAULT_TEXT_BUFFER_SIZE);

2
src/weather.c
View File

@ -879,7 +879,7 @@ void load_xoap_keys(void)
FILE *fp; FILE *fp;
char *par = (char *) malloc(11 * sizeof(char)); char *par = (char *) malloc(11 * sizeof(char));
char *key = (char *) malloc(17 * sizeof(char)); char *key = (char *) malloc(17 * sizeof(char));
char *xoap = (char *) malloc(64 * sizeof(char)); char *xoap = (char *) malloc(DEFAULT_TEXT_BUFFER_SIZE * sizeof(char));
to_real_path(xoap, XOAP_FILE); to_real_path(xoap, XOAP_FILE);
fp = fopen(xoap, "r"); fp = fopen(xoap, "r");