aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-30 18:55:56 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-30 18:55:56 +0000
commit1453b3848b22bbb8cfbbca1a107b50e2f6d9b006 (patch)
tree47f2b72cf3c6e12fd9ed4197dc47912616f38462 /m4
parentec75e2048658aaef795f318ca78ecf349add4696 (diff)
downloadefl-1453b3848b22bbb8cfbbca1a107b50e2f6d9b006.tar.gz
efl-1453b3848b22bbb8cfbbca1a107b50e2f6d9b006.tar.xz
efl-1453b3848b22bbb8cfbbca1a107b50e2f6d9b006.zip
efl: EFL_CHECK_LIBS() is strict, simplify it then.
as we abort (AC_MSG_ERROR) if not found, simplify the code. SVN revision: 81907
Diffstat (limited to 'm4')
-rw-r--r--m4/efl_check_libs.m494
1 files changed, 29 insertions, 65 deletions
diff --git a/m4/efl_check_libs.m4 b/m4/efl_check_libs.m4
index c43e8d018..91500db26 100644
--- a/m4/efl_check_libs.m4
+++ b/m4/efl_check_libs.m4
@@ -7,43 +7,31 @@ dnl libjpeg
dnl zlib
dnl _EFL_CHECK_LIB_LIBJPEG is for internal use
-dnl _EFL_CHECK_LIB_LIBJPEG(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+dnl _EFL_CHECK_LIB_LIBJPEG(EFL)
+dnl it will abort (AC_MSG_ERROR) if libjpeg is not found.
AC_DEFUN([_EFL_CHECK_LIB_LIBJPEG],
-[
+[dnl
m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
-AC_CHECK_HEADER([jpeglib.h],
- [have_dep="yes"],
- [
- AC_MSG_ERROR(["Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file"])
- have_dep="no"
- ])
-
-if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([jpeg], [jpeg_std_error],
- [
- have_dep="yes"
- requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ljpeg"
- ],
- [
- AC_MSG_ERROR("Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file")
- have_dep="no"
- ])
-fi
+AC_CHECK_HEADER([jpeglib.h], [],
+ [AC_MSG_ERROR([Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file])])
-AS_IF([test "x${have_dep}" = "xyes"], [$2], [$3])
+AC_CHECK_LIB([jpeg], [jpeg_std_error],
+ [requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ljpeg"],
+ [AC_MSG_ERROR([Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file])])
-m4_popdef([DOWNEFL])
-m4_popdef([UPEFL])
+m4_popdef([DOWNEFL])dnl
+m4_popdef([UPEFL])dnl
])
dnl _EFL_CHECK_LIB_ZLIB is for internal use
-dnl _EFL_CHECK_LIB_ZLIB(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+dnl _EFL_CHECK_LIB_ZLIB(EFL)
+dnl it will abort (AC_MSG_ERROR) if zlib is not found.
AC_DEFUN([_EFL_CHECK_LIB_ZLIB],
-[
+[dnl
m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
@@ -53,63 +41,39 @@ if test "x${_efl_have_lib}" = "xyes" ; then
requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[]m4_defn([DOWNEFL])} zlib >= 1.2.3"
requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_[]m4_defn([DOWNEFL])} zlib >= 1.2.3"
else
- AC_CHECK_HEADER([zlib.h],
- [_efl_have_lib="yes"],
- [
- AC_MSG_ERROR(["Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file"])
- _efl_have_lib="no"
- ])
-
- if test "x${_efl_have_lib}" = "xyes" ; then
- AC_CHECK_LIB([z], [zlibVersion],
- [
- _efl_have_lib="yes"
- requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -lz"
- ],
- [
- AC_MSG_ERROR(["Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file"])
- _efl_have_lib="no"
- ])
- fi
-fi
+ AC_CHECK_HEADER([zlib.h], [],
+ [AC_MSG_ERROR([Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file])])
-AS_IF([test "x${_efl_have_lib}" = "xyes"], [$2], [$3])
+ AC_CHECK_LIB([z], [zlibVersion],
+ [requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -lz"],
+ [AC_MSG_ERROR([Cannot find libjpeg library. Make sure your LDFLAGS environment variable contains include lines for the location of this file])])
+fi
-m4_popdef([DOWNEFL])
-m4_popdef([UPEFL])
+m4_popdef([DOWNEFL])dnl
+m4_popdef([UPEFL])dnl
])
dnl Macro that checks for a library
dnl
dnl EFL_CHECK_LIB(EFL, LIBRARY)
-dnl AC_DEFINE : EFL_HAVE_LIBRARY (LIBRARY being replaced by its value)
+dnl it will abort if library is not found
AC_DEFUN([EFL_CHECK_LIB],
-[
+[dnl
m4_pushdef([UP], m4_translit([$2], [-a-z], [_A-Z]))dnl
-m4_pushdef([DOWN], m4_translit([$2], [-A-Z], [_a-z]))dnl
-
-m4_default([_EFL_CHECK_LIB_]m4_defn([UP]))($1, [have_lib="yes"], [have_lib="no"])
-AC_MSG_CHECKING([for ]m4_defn([DOWN]))
-AC_MSG_RESULT([${have_lib}])
+AC_MSG_CHECKING([for $2])
+m4_default([_EFL_CHECK_LIB_]m4_defn([UP]))($1)
+AC_MSG_RESULT([yes])
-if test "x${have_lib}" = "xyes" ; then
- AC_DEFINE([HAVE_]m4_defn([UP]), [1], [Define to 1 if the `]m4_defn([DOWN])[' library is installed.])
-fi
-
-efl_lib_[]m4_defn([DOWN])="${have_lib}"
-
-m4_popdef([DOWN])
-m4_popdef([UP])
+m4_popdef([UP])dnl
])
dnl Macro that iterates over a sequence of white separated libraries
dnl and that calls EFL_CHECK_LIB() for each of these libraries
dnl
dnl EFL_CHECK_LIBS(EFL, LIBRARIES)
+dnl it will abort if libraries are not found
AC_DEFUN([EFL_CHECK_LIBS],
-[
-m4_foreach_w([lib], [$2], [EFL_CHECK_LIB($1, m4_defn([lib]))])
-])
+[m4_foreach_w([lib], [$2], [EFL_CHECK_LIB($1, m4_defn([lib]))])])