* more portable shell tests

* better m4 code


SVN revision: 45540
This commit is contained in:
Vincent Torri 2010-01-24 23:04:24 +00:00
parent 96a20ffd91
commit c3c03b9c5b
2 changed files with 5 additions and 9 deletions

View File

@ -18,17 +18,13 @@ AC_ARG_ENABLE([$1],
],
[enable_module="yes"])
if test "x${enable_module}" = "xyes" -a "x${want_module}" = "xyes"; then
if test "x${enable_module}" = "xyes" && test "x${want_module}" = "xyes"; then
PKG_CHECK_MODULES([]UP[], [$3], [have_module="yes"], [have_module="no"])
fi
AM_CONDITIONAL([EINA_HAVE_]UP[], [test "x${have_module}" = "xyes"])
if test "x${have_module}" = "xyes" ; then
ifelse([$4], , :, [$4])
else
ifelse([$5], , :, [$5])
fi
AS_IF([test "x$have_module" = "xyes"], [$4], [$5])
m4_popdef([UP])
m4_popdef([DOWN])

View File

@ -22,7 +22,7 @@ AC_ARG_ENABLE([$1],
[enable_module="yes"])
have_module="no"
if test "x${enable_module}" = "xyes" -o "x${enable_module}" = "xstatic" ; then
if test "x${enable_module}" = "xyes" || test "x${enable_module}" = "xstatic" ; then
have_module="yes"
fi
@ -30,7 +30,7 @@ AC_MSG_CHECKING([whether to enable $3 built])
AC_MSG_RESULT([${have_module}])
build_module="no"
if test "x${want_module}" = "xyes" -a "x${have_module}" = "xyes" ; then
if test "x${want_module}" = "xyes" && test "x${have_module}" = "xyes" ; then
build_module="yes"
fi
@ -38,7 +38,7 @@ AC_MSG_CHECKING([whether to build $3])
AC_MSG_RESULT([${build_module}])
static_module="no"
if test "x${want_module}" = "xyes" -a "x${enable_module}" = "xstatic" ; then
if test "x${want_module}" = "xyes" && test "x${enable_module}" = "xstatic" ; then
static_module="yes"
fi