mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-24 11:55:43 +00:00
Merge pull request #3 from jwm-art-net/1.9.1
1.9.1 autotools modernizations
This commit is contained in:
commit
5d2857e0bc
@ -13,9 +13,9 @@ m4_define([conky_version],
|
||||
[ifelse(conky_version_tag(), [], [], [conky_version_tag()])])])
|
||||
|
||||
AC_INIT([Conky], [conky_version()], [brenden1@users.sourceforge.net])
|
||||
AM_INIT_AUTOMAKE
|
||||
|
||||
AM_INIT_AUTOMAKE(conky, conky_version())
|
||||
AM_CONFIG_HEADER(src/config.h)
|
||||
AC_CONFIG_HEADERS(src/config.h)
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
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)
|
||||
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, lua5.1 >= 5.1)
|
||||
])
|
||||
|
@ -25,7 +25,7 @@
|
||||
# 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
|
||||
|
||||
|
@ -110,7 +110,8 @@ void to_real_path(char *dest, const char *source)
|
||||
snprintf(dest, DEFAULT_TEXT_BUFFER_SIZE, "%s/%s", homedir, tmp);
|
||||
} else {
|
||||
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
|
||||
strncpy(dest, source, DEFAULT_TEXT_BUFFER_SIZE);
|
||||
|
@ -879,7 +879,7 @@ void load_xoap_keys(void)
|
||||
FILE *fp;
|
||||
char *par = (char *) malloc(11 * 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);
|
||||
fp = fopen(xoap, "r");
|
||||
|
Loading…
Reference in New Issue
Block a user