forked from enlightenment/efl
evas: fix build when png12 is not around.
This commit is contained in:
parent
be34ef9eb2
commit
344eae9cbd
|
@ -250,11 +250,10 @@ if test "x${have_dep}" = "xyes" ; then
|
||||||
if test "x$2" = "xstatic" ; then
|
if test "x$2" = "xstatic" ; then
|
||||||
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
|
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
|
||||||
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
|
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
|
||||||
else
|
fi
|
||||||
PKG_CHECK_MODULES([PNG], [${requirement}])
|
PKG_CHECK_MODULES([PNG], [${requirement}])
|
||||||
evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
|
evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
|
||||||
evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
|
evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST([evas_image_loader_$1_cflags])
|
AC_SUBST([evas_image_loader_$1_cflags])
|
||||||
|
@ -302,11 +301,10 @@ if test "x${have_dep}" = "xyes" ; then
|
||||||
if test "x$2" = "xstatic" ; then
|
if test "x$2" = "xstatic" ; then
|
||||||
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
|
requirements_pc_evas="${requirement} ${requirements_pc_evas}"
|
||||||
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
|
requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
|
||||||
else
|
fi
|
||||||
PKG_CHECK_MODULES([SVG], [${requirement}])
|
PKG_CHECK_MODULES([SVG], [${requirement}])
|
||||||
evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
|
evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
|
||||||
evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
|
evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST([evas_image_loader_$1_cflags])
|
AC_SUBST([evas_image_loader_$1_cflags])
|
||||||
|
|
|
@ -1304,8 +1304,7 @@ lib_evas_libevas_la_LIBADD += @evas_image_loader_png_libs@
|
||||||
if EVAS_CSERVE2
|
if EVAS_CSERVE2
|
||||||
bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/png/evas_image_load_png.c
|
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@
|
bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_png_cflags@
|
||||||
# FIXME: Problem here, forcing link to png12.
|
bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_png_libs@
|
||||||
bin_evas_evas_cserve2_slave_LDADD += -lpng12 @evas_image_loader_png_libs@
|
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
loaderpngpkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
|
loaderpngpkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
|
||||||
|
|
Loading…
Reference in New Issue