From 66f545f8465af469e35fd9ace6e3f7d5d4398e98 Mon Sep 17 00:00:00 2001 From: rofl0r Date: Thu, 22 Dec 2016 19:37:10 +0000 Subject: [PATCH] core: fix misnamed configure cache variables these 3 configure tests were bogus in that they didnt return a result: ``` checking for flock() support... checking for execinfo.h and backtrace... checking for eat_newline_glitch support... ``` looking at config.log reveals: ``` configure:24327: checking for eat_newline_glitch support configure:24344: gcc -c -g -O2 -DHAVE_GNUTLS -D_FILE_OFFSET_BITS=64 ... conftest.c: In function 'main': conftest.c:134:2: error: assignment of read-only location '*(cur_term->flags ... configure:24344: $? = 1 configure: failed program was: ... configure:24351: result: ``` but due to the misnamed variables configure ended up enabling eat_newline_glitch. fixes #814 --- configure.ac | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 719be40fe..c1e68ab01 100644 --- a/configure.ac +++ b/configure.ac @@ -991,10 +991,10 @@ AC_CACHE_CHECK([for flock() support], ac_cv_have_flock, [ AC_LINK_IFELSE([AC_LANG_PROGRAM( [[ #include ]], [[ flock(0, LOCK_SH); ]])], -[ ac_have_flock="yes" ], -[ ac_have_flock="no" ])]) +[ ac_cv_have_flock="yes" ], +[ ac_cv_have_flock="no" ])]) -if test "x$ac_have_flock" = "xyes"; then +if test "x$ac_cv_have_flock" = "xyes"; then enable_flock="yes" AC_DEFINE(HAVE_FLOCK) else @@ -1021,9 +1021,9 @@ if test "x$debug" != "x0" ; then AC_LINK_IFELSE([AC_LANG_PROGRAM( [[ #include ]], [[ void *trace[128]; int n = backtrace(trace, 128); ]])], - [ ac_have_backtrace="yes" ], - [ ac_have_backtrace="no" ])]) - if test "x$ac_have_backtrace" = "xyes"; then + [ ac_cv_have_backtrace="yes" ], + [ ac_cv_have_backtrace="no" ])]) + if test "x$ac_cv_have_backtrace" = "xyes"; then enable_backtrace="yes" AC_DEFINE(HAVE_BACKTRACE,1,[glibc backtrace function]) else @@ -1040,10 +1040,10 @@ AC_CACHE_CHECK([for eat_newline_glitch support], ac_cv_have_eatnewlineglitch, [ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [[ #include ]], [[ eat_newline_glitch = 0; ]])], -[ ac_have_eatnewlineglitch="yes" ], -[ ac_have_eatnewlineglitch="no" ])]) +[ ac_cv_have_eatnewlineglitch="yes" ], +[ ac_cv_have_eatnewlineglitch="no" ])]) -if test "x$ac_have_eatnewlineglitch" = "xyes"; then +if test "x$ac_cv_have_eatnewlineglitch" = "xyes"; then enable_eatnewlineglitch="yes" AC_DEFINE(HAVE_EAT_NEWLINE_GLITCH) else