From e02f746b9091e6f052e45650d6bc21f7e7769075 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Mon, 2 Jul 2012 09:17:05 +0000 Subject: [PATCH] eet: Real fix for the zlib detection on old systems. Reverting my band aid and bring in the real fix provided by Vincent. SVN revision: 73139 --- legacy/eet/configure.ac | 5 +---- legacy/eet/m4/efl_check_libs.m4 | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac index ebcf1be0bb..4f91427c66 100644 --- a/legacy/eet/configure.ac +++ b/legacy/eet/configure.ac @@ -389,10 +389,7 @@ AC_MSG_CHECKING([whether to activate signature support in eet]) AC_MSG_RESULT([${have_signature}]) # libjpeg and zlib -EFL_CHECK_LIBS([eet], [libjpeg]) -AC_CHECK_HEADER([zlib.h], - [dummy="yes"], - [AC_MSG_ERROR("Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file")]) +EFL_CHECK_LIBS([eet], [libjpeg zlib]) # Eina library diff --git a/legacy/eet/m4/efl_check_libs.m4 b/legacy/eet/m4/efl_check_libs.m4 index ea2fc8e793..b1c37894b6 100644 --- a/legacy/eet/m4/efl_check_libs.m4 +++ b/legacy/eet/m4/efl_check_libs.m4 @@ -53,7 +53,6 @@ PKG_CHECK_EXISTS([zlib], requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[]m4_defn([DOWNEFL])} zlib" ], [ - AC_MSG_ERROR(["Cannot find zlib.PC. Make sure your PKG_CONFIG_PATH environment variable contains include lines for the location of this file"]) _efl_have_lib="no" ]) @@ -117,4 +116,4 @@ dnl EFL_CHECK_LIBS(EFL, LIBRARIES) AC_DEFUN([EFL_CHECK_LIBS], [ m4_foreach_w([lib], [$2], [EFL_CHECK_LIB($1, m4_defn([lib]))]) -]) \ No newline at end of file +])