Integrate GNU autoheader, and the libffi unconfig.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b0de8840d1220090bf7a02b9e12a1531d0f85004..1eecf5bdf7b91ab37bed0a7566b6ede4734352ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,7 @@ AC_COPYRIGHT([Copyright (C) 2009-2012  Jay Freeman (saurik)])
 AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
@@ -38,10 +39,6 @@ AC_LANG([C++])
 
 PKG_PROG_PKG_CONFIG([0.22])
 
-AX_CHECK_GNU_MAKE
-AC_SUBST([GMAKE], [$_cv_gnu_make_command])
-AS_IF([test "x$GMAKE" = x], [AC_MSG_ERROR([You need GNU make])])
-
 AC_PATH_PROG([_BASH], [bash], [AC_MSG_ERROR([missing "bash"])])
 AC_PATH_PROG([GIT], [git])
 AC_PATH_PROG([TIME], [time])
@@ -152,24 +149,20 @@ AC_ARG_WITH([frameworks], [AS_HELP_STRING(
 ]) dnl }}}
 dnl --enable-javascript {{{
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
-    PKG_CHECK_MODULES([WEBKIT], [webkit-1.0], [
+    AC_CHECK_FRAMEWORK([JavaScriptCore], [
+        #include <JavaScriptCore/JSBase.h>
+    ], [
+        JSEvaluateScript(0, 0, 0, 0, 0, 0);
+    ], [
         AC_SUBST([CY_EXECUTE], [1])
-        AC_LIB_APPENDTOVAR([CXXFLAGS], [`$PKG_CONFIG --cflags webkit-1.0`])
-        AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs webkit-1.0`])
     ], [
-        PKG_CHECK_MODULES([WEBKIT], [WebKitGtk], [
-            AC_SUBST([CY_EXECUTE], [1])
-            AC_LIB_APPENDTOVAR([CXXFLAGS], [`$PKG_CONFIG --cflags WebKitGtk`])
-            AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs WebKitGtk`])
-        ], [
-            AC_CHECK_FRAMEWORK([JavaScriptCore], [
-                #include <JavaScriptCore/JSBase.h>
-            ], [
-                JSEvaluateScript(0, 0, 0, 0, 0, 0);
-            ], [
+        for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do
+            PKG_CHECK_MODULES([WEBKIT], [$cy_webkit_pkg], [
                 AC_SUBST([CY_EXECUTE], [1])
-            ])
-        ])
+                CY_COMPILE_FLAG([`$PKG_CONFIG --cflags $cy_webkit_pkg`])
+                AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs $cy_webkit_pkg`])
+            ], [:]); if test "x$CY_EXECUTE" = x1; then break; fi
+        done
     ])
 ])
 
@@ -202,7 +195,7 @@ dnl }}}
 
 AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
     PKG_CHECK_MODULES([LIBFFI], [libffi], [
-        AC_LIB_APPENDTOVAR([CXXFLAGS], [`$PKG_CONFIG --cflags libffi`])
+        CY_COMPILE_FLAG([`$PKG_CONFIG --cflags libffi`])
         AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs libffi`])
     ], [AC_MSG_ERROR([missing "libffi"])])])
 
@@ -269,39 +262,21 @@ AS_CASE([$ax_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])])
 
 CY_LT_LIB([LTLIBTERMCAP], [AC_SEARCH_LIBS([cur_term], [termcap])])
 
-dnl XXX: saurik doesn't understand what this does
-dnl AM_ICONV {{{
 AC_LANG_PUSH([C])
 AM_ICONV
-AS_CASE([$am_cv_func_iconv], [yes], [], [
-    for cy_iconv_prefix_arg in $CFLAGS $CXXFLAGS $OBJCXXFLAGS $LDFLAGS $LIBS; do
-        AS_CASE([$cy_iconv_prefix_arg], [-I*], [
-            AC_LIB_APPENDTOVAR([cy_iconv_prefixes], [`echo $cy_iconv_prefix_arg | sed -e 's/^-I//;s|/include$||'`])
-        ], [-L*], [
-            AC_LIB_APPENDTOVAR([cy_iconv_prefixes], [`echo $cy_iconv_prefix_arg | sed -e 's/^-L//;s|/lib$||'`])
-        ])
-    done
-    for with_libiconv_prefix in $cy_iconv_prefixes; do
-        AS_UNSET([am_cv_func_iconv])
-        AM_ICONV_LINKFLAGS_BODY
-        AM_ICONV
-    done
-])
 AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([missing "libiconv"])])
 AC_LANG_POP([C])
-dnl }}}
 
 AC_SUBST([LTFLAGS])
 AC_SUBST([SO], [$acl_shlibext])
 
-AC_CHECK_HEADER([mach/mach.h], [
-    AC_CHECK_TOOLS([_LIPO], [lipo], [AC_MSG_ERROR([missing "lipo"])])
-    AC_CHECK_TOOLS([_NM], [nm], [AC_MSG_ERROR([missing "nm"])])
-    AC_CHECK_TOOLS([_OTOOL], [otool], [AC_MSG_ERROR([missing "otool"])])
-    AC_SUBST([CY_MACH], [1])
-    AC_SUBST([CY_ATTACH_GROUP], [procmod])
-])
-
+AS_IF([test "x$CY_EXECUTE" = x1], [
+    AC_CHECK_HEADER([mach/mach.h], [
+        AC_CHECK_TOOLS([_LIPO], [lipo], [AC_MSG_ERROR([missing "lipo"])])
+        AC_CHECK_TOOLS([_NM], [nm], [AC_MSG_ERROR([missing "nm"])])
+        AC_CHECK_TOOLS([_OTOOL], [otool], [AC_MSG_ERROR([missing "otool"])])
+        AC_SUBST([CY_ATTACH_GROUP], [procmod])
+        AC_SUBST([CY_MACH], [1])])])
 AM_CONDITIONAL([CY_MACH], [test "x$CY_MACH" = x1])
 
 AC_CONFIG_FILES([Makefile])