stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=de0d69ea2dc525b3bad57e67fe81e2044133f4ff
commit de0d69ea2dc525b3bad57e67fe81e2044133f4ff
Author: Vincent Torri <vincent.to...@gmail.com>
Date: Thu Jun 16 15:59:28 2016 +0200
Disable XCF module on Windows
Summary: This fixes compilation on Windows: timeout.c is using SIGALRM
which is unavailable on Windows
Test Plan: compilation
Reviewers: cedric, jpeg, stefan_schmidt
Differential Revision: https://phab.enlightenment.org/D4058
---
configure.ac | 15 +++++++++++++++
src/Makefile_Evas.am | 4 ++++
2 files changed, 19 insertions(+)
diff --git a/configure.ac b/configure.ac
index bff3913..666f39b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2326,6 +2326,7 @@ case "$host_os" in
want_spectre="no"
want_libraw="no"
want_rsvg="no"
+ want_xcf="no"
;;
cygwin*)
want_generic="no"
@@ -2333,6 +2334,7 @@ case "$host_os" in
want_spectre="no"
want_libraw="no"
want_rsvg="no"
+ want_xcf="no"
;;
*)
want_generic="static"
@@ -2340,6 +2342,7 @@ case "$host_os" in
want_spectre="yes"
want_libraw="yes"
want_rsvg="yes"
+ want_xcf="yes"
;;
esac
@@ -2879,6 +2882,16 @@ AC_ARG_ENABLE([librsvg],
fi
])
+AC_ARG_ENABLE([xcf],
+ [AS_HELP_STRING([--disable-xcf],[disable xcf support.
@<:@default=enabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_xcf="yes"
+ else
+ want_xcf="no"
+ fi
+ ])
+
have_poppler="no"
have_spectre="no"
have_raw="no"
@@ -2912,11 +2925,13 @@ AM_CONDITIONAL([HAVE_POPPLER], [test "x${have_poppler}"
= "xyes"])
AM_CONDITIONAL([HAVE_SPECTRE], [test "x${have_spectre}" = "xyes"])
AM_CONDITIONAL([HAVE_LIBRAW], [test "x${have_raw}" = "xyes"])
AM_CONDITIONAL([HAVE_RSVG], [test "x${have_rsvg}" = "xyes"])
+AM_CONDITIONAL([HAVE_XCF], [test "x${want_xcf}" = "xyes"])
EFL_ADD_FEATURE([EVAS_LOADER], [poppler], [${have_poppler}])
EFL_ADD_FEATURE([EVAS_LOADER], [spectre], [${have_spectre}])
EFL_ADD_FEATURE([EVAS_LOADER], [raw], [${have_raw}])
EFL_ADD_FEATURE([EVAS_LOADER], [rsvg], [${have_rsvg}])
+EFL_ADD_FEATURE([EVAS_LOADER], [xcf], [${want_xcf}])
EFL_LIB_END([Evas])
#### End of Evas
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 87dcb70..344cdd2 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2532,6 +2532,8 @@ endif
EXTRA_DIST2 += generic/evas/xcf/common.h
+if HAVE_XCF
+
evasgenericloaders_PROGRAMS += generic/evas/xcf/evas_image_loader.xcf
generic_evas_xcf_evas_image_loader_xcf_SOURCES = \
@@ -2550,3 +2552,5 @@ generic_evas_xcf_evas_image_loader_xcf_DEPENDENCIES =
@USE_EINA_INTERNAL_LIBS@
EFL_INSTALL_EXEC_HOOK += \
mkdir -p $(DESTDIR)$(libdir)/evas/utils; \
ln -sf evas_image_loader.xcf
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.xcf.gz;
+
+endif
--
