summaryrefslogtreecommitdiff
path: root/legacy/eet
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2012-07-02 09:17:05 +0000
committerStefan Schmidt <stefan@datenfreihafen.org>2012-07-02 09:17:05 +0000
commite02f746b9091e6f052e45650d6bc21f7e7769075 (patch)
tree0fd0411a970b1ab730bf7ee2045e7e8f0340898f /legacy/eet
parent3f86d486cca826d1013fcec98c626137d2f9825c (diff)
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
Diffstat (limited to 'legacy/eet')
-rw-r--r--legacy/eet/configure.ac5
-rw-r--r--legacy/eet/m4/efl_check_libs.m43
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])
389AC_MSG_RESULT([${have_signature}]) 389AC_MSG_RESULT([${have_signature}])
390 390
391# libjpeg and zlib 391# libjpeg and zlib
392EFL_CHECK_LIBS([eet], [libjpeg]) 392EFL_CHECK_LIBS([eet], [libjpeg zlib])
393AC_CHECK_HEADER([zlib.h],
394 [dummy="yes"],
395 [AC_MSG_ERROR("Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file")])
396 393
397# Eina library 394# Eina library
398 395
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],
53 requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[]m4_defn([DOWNEFL])} zlib" 53 requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[]m4_defn([DOWNEFL])} zlib"
54 ], 54 ],
55 [ 55 [
56 AC_MSG_ERROR(["Cannot find zlib.PC. Make sure your PKG_CONFIG_PATH environment variable contains include lines for the location of this file"])
57 _efl_have_lib="no" 56 _efl_have_lib="no"
58 ]) 57 ])
59 58
@@ -117,4 +116,4 @@ dnl EFL_CHECK_LIBS(EFL, LIBRARIES)
117AC_DEFUN([EFL_CHECK_LIBS], 116AC_DEFUN([EFL_CHECK_LIBS],
118[ 117[
119m4_foreach_w([lib], [$2], [EFL_CHECK_LIB($1, m4_defn([lib]))]) 118m4_foreach_w([lib], [$2], [EFL_CHECK_LIB($1, m4_defn([lib]))])
120]) \ No newline at end of file 119])