Add pkg-config --cflags to CPPFLAGS, not C*FLAGS.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b0de8840d1220090bf7a02b9e12a1531d0f85004..b694b61f8c53437280aa3f92199ac6857a7022cb 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_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])

+AC_CONFIG_HEADERS([config.h])

 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 


@@ -38,10 +39,6 @@ AC_LANG([C++])
 
 PKG_PROG_PKG_CONFIG([0.22])
 
 
 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])
 AC_PATH_PROG([_BASH], [bash], [AC_MSG_ERROR([missing "bash"])])
 AC_PATH_PROG([GIT], [git])
 AC_PATH_PROG([TIME], [time])


@@ -104,26 +101,32 @@ 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_MSG_CHECKING([for ]]$1[)
-    CY_TRY([CXXFLAGS], $1, [
+AC_DEFUN([CY_TEST_FLAG_], [
+    AC_LANG_PUSH(]$2[)
+    AC_MSG_CHECKING([for ]]$4[[ ]]$1[)
+    CY_TRY(]$3[, $1, [

         AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],
             [CY_SUCCESS], [CY_FAILURE])
     ], [
         AC_MSG_RESULT([yes])
         AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],
             [CY_SUCCESS], [CY_FAILURE])
     ], [
         AC_MSG_RESULT([yes])

-        CY_COMPILE_FLAG($1)
+        AC_LIB_APPENDTOVAR(]$3[, ]$1[)

     ], [AC_MSG_RESULT([no])])
     ], [AC_MSG_RESULT([no])])

+    AC_LANG_POP(]$2[)
+])
+
+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++], [OBJCXXFLAGS], [c++ -ObjC])

 ])
 
 AX_CFLAGS_WARN_ALL
 AX_CXXFLAGS_WARN_ALL
 
 ])
 
 AX_CFLAGS_WARN_ALL
 AX_CXXFLAGS_WARN_ALL
 

+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])


@@ -141,35 +144,31 @@ done
 AC_SUBST([CY_ARCH])
 dnl }}}
 
 AC_SUBST([CY_ARCH])
 dnl }}}
 

-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 }}}
+AC_DEFUN([CY_LT_LIB], [
+    cy_save=$LIBS
+    LIBS=
+    ]$2[
+    ]$1[=$LIBS
+    LIBS=$cy_save
+    AC_SUBST(]$1[)
+])
+

 dnl --enable-javascript {{{
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
 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_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])
                 AC_SUBST([CY_EXECUTE], [1])

-            ])
-        ])
+                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

     ])
 ])
 
     ])
 ])
 


@@ -202,7 +201,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], [

-        AC_LIB_APPENDTOVAR([CXXFLAGS], [`$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"])])])
 


@@ -210,12 +209,13 @@ AM_CONDITIONAL([CY_EXECUTE], [test "x$CY_EXECUTE" = x1])
 
 AS_CASE([$CY_EXECUTE], [1], [
     AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break])
 
 AS_CASE([$CY_EXECUTE], [1], [
     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], [
+
+    CY_LT_LIB([LTLIBFFI], AS_IF([test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno], [

         CY_CHECK_PKG_CONFIG_LIBFFI
     ], [
         AC_SEARCH_LIBS([ffi_call], [ffi])
         AS_CASE([$ac_cv_search_ffi_call], [no], [CY_CHECK_PKG_CONFIG_LIBFFI])
         CY_CHECK_PKG_CONFIG_LIBFFI
     ], [
         AC_SEARCH_LIBS([ffi_call], [ffi])
         AS_CASE([$ac_cv_search_ffi_call], [no], [CY_CHECK_PKG_CONFIG_LIBFFI])

-    ])
+    ]))

 
     AC_LANG_PUSH([Objective C++])
 
 
     AC_LANG_PUSH([Objective C++])
 


@@ -255,53 +255,26 @@ AS_CASE([$CY_EXECUTE], [1], [
 
 AM_CONDITIONAL([CY_OBJECTIVEC], [test "x$CY_OBJECTIVEC" = x1])
 
 
 AM_CONDITIONAL([CY_OBJECTIVEC], [test "x$CY_OBJECTIVEC" = x1])
 

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

 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([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])])
 

-dnl XXX: saurik doesn't understand what this does
-dnl AM_ICONV {{{

 AC_LANG_PUSH([C])
 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])
 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_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])
 AM_CONDITIONAL([CY_MACH], [test "x$CY_MACH" = x1])
 
 AC_CONFIG_FILES([Makefile])