--- mozilla/js/ctypes/Makefile.in.old	2010-05-28 22:48:37.979725703 +0800
+++ mozilla/js/ctypes/Makefile.in	2010-05-28 22:49:28.989493230 +0800
@@ -96,7 +96,7 @@
 
 # build libffi proper
 LOCAL_INCLUDES = \
-    -Ilibffi/include \
+    `pkg-config --cflags libffi` \
     $(NULL)
 
 ifeq ($(OS_ARCH),OS2)
@@ -104,9 +104,7 @@
 	emxomf $<
 endif
 
-SHARED_LIBRARY_LIBS = \
-    libffi/.libs/$(LIB_PREFIX)ffi.$(LIB_SUFFIX) \
-    $(NULL)
+OS_LIBS += `pkg-config --libs libffi`
 
 endif # _MSVC_VER
 
--- mozilla/configure.old	2010-05-28 22:46:59.926484237 +0800
+++ mozilla/configure	2010-05-28 22:48:18.660240139 +0800
@@ -24063,6 +24063,8 @@
       ac_configure_args="$ac_configure_args --build=$build --host=$target"
     fi
     if test "$SOLARIS_SUNPRO_CC"; then
+      # Build against system libffi
+      if 0; then
       # Always use gcc for libffi on Solaris
       old_cache_file=$cache_file
       cache_file=js/ctypes/libffi/config.cache
@@ -24166,6 +24168,7 @@
 fi
 
       cache_file=$old_cache_file
+fi
     else
       
 if test "$no_recursion" != yes; then