summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-23 19:56:44 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-23 19:56:44 +0000
commit851975dbcccdf4c70689a9d8c2fa7359fb6cc89e (patch)
treeca1fad45795a8d325c706681334c9df3d301d50c /m4
parent58f5ec5047fcc32540176c3d4f0f4e3b959fddea (diff)
merge : remove useless CONDITIONALs and make eet build optional; eina is always built
SVN revision: 77026
Diffstat (limited to 'm4')
-rw-r--r--m4/efl_binary.m46
-rw-r--r--m4/efl_compiler.m46
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"
18 18
19dnl configure option 19dnl configure option
20 20
21AC_ARG_ENABLE([$1], 21AC_ARG_ENABLE([binary-$1],
22 [AC_HELP_STRING([--disable-$1], [disable building of ]DOWN)], 22 [AC_HELP_STRING([--disable-binary-$1], [disable building of ]DOWN[ binary])],
23 [ 23 [
24 if test "x${enableval}" = "xyes" ; then 24 if test "x${enableval}" = "xyes" ; then
25 have_[]m4_defn([DOWN])="yes" 25 have_[]m4_defn([DOWN])="yes"
@@ -37,8 +37,6 @@ fi
37 37
38AC_SUBST(UP[]_PRG) 38AC_SUBST(UP[]_PRG)
39 39
40AM_CONDITIONAL(BUILD_[]UP, test "x$have_[]m4_defn([DOWN])" = "xyes")
41
42AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3]) 40AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3])
43 41
44]) 42])
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
8dnl 8dnl
9dnl EFL_CHECK_COMPILER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]]) 9dnl EFL_CHECK_COMPILER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
10dnl AC_SUBST : EFL_CFLAGS (EFL being replaced by its value) 10dnl AC_SUBST : EFL_CFLAGS (EFL being replaced by its value)
11dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
12 11
13AC_DEFUN([EFL_CHECK_COMPILER_FLAG], 12AC_DEFUN([EFL_CHECK_COMPILER_FLAG],
14[ 13[
@@ -39,8 +38,6 @@ fi
39AC_ARG_VAR(UPEFL[_CFLAGS], [preprocessor flags for $2]) 38AC_ARG_VAR(UPEFL[_CFLAGS], [preprocessor flags for $2])
40AC_SUBST(UPEFL[_CFLAGS]) 39AC_SUBST(UPEFL[_CFLAGS])
41 40
42AM_CONDITIONAL([EFL_HAVE]UP, [test "x${have_flag}" = "xyes"])
43
44m4_popdef([UP]) 41m4_popdef([UP])
45m4_popdef([UPEFL]) 42m4_popdef([UPEFL])
46]) 43])
@@ -60,7 +57,6 @@ dnl Macro that checks for a linker flag availability
60dnl 57dnl
61dnl EFL_CHECK_LINKER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]]) 58dnl EFL_CHECK_LINKER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
62dnl AC_SUBST : EFL_LIBS (EFL being replaced by its value) 59dnl AC_SUBST : EFL_LIBS (EFL being replaced by its value)
63dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
64 60
65AC_DEFUN([EFL_CHECK_LINKER_FLAG], 61AC_DEFUN([EFL_CHECK_LINKER_FLAG],
66[ 62[
@@ -88,8 +84,6 @@ fi
88AC_ARG_VAR(UPEFL[_LIBS], [preprocessor flags for $2]) 84AC_ARG_VAR(UPEFL[_LIBS], [preprocessor flags for $2])
89AC_SUBST(UPEFL[_LIBS]) 85AC_SUBST(UPEFL[_LIBS])
90 86
91AM_CONDITIONAL([EFL_HAVE]UP, [test "x${have_flag}" = "xyes"])
92
93m4_popdef([UP]) 87m4_popdef([UP])
94m4_popdef([UPEFL]) 88m4_popdef([UPEFL])
95]) 89])