From: stefan Date: Mon, 2 Jul 2012 09:17:05 +0000 (+0000) Subject: eet: Real fix for the zlib detection on old systems. X-Git-Tag: submit/2.0alpha-wayland/20121127.222001~39 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af8d9e5c0b977b984d9d779b58cc4ac51e77db03;p=profile%2Fivi%2Feet.git eet: Real fix for the zlib detection on old systems. Reverting my band aid and bring in the real fix provided by Vincent. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eet@73139 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/configure.ac b/configure.ac index ebcf1be..4f91427 100644 --- a/configure.ac +++ b/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/m4/efl_check_libs.m4 b/m4/efl_check_libs.m4 index ea2fc8e..b1c3789 100644 --- a/m4/efl_check_libs.m4 +++ b/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 +])