diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2012-07-02 09:17:05 +0000 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2012-07-02 09:17:05 +0000 |
| commit | 643d44bfc6afd13af7300e98dffd4359ee8a0f71 (patch) | |
| tree | afb7d7cce0d1c92ef5e8a774e51cc5bd1a5b4ee3 | |
| parent | 574c620ade8cc5e6901227fabae35c350cba40d5 (diff) | |
| download | eet-643d44bfc6afd13af7300e98dffd4359ee8a0f71.tar.gz | |
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
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | m4/efl_check_libs.m4 | 3 |
2 files changed, 2 insertions, 6 deletions
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 +]) |