aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2012-12-19 16:47:57 +0000
committerTom Hacohen <tom@stosb.com>2012-12-19 16:47:57 +0000
commit5d260c405a513782888541cf963ab4c97325a275 (patch)
tree0cf476123067b885c941c3e4088a81e9e27fa62a /configure.ac
parentevas/engines: Introduce render mode (diff)
downloadefl-5d260c405a513782888541cf963ab4c97325a275.tar.gz
Efl: Fix FriBidiChar size detection.
It's better than nothing, I don't know what the proper fix is. FRIBIDI_CFLAGS just doesn't exist. Doesn't that macro we use call PKG_CHECK_MODULES? SVN revision: 81385
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac16
1 files changed, 9 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 1c99c74b61..f54dd2fd90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1469,13 +1469,7 @@ EFL_OPTIONAL_DEPEND_PKG([evas], [${want_fontconfig}],
# fribidi support
EFL_OPTIONAL_DEPEND_PKG([evas], [${want_fribidi}],
- [FRIBIDI], [fribidi >= 0.19.2],
- [
- CPPFLAGS_SAVE="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $FRIBIDI_CFLAGS"
- AC_CHECK_SIZEOF([FriBidiChar], [], [#include <fribidi/fribidi.h>])
- CPPFLAGS="$CPPFLAGS_SAVE"
- ])
+ [FRIBIDI], [fribidi >= 0.19.2])
# harfbuzz support
have_harfbuzz_ft="no"
@@ -1739,6 +1733,14 @@ CPPFLAGS="$CPPFLAGS -Isrc/lib/eina"
AC_CHECK_SIZEOF([Eina_Unicode], [], [#include <Eina.h>])
CPPFLAGS="$CPPFLAGS_SAVE"
+
+if test "x$have_fribidi" = "xyes" ; then
+ CPPFLAGS_SAVE="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $EVAS_CFLAGS"
+ AC_CHECK_SIZEOF([FriBidiChar], [], [#include <fribidi/fribidi.h>])
+ CPPFLAGS="$CPPFLAGS_SAVE"
+fi
+
### Checks for structures
AC_CHECK_TYPES([struct sigaction], [], [],