From 9281f6b559bdb36de94f1b4b4d8e92f5c4ca5054 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Sat, 16 Jun 2012 06:10:15 +0000 Subject: [PATCH] and make it compile... :-/ now my bad, I'm rusty enough to get it wrong without testing. The problems were: * missing "_" between EFL_HAVE and ECORE_CON. * must declare the AM_CONDITIONAL, even if the flags were not checked. This case was triggered if --enable-cares or --disable-ipv6. Anyway, EFL_HAVE_ECORE_CON is never used... I have no idea why vtorri did the macro to define this conditional. SVN revision: 72213 --- legacy/ecore/configure.ac | 1 + legacy/ecore/m4/efl_compiler.m4 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index cb87607f94..efb2a2eea6 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -1532,6 +1532,7 @@ if test "x${have_ecore_con}" = "xyes" ; then fi +AM_CONDITIONAL([EFL_HAVE_ECORE_CON], [true]) if test "x${have_cares}" != "xyes" -a "x${have_ipv6}" = "xyes" ; then EFL_CHECK_COMPILER_FLAGS([ECORE_CON], [-Wno-override-init -Wno-initializer-overrides]) fi diff --git a/legacy/ecore/m4/efl_compiler.m4 b/legacy/ecore/m4/efl_compiler.m4 index ff514cad25..92c57fc8df 100644 --- a/legacy/ecore/m4/efl_compiler.m4 +++ b/legacy/ecore/m4/efl_compiler.m4 @@ -34,7 +34,7 @@ UPEFL[_CFLAGS]="${UPEFL[_CFLAGS]} [$2]" AC_ARG_VAR(UPEFL[_CFLAGS], [preprocessor flags for $2]) AC_SUBST(UPEFL[_CFLAGS]) -AM_CONDITIONAL([EFL_HAVE]UPEFL, [test "x${have_flag}" = "xyes"]) +AM_CONDITIONAL([EFL_HAVE_]UPEFL, [test "x${have_flag}" = "xyes"]) m4_popdef([UP]) m4_popdef([UPEFL])