Parse bison output to prevent LexSetRegExp mistakes.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 91fd7ffd8753541a99632e59fb5488374782e4d1..5a558e894b12b128ad3b43f7c60cad7d3eb4c82b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,9 @@ AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
 LT_INIT([disable-static])
 PKG_PROG_PKG_CONFIG([0.22])
-CHECK_GNU_MAKE
+AX_CHECK_GNU_MAKE
 AC_SUBST([GMAKE], [$_cv_gnu_make_command])
+AC_SUBST([LTFLAGS])
 AS_IF([test "x$GMAKE" = x], [AC_MSG_ERROR([You need GNU make])])
 AC_PATH_PROGS([_BASH], [bash])
 AS_IF([test "x$_BASH" = x], [AC_MSG_ERROR([You need GNU bash])])
@@ -30,7 +31,7 @@ CY_CHECK_PROGS_VERSION([BISON], [bison], [bison],
        [-V | $SED -e '1 s/^bison (GNU Bison) \(.*\)$/\1/p;d'], [2.3])
 AC_ARG_VAR([FLEX], [the fast lexical analyser generator])
 CY_CHECK_PROGS_VERSION([FLEX], [flex], [flex],
-       [--version | $SED -e '1 s/^.* \(@<:@0-9.@:>@*\)$/\1/p;d'], [2.5.33])
+       [--version | $SED -e '1 s/^@<:@^0-9.@:>@* \(@<:@0-9.@:>@*\).*$/\1/p;d'], [2.5.33])
 AC_ARG_VAR([GPERF], [perfect hash function generator])
 CY_CHECK_PROGS_VERSION([GPERF], [gperf], [gperf],
        [--version | $SED -e '1 s/^.* \(@<:@0-9.@:>@*\)$/\1/p;d'], [3.0.3])
@@ -52,15 +53,15 @@ AS_IF([test "x$ac_cv_path_GNUTAR" != x], [
        AC_SUBST([GNUTAR], [:])
        AC_MSG_RESULT([no])
 ])
-AC_CHECK_PROGS([SVN], [svn])
-AC_CHECK_PROGS([SVNVERSION], [svnversion])
+AC_CHECK_PROGS([GIT], [git])
 AC_PROG_CXX
 AC_PROG_OBJCXX
+AC_LANG([C++])
 AC_DEFUN([CY_CHECK_UNIVERSAL], [
        AC_MSG_CHECKING([for universal binary support])
        AS_CASE([$host_vendor], [apple], [
-               AS_CASE([$host_cpu], [i386|x86_64], [
-                       for cy_arch in i386 x86_64; do
+               AS_CASE([$host_cpu], [armv6|i386|x86_64], [
+                       for cy_arch in armv6 i386 x86_64; do
                                cy_save_CXXFLAGS=$CXXFLAGS
                                AC_LIB_APPENDTOVAR([CXXFLAGS], ["-arch $cy_arch"])
                                AC_TRY_LINK([], [], [
@@ -92,7 +93,6 @@ AC_ARG_WITH([frameworks], [AS_HELP_STRING(
                AC_LIB_APPENDTOVAR([OBJCCXXFLAGS], [-F$cy_framework])
        done
 ])
-AC_LANG([C++])
 APR_FIND_APR([], [], [1], [1])
 AS_CASE([$apr_found], [yes], [
        AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])
@@ -196,9 +196,17 @@ AS_CASE([$am_cv_func_iconv], [yes], [], [
 ])
 AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([You need iconv])])
 AC_LANG_POP([C])
+AC_SUBST([SO], [$acl_shlibext])
 AS_IF([test "x$CY_OBJECTIVEC" = x1], [
        AC_CHECK_HEADER([mach/mach.h], [
-               AS_CASE([$OTOOL], [:], [AC_MSG_WARN([Missing otool?])], [AC_SUBST([CY_OBJECTIVEC_MACH], [1])])
+               AC_CHECK_TOOLS([_OTOOL], [otool])
+               AS_IF([test "x$_OTOOL" = x], [AC_MSG_ERROR([You need otool])])
+               AC_CHECK_TOOLS([_LIPO], [lipo])
+               AS_IF([test "x$_LIPO" = x], [AC_MSG_ERROR([You need lipo])])
+               AC_CHECK_TOOLS([_NM], [nm])
+               AS_IF([test "x$_NM" = x], [AC_MSG_ERROR([You need nm])])
+               AC_SUBST([CY_OBJECTIVEC_MACH], [1])
+               AC_SUBST([CY_ATTACH_GROUP], [procmod])
        ])
 ])
 AS_IF([test "x$GMAKE" != xmake], [