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
This commit is contained in:
parent
3f86d486cc
commit
e02f746b90
|
@ -389,10 +389,7 @@ AC_MSG_CHECKING([whether to activate signature support in eet])
|
||||||
AC_MSG_RESULT([${have_signature}])
|
AC_MSG_RESULT([${have_signature}])
|
||||||
|
|
||||||
# libjpeg and zlib
|
# libjpeg and zlib
|
||||||
EFL_CHECK_LIBS([eet], [libjpeg])
|
EFL_CHECK_LIBS([eet], [libjpeg zlib])
|
||||||
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")])
|
|
||||||
|
|
||||||
# Eina library
|
# Eina library
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,6 @@ PKG_CHECK_EXISTS([zlib],
|
||||||
requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_[]m4_defn([DOWNEFL])} 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"
|
_efl_have_lib="no"
|
||||||
])
|
])
|
||||||
|
|
||||||
|
@ -117,4 +116,4 @@ dnl EFL_CHECK_LIBS(EFL, LIBRARIES)
|
||||||
AC_DEFUN([EFL_CHECK_LIBS],
|
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]))])
|
||||||
])
|
])
|
||||||
|
|
Loading…
Reference in New Issue