From b128dfee9c57068e3c1a4a852dc4dc3dcc0332d6 Mon Sep 17 00:00:00 2001
From: Douglas William Thrift <douglas@douglasthrift.net>
Date: Thu, 1 Apr 2010 05:08:27 +0000
Subject: [PATCH] It successfully compiles on a Mac. Compiles, that's all.

---
 GNUmakefile.in   |  2 +-
 JavaScript.hpp   |  4 ++++
 configure        | 60 ++++++++++++++++++++++++++++++++++++++++++++----
 configure.ac     |  4 +++-
 sig/copy.cpp     |  5 ++++
 sig/ffi_type.hpp |  5 ++++
 6 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f9caba8..3fe159f 100644
--- 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 a3e9f0a..f5c487d 100644
--- 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 32228f3..c3a7225 100755
--- 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 da35efb..452ab46 100644
--- 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 f6174de..2b0996a 100644
--- 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 bc7c9dc..a37e657 100644
--- 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"
 
-- 
2.47.2