summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-07 19:16:03 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-07 19:16:03 +0000
commite197a0453d5da00ca456a6817a6a5e1acc2b8314 (patch)
tree6a91f040e798452e78849642212aa54e7340e63e /configure.ac
parent64a9af8fe81116df23894387c93d7aacc05f7bc1 (diff)
efl: fix sdl check and simplify jpeg saver check for windows
SVN revision: 80492
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac19
1 files changed, 8 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index 0f0eda8..1e95c34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1138,7 +1138,7 @@ AC_ARG_ENABLE([sdl],
1138 ], 1138 ],
1139 [want_sdl="no"]) 1139 [want_sdl="no"])
1140 1140
1141if test "${want_sdl}"; then 1141if test "${want_sdl}" = "yes"; then
1142 EFL_PKG_CHECK_STRICT([sdl >= 1.2.0]) 1142 EFL_PKG_CHECK_STRICT([sdl >= 1.2.0])
1143fi 1143fi
1144 1144
@@ -1665,16 +1665,13 @@ EVAS_CHECK_IMAGE_LOADER([XPM], [${want_evas_image_loader_xpm}])
1665dnl Windows has no sigsetjmp function, nor equivalent. 1665dnl Windows has no sigsetjmp function, nor equivalent.
1666dnl So we disable the jpeg saver. 1666dnl So we disable the jpeg saver.
1667dnl TODO: must find a workaround 1667dnl TODO: must find a workaround
1668case "$host_os" in 1668if test "${have_windows}" = "yes"; then
1669 mingw*) 1669 have_evas_image_saver_jpeg="no"
1670 ;; 1670elif test "x${have_evas_image_loader_jpeg}" = "xyes" || \
1671 *) 1671 test "x${have_evas_image_loader_jpeg}" = "xstatic"; then
1672 if test "x${have_evas_image_loader_jpeg}" = "xyes" || test "x${have_evas_image_loader_jpeg}" = "xstatic"; then 1672 AC_DEFINE([EVAS_BUILD_SAVER_JPEG], [1], [Build JPEG saver])
1673 AC_DEFINE([EVAS_BUILD_SAVER_JPEG], [1], [Build JPEG saver]) 1673 have_evas_image_saver_jpeg="yes"
1674 have_evas_image_saver_jpeg="yes" 1674fi
1675 fi
1676 ;;
1677esac
1678 1675
1679AM_CONDITIONAL([BUILD_SAVER_JPEG], [test "x${have_evas_image_saver_jpeg}" = "xyes"]) 1676AM_CONDITIONAL([BUILD_SAVER_JPEG], [test "x${have_evas_image_saver_jpeg}" = "xyes"])
1680 1677