From 1d19c1d7e8285eb92e2ab058367166f7a56c2cb3 Mon Sep 17 00:00:00 2001 From: caro Date: Sat, 27 Jun 2009 06:42:14 +0000 Subject: [PATCH] update m4 macros (mainly formatting) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eet@41212 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- m4/ac_attribute.m4 | 5 +++-- m4/efl_coverage.m4 | 12 +++++++----- m4/efl_doxygen.m4 | 8 +++----- m4/efl_tests.m4 | 15 ++++++++------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/m4/ac_attribute.m4 b/m4/ac_attribute.m4 index 3926d23..23479a9 100644 --- a/m4/ac_attribute.m4 +++ b/m4/ac_attribute.m4 @@ -31,8 +31,7 @@ int foo(int x __attribute__ ((unused))) [], [ac_cv___attribute__="yes"], [ac_cv___attribute__="no"] - )] -) + )]) AC_MSG_RESULT($ac_cv___attribute__) @@ -44,3 +43,5 @@ if test "x${ac_cv___attribute__}" = "xyes" ; then fi ]) + +dnl End of ac_attribute.m4 diff --git a/m4/efl_coverage.m4 b/m4/efl_coverage.m4 index 1618f76..baf0002 100644 --- a/m4/efl_coverage.m4 +++ b/m4/efl_coverage.m4 @@ -16,7 +16,7 @@ AC_DEFUN([EFL_CHECK_COVERAGE], dnl configure option AC_ARG_ENABLE([coverage], - [AC_HELP_STRING([--enable-coverage], [compile with coverage profiling instrumentation @<:@default=no@:>@])], + [AC_HELP_STRING([--enable-coverage], [enable coverage profiling instrumentation @<:@default=disabled@:>@])], [ if test "x${enableval}" = "xyes" ; then _efl_enable_coverage="yes" @@ -24,8 +24,8 @@ AC_ARG_ENABLE([coverage], _efl_enable_coverage="no" fi ], - [_efl_enable_coverage="no"] -) + [_efl_enable_coverage="no"]) + AC_MSG_CHECKING([whether to use profiling instrumentation]) AC_MSG_RESULT([$_efl_enable_coverage]) @@ -57,8 +57,10 @@ AC_SUBST(EFL_COVERAGE_LIBS) AM_CONDITIONAL(EFL_ENABLE_COVERAGE, test "x${_efl_enable_coverage}" = "xyes") if test "x${_efl_enable_coverage}" = "xyes" ; then - ifelse([$2], , :, [$2]) + m4_default([$2], [:]) else - ifelse([$3], , :, [$3]) + m4_default([$3], [:]) fi ]) + +dnl End of efl_coverage.m4 diff --git a/m4/efl_doxygen.m4 b/m4/efl_doxygen.m4 index dd6bc3e..d83ed68 100644 --- a/m4/efl_doxygen.m4 +++ b/m4/efl_doxygen.m4 @@ -32,9 +32,7 @@ AC_MSG_RESULT([${efl_enable_doc}]) if test "x${efl_enable_doc}" = "xyes" ; then -dnl dnl Specify the file name, without path -dnl efl_doxygen="doxygen" @@ -42,9 +40,9 @@ dnl [AC_HELP_STRING( [--with-doxygen=FILE], [doxygen program to use @<:@default=doxygen@:>@])], -dnl + dnl Check the given doxygen program. -dnl + [efl_doxygen=${withval} AC_CHECK_PROG([efl_have_doxygen], [${efl_doxygen}], @@ -96,4 +94,4 @@ fi ]) -dnl End of doxygen.m4 +dnl End of efl_doxygen.m4 diff --git a/m4/efl_tests.m4 b/m4/efl_tests.m4 index 8d193b6..98d11bb 100644 --- a/m4/efl_tests.m4 +++ b/m4/efl_tests.m4 @@ -13,7 +13,7 @@ AC_DEFUN([EFL_CHECK_TESTS], dnl configure option AC_ARG_ENABLE([tests], - [AC_HELP_STRING([--enable-tests], [enable tests @<:@default=no@:>@])], + [AC_HELP_STRING([--enable-tests], [enable tests @<:@default=disabled@:>@])], [ if test "x${enableval}" = "xyes" ; then _efl_enable_tests="yes" @@ -21,8 +21,8 @@ AC_ARG_ENABLE([tests], _efl_enable_tests="no" fi ], - [_efl_enable_tests="no"] -) + [_efl_enable_tests="no"]) + AC_MSG_CHECKING([whether tests are built]) AC_MSG_RESULT([${_efl_enable_tests}]) @@ -32,15 +32,16 @@ if test "x${_efl_enable_tests}" = "xyes" ; then PKG_CHECK_MODULES([CHECK], [check >= 0.9.5], [dummy="yes"], - [_efl_enable_tests="no"] - ) + [_efl_enable_tests="no"]) fi AM_CONDITIONAL(EFL_ENABLE_TESTS, test "x${_efl_enable_tests}" = "xyes") if test "x${_efl_enable_tests}" = "xyes" ; then - ifelse([$1], , :, [$1]) + m4_default([$1], [:]) else - ifelse([$2], , :, [$2]) + m4_default([$2], [:]) fi ]) + +dnl End of efl_tests.m4 -- 2.7.4