Add an initial (inefficient) version of ?: syntax.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9f94b81a729ea9097b615ef2bd3a393d908709fb..4c5d65cac8fde5c1c04d7e8f1da9c71386000c3e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,12 @@ 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])

 
 

+AC_PROG_CC

 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 +42,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 +103,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([OBJCCXXFLAGS], ]$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[)


@@ -123,18 +119,34 @@ AC_DEFUN([CY_TEST_FLAG_], [
 AC_DEFUN([CY_TEST_FLAG], [
     CY_TEST_FLAG_(]$1[, [C], [CFLAGS], [cc])
     CY_TEST_FLAG_(]$1[, [C++], [CXXFLAGS], [c++])
 AC_DEFUN([CY_TEST_FLAG], [
     CY_TEST_FLAG_(]$1[, [C], [CFLAGS], [cc])
     CY_TEST_FLAG_(]$1[, [C++], [CXXFLAGS], [c++])

-    CY_TEST_FLAG_(]$1[, [Objective C++], [OBJCCXXFLAGS], [c++ -ObjC])
+    CY_TEST_FLAG_(]$1[, [Objective C++], [OBJCXXFLAGS], [c++ -ObjC])

 ])
 
 AX_CFLAGS_WARN_ALL
 AX_CXXFLAGS_WARN_ALL
 ])
 
 AX_CFLAGS_WARN_ALL
 AX_CXXFLAGS_WARN_ALL

+AX_FLAGS_WARN_ALL
+
+CY_TEST_FLAG([-Werror])

 
 

+dnl XXX: this is used to support GNU Objective-C struct objc_method
+CY_TEST_FLAG([-Wno-deprecated-declarations])
+
+CY_TEST_FLAG([-Wno-dangling-else])

 CY_TEST_FLAG([-Wno-overloaded-virtual])
 CY_TEST_FLAG([-Wno-parentheses])
 CY_TEST_FLAG([-Wno-unneeded-internal-declaration])
 
 CY_TEST_FLAG([-Wno-overloaded-virtual])
 CY_TEST_FLAG([-Wno-parentheses])
 CY_TEST_FLAG([-Wno-unneeded-internal-declaration])
 

+AC_DEFUN([CY_LT_LIB], [
+    cy_save=$LIBS
+    LIBS=
+    ]$2[
+    ]$1[=$LIBS
+    LIBS=$cy_save
+    AC_SUBST(]$1[)
+])
+

 dnl -arch * {{{
 dnl -arch * {{{

-for cy_arch in ppc ppc64 i386 x86_64 armv6; do
+for cy_arch in ppc ppc64 i386 x86_64 armv6 arm64; do

     AC_MSG_CHECKING([for -arch $cy_arch])
     CY_TRY([CXXFLAGS], ["-arch $cy_arch"], [
         AC_TRY_LINK([], [], [CY_SUCCESS], [CY_FAILURE])
     AC_MSG_CHECKING([for -arch $cy_arch])
     CY_TRY([CXXFLAGS], ["-arch $cy_arch"], [
         AC_TRY_LINK([], [], [CY_SUCCESS], [CY_FAILURE])


@@ -146,27 +158,9 @@ done
 AC_SUBST([CY_ARCH])
 dnl }}}
 
 AC_SUBST([CY_ARCH])
 dnl }}}
 

-AC_DEFUN([CY_LT_LIB], [
-    cy_save=$LIBS
-    LIBS=
-    ]$2[
-    ]$1[=$LIBS
-    LIBS=$cy_save
-    AC_SUBST(]$1[)
-])
-
-dnl --with-frameworks {{{
-AC_ARG_WITH([frameworks], [AS_HELP_STRING(
-    [--with-frameworks=DIRS],
-    [add to DIRS (space separated) to the Darwin include path for frameworks with -F]
-)], [
-    for cy_framework in $withval; do
-        CY_COMPILE_FLAG([-F$cy_framework])
-    done
-]) dnl }}}

 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);


@@ -176,11 +170,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], [


@@ -201,18 +195,28 @@ AC_ARG_ENABLE([javascript], [AS_HELP_STRING(
 ], [CY_CHECK_JAVASCRIPT])
 dnl }}}
 
 ], [CY_CHECK_JAVASCRIPT])
 dnl }}}
 

+AC_ARG_ENABLE([console], AS_HELP_STRING([--disable-console], [disable console]))
+AM_CONDITIONAL([CY_CONSOLE], [test "x$enable_console" != "xno"])
+
+AM_COND_IF([CY_CONSOLE], [

 dnl APR_FIND_APR {{{
 dnl APR_FIND_APR {{{

-APR_FIND_APR([], [], [1], [1])
+AS_IF([test "x$LTLIBAPR" != x], [
+    AC_SUBST([LTLIBAPR])
+], [
+    APR_FIND_APR([], [], [1], [1])

 AS_CASE([$apr_found], [yes], [
     AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])
     AC_LIB_APPENDTOVAR([LTLIBAPR], [`$apr_config --link-libtool`])
     AC_SUBST([LTLIBAPR])
 AS_CASE([$apr_found], [yes], [
     AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])
     AC_LIB_APPENDTOVAR([LTLIBAPR], [`$apr_config --link-libtool`])
     AC_SUBST([LTLIBAPR])

-], [AC_MSG_ERROR([missing "libapr"])])
+], [
+    AC_MSG_ERROR([missing "libapr"])
+])])

 dnl }}}
 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"])])])
 


@@ -237,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])


@@ -245,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])


@@ -258,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++])


@@ -269,12 +269,9 @@ AM_CONDITIONAL([CY_OBJECTIVEC], [test "x$CY_OBJECTIVEC" = x1])
 CY_LT_LIB([LTLIBREADLINE], [AX_LIB_READLINE])
 AS_CASE([$ax_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])])
 
 CY_LT_LIB([LTLIBREADLINE], [AX_LIB_READLINE])
 AS_CASE([$ax_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])])
 

-CY_LT_LIB([LTLIBTERMCAP], [AC_SEARCH_LIBS([cur_term], [termcap])])
+CY_LT_LIB([LTLIBTERMCAP], [AC_SEARCH_LIBS([cur_term], [termcap ncurses])])

 
 

-AC_LANG_PUSH([C])
-AM_ICONV
-AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([missing "libiconv"])])
-AC_LANG_POP([C])
+AC_SUBST([LTLIBGCC])

 
 AC_SUBST([LTFLAGS])
 AC_SUBST([SO], [$acl_shlibext])
 
 AC_SUBST([LTFLAGS])
 AC_SUBST([SO], [$acl_shlibext])