merge : remove useless CONDITIONALs and make eet build optional; eina is always built

SVN revision: 77026

2 files changed, 2 insertions, 10 deletions

diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4
index fc2f200509..b4fb0ec126 100644
--- a/m4/efl_binary.m4
+++ b/m4/efl_binary.m4
@@ -18,8 +18,8 @@ have_[]m4_defn([DOWN])="yes"
 
 dnl configure option
 
-AC_ARG_ENABLE([$1],
-   [AC_HELP_STRING([--disable-$1], [disable building of ]DOWN)],
+AC_ARG_ENABLE([binary-$1],
+   [AC_HELP_STRING([--disable-binary-$1], [disable building of ]DOWN[ binary])],
    [
     if test "x${enableval}" = "xyes" ; then
        have_[]m4_defn([DOWN])="yes"
@@ -37,8 +37,6 @@ fi
 
 AC_SUBST(UP[]_PRG)
 
-AM_CONDITIONAL(BUILD_[]UP, test "x$have_[]m4_defn([DOWN])" = "xyes")
-
 AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3])
 
 ])
diff --git a/m4/efl_compiler.m4 b/m4/efl_compiler.m4
index ca30759d82..98dc0a1ba5 100644
--- a/m4/efl_compiler.m4
+++ b/m4/efl_compiler.m4
@@ -8,7 +8,6 @@ dnl Macro that checks for a compiler flag availability
 dnl
 dnl EFL_CHECK_COMPILER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
 dnl AC_SUBST : EFL_CFLAGS (EFL being replaced by its value)
-dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
 
 AC_DEFUN([EFL_CHECK_COMPILER_FLAG],
 [
@@ -39,8 +38,6 @@ fi
 AC_ARG_VAR(UPEFL[_CFLAGS], [preprocessor flags for $2])
 AC_SUBST(UPEFL[_CFLAGS])
 
-AM_CONDITIONAL([EFL_HAVE]UP, [test "x${have_flag}" = "xyes"])
-
 m4_popdef([UP])
 m4_popdef([UPEFL])
 ])
@@ -60,7 +57,6 @@ dnl Macro that checks for a linker flag availability
 dnl
 dnl EFL_CHECK_LINKER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
 dnl AC_SUBST : EFL_LIBS (EFL being replaced by its value)
-dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
 
 AC_DEFUN([EFL_CHECK_LINKER_FLAG],
 [
@@ -88,8 +84,6 @@ fi
 AC_ARG_VAR(UPEFL[_LIBS], [preprocessor flags for $2])
 AC_SUBST(UPEFL[_LIBS])
 
-AM_CONDITIONAL([EFL_HAVE]UP, [test "x${have_flag}" = "xyes"])
-
 m4_popdef([UP])
 m4_popdef([UPEFL])
 ])