cedric pushed a commit to branch master.
commit 344eae9cbd4c6aea640b40e078a3e9a03ecfb298
Author: Jean-Philippe Andre <[email protected]>
Date: Wed Jul 3 10:09:31 2013 +0900
evas: fix build when png12 is not around.
---
m4/evas_check_loader.m4 | 14 ++++++--------
src/Makefile_Evas.am | 3 +--
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index 4dab107..e10e330 100644
--- a/m4/evas_check_loader.m4
+++ b/m4/evas_check_loader.m4
@@ -250,11 +250,10 @@ if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
- else
- PKG_CHECK_MODULES([PNG], [${requirement}])
- evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
- evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
fi
+ PKG_CHECK_MODULES([PNG], [${requirement}])
+ evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
+ evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
fi
AC_SUBST([evas_image_loader_$1_cflags])
@@ -302,11 +301,10 @@ if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xstatic" ; then
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
- else
- PKG_CHECK_MODULES([SVG], [${requirement}])
- evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
- evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
fi
+ PKG_CHECK_MODULES([SVG], [${requirement}])
+ evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
+ evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
fi
AC_SUBST([evas_image_loader_$1_cflags])
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 34c68b8..1682128 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1304,8 +1304,7 @@ lib_evas_libevas_la_LIBADD += @evas_image_loader_png_libs@
if EVAS_CSERVE2
bin_evas_evas_cserve2_slave_SOURCES +=
modules/evas/loaders/png/evas_image_load_png.c
bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_png_cflags@
-# FIXME: Problem here, forcing link to png12.
-bin_evas_evas_cserve2_slave_LDADD += -lpng12 @evas_image_loader_png_libs@
+bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_png_libs@
endif
else
loaderpngpkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
