It successfully compiles on a Mac. Compiles, that's all.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f9caba8d1769ea3d5d5c011ed4d0e5d6b98410a2..3fe159f2910c2993e42a6b4ee708b52a6d1b35f1 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -15,7 +15,7 @@ flex := @FLEX@
 libtool := @LIBTOOL@
 cxx := @CXX@
 objcxx := @OBJCXX@
-cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1
+cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 @DEFS@
 objcxxflags := @OBJCXXFLAGS@
 ldflags := @LDFLAGS@
 library := @LIBS@ @LTLIBAPR@ @LTLIBICONV@

diff --git a/JavaScript.hpp b/JavaScript.hpp
index a3e9f0a7d7021fac0725b1f2f54a692e512bbb15..f5c487d5144928b789ae5d54b0d723f097f7b409 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -46,7 +46,11 @@
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 
+#ifdef HAVE_FFI_FFI_H
+#include <ffi/ffi.h>
+#else
 #include <ffi.h>
+#endif
 
 extern JSStringRef Array_s;
 extern JSStringRef cy_s;

diff --git a/configure b/configure
index 32228f3a7e42c7c43827c9b6a50fc00eaa684c59..c3a72257138476cca7ed6fca657cb6bcf6b4c00c 100755 (executable)
--- a/configure
+++ b/configure
@@ -15529,9 +15529,35 @@ fi
 
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                CY_EXECUTE=0
+
+               for ac_header in JavaScriptCore/JSBase.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "JavaScriptCore/JSBase.h" "ac_cv_header_JavaScriptCore_JSBase_h" "$ac_includes_default"
+if test "x$ac_cv_header_JavaScriptCore_JSBase_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_JAVASCRIPTCORE_JSBASE_H 1
+_ACEOF
+ CY_EXECUTE=1
+fi
+
+done
+
+
 elif test $pkg_failed = untried; then
-       CY_EXECUTE=0
+
+               for ac_header in JavaScriptCore/JSBase.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "JavaScriptCore/JSBase.h" "ac_cv_header_JavaScriptCore_JSBase_h" "$ac_includes_default"
+if test "x$ac_cv_header_JavaScriptCore_JSBase_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_JAVASCRIPTCORE_JSBASE_H 1
+_ACEOF
+ CY_EXECUTE=1
+fi
+
+done
+
+
 else
        WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS
        WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS
@@ -15651,9 +15677,35 @@ fi
 
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                CY_EXECUTE=0
+
+               for ac_header in JavaScriptCore/JSBase.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "JavaScriptCore/JSBase.h" "ac_cv_header_JavaScriptCore_JSBase_h" "$ac_includes_default"
+if test "x$ac_cv_header_JavaScriptCore_JSBase_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_JAVASCRIPTCORE_JSBASE_H 1
+_ACEOF
+ CY_EXECUTE=1
+fi
+
+done
+
+
 elif test $pkg_failed = untried; then
-       CY_EXECUTE=0
+
+               for ac_header in JavaScriptCore/JSBase.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "JavaScriptCore/JSBase.h" "ac_cv_header_JavaScriptCore_JSBase_h" "$ac_includes_default"
+if test "x$ac_cv_header_JavaScriptCore_JSBase_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_JAVASCRIPTCORE_JSBASE_H 1
+_ACEOF
+ CY_EXECUTE=1
+fi
+
+done
+
+
 else
        WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS
        WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS

diff --git a/configure.ac b/configure.ac
index da35efbf0b86a45a2cbebde442d6373fadd4b00e..452ab46b9f347065d2bf9cd7209724e81a59f996 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,9 @@ PKG_CHECK_MODULES([WEBKIT], [webkit-1.0], [
                CY_EXECUTE=1
                AC_LIB_APPENDTOVAR([CXXFLAGS], [`$PKG_CONFIG --cflags WebKitGtk`])
                AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs WebKitGtk`])
-       ], [CY_EXECUTE=0])
+       ], [
+               AC_CHECK_HEADERS([JavaScriptCore/JSBase.h], [CY_EXECUTE=1])
+       ])
 ])
 AC_PROG_OBJCXX
 AS_CASE([$CY_EXECUTE], [1], [

diff --git a/sig/copy.cpp b/sig/copy.cpp
index f6174de77acf4c40f6bd97494e8b867913df5f97..2b0996a6f61eebca56a25b0f30ac27594cf3d507 100644 (file)
--- a/sig/copy.cpp
+++ b/sig/copy.cpp
@@ -44,7 +44,12 @@
 #include <apr_strings.h>
 #include "Pooling.hpp"
 #include "sig/parse.hpp"
+
+#ifdef HAVE_FFI_FFI_H
+#include <ffi/ffi.h>
+#else
 #include <ffi.h>
+#endif
 
 namespace sig {
 

diff --git a/sig/ffi_type.hpp b/sig/ffi_type.hpp
index bc7c9dc0664cc5f7d95567503109315ac917db9e..a37e6572a4bd29d78f96bc3554acc0fd5729c3eb 100644 (file)
--- a/sig/ffi_type.hpp
+++ b/sig/ffi_type.hpp
@@ -41,7 +41,12 @@
 #define SIG_FFI_TYPE_H
 
 #include <apr_pools.h>
+
+#ifdef HAVE_FFI_FFI_H
+#include <ffi/ffi.h>
+#else
 #include <ffi.h>
+#endif
 
 #include "sig/types.hpp"