rggammon
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efl: remove strict checking option, always by default. 

SVN revision: 80395
This commit is contained in:
Gustavo Sverzut Barbieri 2012-12-06 21:41:28 +00:00
parent 94bf7c25e8
commit 7e8f2ebf87
1 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
configure.ac
View File

@ -1099,14 +1099,6 @@ AC_MSG_NOTICE([Evas checks])
### Additional options to configure ### Additional options to configure
# when used, that option makes configure script fails when
# a requirement is selected, but not met.
use_strict="no"
AC_ARG_ENABLE([strict],
[AC_HELP_STRING([--enable-strict], [enable strict checking mode. @<:@default=disabled@:>@])],
[use_strict="yes"],
[use_strict="no"])
# Simple X11 build/link # Simple X11 build/link
AC_ARG_ENABLE([simple-x11], AC_ARG_ENABLE([simple-x11],
[AC_HELP_STRING([--enable-simple-x11], [AC_HELP_STRING([--enable-simple-x11],
@ -1149,7 +1141,7 @@ AC_ARG_ENABLE([fribidi],
# Harfbuzz # Harfbuzz
AC_ARG_ENABLE([harfbuzz], AC_ARG_ENABLE([harfbuzz],
[AC_HELP_STRING([--disable-harfbuzz], [AC_HELP_STRING([--disable-harfbuzz],
[disable complex text shaping and layouting support. @<:@default=auto@:>@])], [disable complex text shaping and layouting support. @<:@default=enabled@:>@])],
[ [
if test "x${enableval}" = "xyes" ; then if test "x${enableval}" = "xyes" ; then
want_harfbuzz="yes" want_harfbuzz="yes"
@ -1157,7 +1149,7 @@ AC_ARG_ENABLE([harfbuzz],
want_harfbuzz="no" want_harfbuzz="no"
fi fi
], ],
[want_harfbuzz="auto"]) [want_harfbuzz="yes"])
# Pixman # Pixman
AC_ARG_ENABLE([pixman], AC_ARG_ENABLE([pixman],
@ -1499,39 +1491,25 @@ fi
# harfbuzz support # harfbuzz support
have_harfbuzz="no" have_harfbuzz="no"
have_harfbuzz_ft="no" have_harfbuzz_ft="no"
if test "x${want_harfbuzz}" = "xyes" || test "x${want_harfbuzz}" = "xauto" ; then if test "x${want_harfbuzz}" = "xyes"; then
PKG_CHECK_EXISTS([harfbuzz >= 0.9.0], PKG_CHECK_EXISTS([harfbuzz >= 0.9.0],
[ [
have_harfbuzz="yes" have_harfbuzz="yes"
requirements_pc_evas="harfbuzz >= 0.9.0 ${requirements_pc_evas}" requirements_pc_evas="harfbuzz >= 0.9.0 ${requirements_pc_evas}"
requirements_pc_deps_evas="harfbuzz >= 0.9.0 ${requirements_pc_deps_evas}" requirements_pc_deps_evas="harfbuzz >= 0.9.0 ${requirements_pc_deps_evas}"
], ], [AC_MSG_ERROR([pkg-config missing harfbuzz >= 0.9.0])])
[
if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then
AC_MSG_ERROR([Harfbuzz not found (strict dependencies checking)])
fi
])
fi
if test "x${have_harfbuzz}" = "xno"; then
HAS_HARFBUZZ=0
fi fi
# Pixman # Pixman
have_pixman="no" have_pixman="no"
if test "x${want_pixman}" = "xyes" || test "x${want_pixman}" = "xauto" ; then if test "x${want_pixman}" = "xyes"; then
PKG_CHECK_EXISTS([pixman-1], PKG_CHECK_EXISTS([pixman-1],
[ [
have_pixman="yes" have_pixman="yes"
AC_DEFINE([HAVE_PIXMAN], [1], [have pixman for rendering]) AC_DEFINE([HAVE_PIXMAN], [1], [have pixman for rendering])
requirements_pc_evas="pixman-1 ${requirements_pc_evas}" requirements_pc_evas="pixman-1 ${requirements_pc_evas}"
requirements_pc_deps_evas="pixman-1 ${requirements_pc_deps_evas}" requirements_pc_deps_evas="pixman-1 ${requirements_pc_deps_evas}"
], ], [AC_MSG_ERROR([pkg-config missing pixman-1])])
[
if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then
AC_MSG_ERROR([Pixman not found (strict dependencies checking)])
fi
])
fi fi
if test "x${have_pixman}" = "xyes" ; then if test "x${have_pixman}" = "xyes" ; then
@ -1784,13 +1762,9 @@ if test "x$have_harfbuzz" = "xyes" ; then
#Depend on harfbuzz ft for harfbuzz support #Depend on harfbuzz ft for harfbuzz support
AC_DEFINE([HAVE_HARFBUZZ], [1], [have harfbuzz support]) AC_DEFINE([HAVE_HARFBUZZ], [1], [have harfbuzz support])
], ],
[ [AC_MSG_ERROR([Harfbuzz-ft (hb-ft.h) not found])])
if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then
AC_MSG_ERROR([Harfbuzz-ft not found (strict dependencies checking)]) CPPFLAGS="$CPPFLAGS_SAVE"
fi
have_harfbuzz="no"
])
CPPFLAGS="$CPPFLAGS_SAVE"
fi fi
### Checks for types ### Checks for types