From d9923abaa95fd0afce8c9a82d812a26f691ac4b4 Mon Sep 17 00:00:00 2001 From: Nikos Ntarmos Date: Sat, 28 Mar 2009 19:49:56 +0200 Subject: [PATCH] Fix FOPENCOOKIE detection glitch Using AM_CONDITIONAL's inside an if block is considered "confusing" by the automake manual[1] and in fact leads to configure code that won't work unless fopencookie actually exists in a system. [1] http://sources.redhat.com/automake/automake.html#Conditionals Signed-off-by: Nikos Ntarmos --- configure.ac.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index eec0df4..dcd4cb5 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -99,9 +99,10 @@ AC_ARG_ENABLE([config_output], [want_config_output="$enableval"], [want_config_output=yes]) AM_CONDITIONAL(BUILD_CONFIG_OUTPUT, test x$want_config_output = xyes) +AM_CONDITIONAL(BUILD_FOR_FOPENCOOKIE, 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, AM_CONDITIONAL(BUILD_FOR_FOPENCOOKIE, true)) + AC_CHECK_FUNCS(fopencookie) fi dnl -- 1.7.9.5