Use yet more indirection to detect iOS simulator.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 82821d5e6304349710bca0e716849209b97e3d0e..90f2f5c2a0cf2d00c17ad7c6098ef159455a2d2f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,16 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])

+AM_MAINTAINER_MODE([disable])
+
+dnl XXX: do this only on Mac OS X
+am_cv_CC_dependencies_compiler_type=none
+am_cv_CXX_dependencies_compiler_type=none
+am_cv_OBJCXX_dependencies_compiler_type=none

 
 AC_PROG_CXX
 AC_PROG_OBJCXX
 
 AC_PROG_CXX
 AC_PROG_OBJCXX

+

 AM_PROG_AR
 AC_PROG_INSTALL
 
 AM_PROG_AR
 AC_PROG_INSTALL
 


@@ -39,7 +46,6 @@ AC_LANG([C++])
 
 PKG_PROG_PKG_CONFIG([0.22])
 
 
 PKG_PROG_PKG_CONFIG([0.22])
 

-AC_PATH_PROG([_BASH], [bash], [AC_MSG_ERROR([missing "bash"])])

 AC_PATH_PROG([GIT], [git])
 AC_PATH_PROG([TIME], [time])
 
 AC_PATH_PROG([GIT], [git])
 AC_PATH_PROG([TIME], [time])
 


@@ -101,12 +107,6 @@ AC_DEFUN([CY_TRY], [
     AS_IF([test "x$cy_good" = x1], ]$4[, ]$5[)
 ]) dnl }}}
 
     AS_IF([test "x$cy_good" = x1], ]$4[, ]$5[)
 ]) dnl }}}
 

-AC_DEFUN([CY_COMPILE_FLAG], [
-    AC_LIB_APPENDTOVAR([CFLAGS], ]$1[)
-    AC_LIB_APPENDTOVAR([CXXFLAGS], ]$1[)
-    AC_LIB_APPENDTOVAR([OBJCXXFLAGS], ]$1[)
-])
-

 AC_DEFUN([CY_TEST_FLAG_], [
     AC_LANG_PUSH(]$2[)
     AC_MSG_CHECKING([for ]]$4[[ ]]$1[)
 AC_DEFUN([CY_TEST_FLAG_], [
     AC_LANG_PUSH(]$2[)
     AC_MSG_CHECKING([for ]]$4[[ ]]$1[)


@@ -149,6 +149,15 @@ for cy_arch in ppc ppc64 i386 x86_64 armv6; do
 done
 AC_SUBST([CY_ARCH])
 dnl }}}
 done
 AC_SUBST([CY_ARCH])
 dnl }}}

+dnl iOS SDK {{{
+AC_PATH_PROG([XCODEBUILD], [xcodebuild])
+
+AS_IF([test "x$XCODEBUILD" != x], [
+    AC_SUBST([CY_IOS_SIMULATOR], [`xcodebuild -sdk iphonesimulator -version Path`])
+])
+
+AM_CONDITIONAL([CY_IOS_SIMULATOR], [test "x$CY_IOS_SIMULATOR" != x])
+dnl }}}

 
 AC_DEFUN([CY_LT_LIB], [
     cy_save=$LIBS
 
 AC_DEFUN([CY_LT_LIB], [
     cy_save=$LIBS


@@ -161,7 +170,7 @@ AC_DEFUN([CY_LT_LIB], [
 
 dnl --enable-javascript {{{
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
 
 dnl --enable-javascript {{{
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [

-    AC_CHECK_FRAMEWORK([JavaScriptCore], [
+    CY_LT_LIB([LTJAVASCRIPTCORE], [AC_CHECK_FRAMEWORK([JavaScriptCore], [

         #include <JavaScriptCore/JSBase.h>
     ], [
         JSEvaluateScript(0, 0, 0, 0, 0, 0);
         #include <JavaScriptCore/JSBase.h>
     ], [
         JSEvaluateScript(0, 0, 0, 0, 0, 0);


@@ -171,11 +180,11 @@ AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
         for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do
             PKG_CHECK_MODULES([WEBKIT], [$cy_webkit_pkg], [
                 AC_SUBST([CY_EXECUTE], [1])
         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([CPPFLAGS], [`$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
                 AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs $cy_webkit_pkg`])
             ], [:]); if test "x$CY_EXECUTE" = x1; then break; fi
         done

-    ])
+    ])])

 ])
 
 AC_DEFUN([CY_CHECK_JAVASCRIPT], [
 ])
 
 AC_DEFUN([CY_CHECK_JAVASCRIPT], [


@@ -207,7 +216,7 @@ dnl }}}
 
 AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
     PKG_CHECK_MODULES([LIBFFI], [libffi], [
 
 AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
     PKG_CHECK_MODULES([LIBFFI], [libffi], [

-        CY_COMPILE_FLAG([`$PKG_CONFIG --cflags libffi`])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [`$PKG_CONFIG --cflags libffi`])

         AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs libffi`])
     ], [AC_MSG_ERROR([missing "libffi"])])])
 
         AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs libffi`])
     ], [AC_MSG_ERROR([missing "libffi"])])])
 


@@ -232,7 +241,7 @@ AS_CASE([$CY_EXECUTE], [1], [
     ], [AC_MSG_RESULT([no])])
 
     AS_IF([test "x$CY_OBJECTIVEC" = x1], [
     ], [AC_MSG_RESULT([no])])
 
     AS_IF([test "x$CY_OBJECTIVEC" = x1], [

-        AC_CHECK_FRAMEWORK([CoreFoundation], [
+        CY_LT_LIB([LTOBJECTIVEC], [AC_CHECK_FRAMEWORK([CoreFoundation], [

             #include <CoreFoundation/CFBase.h>
         ], [CFAllocatorGetDefault();], [
             AC_SUBST([CY_OBJECTIVEC])
             #include <CoreFoundation/CFBase.h>
         ], [CFAllocatorGetDefault();], [
             AC_SUBST([CY_OBJECTIVEC])


@@ -240,10 +249,6 @@ AS_CASE([$CY_EXECUTE], [1], [
             AC_CHECK_FRAMEWORK([Foundation], [
                 #include <Foundation/NSObject.h>
             ], [[[[NSObject alloc] init];]])
             AC_CHECK_FRAMEWORK([Foundation], [
                 #include <Foundation/NSObject.h>
             ], [[[[NSObject alloc] init];]])

-
-            AC_CHECK_FRAMEWORK([WebKit], [
-                #include <WebKit/WebScriptObject.h>
-            ], [[[[WebScriptObject alloc] init];]])

         ], [
             AC_ARG_VAR([GNUSTEP_CONFIG], [prints information about the current gnustep installation])
             AC_CHECK_PROGS([GNUSTEP_CONFIG], [gnustep-config])
         ], [
             AC_ARG_VAR([GNUSTEP_CONFIG], [prints information about the current gnustep installation])
             AC_CHECK_PROGS([GNUSTEP_CONFIG], [gnustep-config])


@@ -253,7 +258,7 @@ AS_CASE([$CY_EXECUTE], [1], [
                 AC_LIB_APPENDTOVAR([OBJCXXFLAGS], [`$GNUSTEP_CONFIG --objc-flags`])
                 AC_LIB_APPENDTOVAR([LIBS], [`$GNUSTEP_CONFIG --base-libs`])
             ], [AC_SUBST([CY_OBJECTIVEC], [0])])
                 AC_LIB_APPENDTOVAR([OBJCXXFLAGS], [`$GNUSTEP_CONFIG --objc-flags`])
                 AC_LIB_APPENDTOVAR([LIBS], [`$GNUSTEP_CONFIG --base-libs`])
             ], [AC_SUBST([CY_OBJECTIVEC], [0])])

-        ])
+        ])])

     ])
 
     AC_LANG_POP([Objective C++])
     ])
 
     AC_LANG_POP([Objective C++])