Check the version of flex; check for libffi further after pkg-config fails us.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 228883ef610d57822255c6c8ffc545e32c773b2f..de7c50ae16f02e396f5d56c95c5425796b124f67 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,26 +1,30 @@
 #AC_PREREQ([2.65])
 AC_INIT([Cycript], [0.9], [saurik@saurik.com], [cycript], [http://www.cycript.org/])
 AC_CONFIG_SRCDIR([Console.cpp])
+AC_CONFIG_AUX_DIR([.])
 AX_PROG_BISON([
        BISON=`echo $YACC | $SED -e 's/ -y//'`
        BISON_VERSION=`$BISON -V | $SED -e 's/^bison (GNU Bison) \(.*\)$/\1/p;d'`
 ], [AC_MSG_ERROR([You need bison 2.4 or greater])])
 AC_PROG_AWK
 AC_MSG_CHECKING([if bison is >= 2.4])
-AX_COMPARE_VERSION([$BISON_VERSION], [ge], [2.4], [AC_MSG_RESULT([yes])], [
+AS_VERSION_COMPARE([$BISON_VERSION], [2.4], [
        AC_MSG_RESULT([no])
        AC_MSG_ERROR([You need bison 2.4 or greater])
-])
+], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])])
 AC_SUBST([BISON])
-AC_PROG_LEX
-AC_MSG_CHECKING([for flex])
-AS_IF([test "`echo \"$LEX\" | $SED 's/^.*\(flex\).*$/\1/'`" = "flex"], [
-       AC_MSG_RESULT([yes])
-       AC_SUBST([FLEX], [$LEX])
+AX_PROG_FLEX([
+       FLEX=$LEX
+       FLEX_VERSION=`$FLEX --version | $SED -e 's/^.* \(.*\)$/\1/p;d'`
 ], [
-       AC_MSG_RESULT([no])
-       AC_MSG_ERROR([You need flex])
+       AC_MSG_ERROR([You need flex 2.5.35 or greater])
 ])
+AC_MSG_CHECKING([if flex is >= 2.5.35])
+AS_VERSION_COMPARE([$FLEX_VERSION], [2.5.35], [
+       AC_MSG_RESULT([no])
+       AC_MSG_ERROR([You need flex 2.5.35 or greater])
+], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])])
+AC_SUBST([FLEX])
 APR_FIND_APR([], [], [1], [1])
 AS_CASE([$apr_found], [yes], [
        AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])
@@ -34,9 +38,18 @@ PKG_CHECK_MODULES([WEBKIT], [webkit-1.0], [WEBKIT=yes], [
        PKG_CHECK_MODULES([WEBKIT], [WebKitGtk], [WEBKIT=yes], [WEBKIT=no])
 ])
 AS_CASE([$WEBKIT], [yes], [
-       PKG_CHECK_MODULES([LIBFFI], [libffi])
+       PKG_CHECK_MODULES([LIBFFI], [libffi], [], [
+               AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break])
+               AS_IF([test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno], [
+                       AC_MSG_ERROR([You need libffi])
+               ])
+               AC_SEARCH_LIBS([ffi_call], [ffi])
+               AS_CASE([$ac_cv_search_ffi_call], [no], [
+                       AC_MSG_ERROR([You need libffi])
+               ])
+       ])
 ], [AC_MSG_WARN(No JavaScript engine!)])
 CHECK_GNU_MAKE
-AS_IF([test x$_cv_gnu_make_command = x], [AC_MSG_ERROR([You need GNU make])])
+AS_IF([test "x$_cv_gnu_make_command" = x], [AC_MSG_ERROR([You need GNU make])])
 # XXX: gnustep
 #AC_PROG_OBJCXX