seed r177 - in trunk: . libseed src

[hortont svn gnome org]

Author: hortont
Date: Sat Nov  8 01:10:43 2008
New Revision: 177
URL: http://svn.gnome.org/viewvc/seed?rev=177&view=rev

Log:
Check for libffi headers during configure!



Modified:
   trunk/configure.ac
   trunk/libseed/Makefile.in
   trunk/src/Makefile.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Nov  8 01:10:43 2008
@@ -12,9 +12,6 @@
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 
-
-
-
 dnl ***************************************************************************
 dnl Internationalization
 dnl ***************************************************************************
@@ -24,17 +21,47 @@
 AM_GLIB_GNU_GETTEXT
 IT_PROG_INTLTOOL([0.35.0])
 
-
-
 AM_PROG_LIBTOOL
 
+dnl libffi
+PKG_CHECK_MODULES(FFI, libffi, have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no)
 
+if test x"$have_ffi_pkgconfig" = xno ; then
+  AC_MSG_CHECKING(for ffi.h)
 
+  AC_TRY_CPP([#include <ffi.h>], have_ffi_h=yes, have_ffi_h=no)
+  if test x"$have_ffi_h" = x"yes"; then
 
-
+    save_LIBS=$LIBS
+    if test x"$with_ffi" = x"yes" || test x"$with_ffi" = x"auto"; then
+      other_LIBS=
+    else
+      other_LIBS=$with_ffi
+    fi
+
+    AC_SEARCH_LIBS(ffi_call,ffi,,AC_MSG_ERROR([libffi not found]),$other_LIBS)
+    if test x"$ac_cv_search_ffi_call" = x"none required" ; then
+      FFI_LIBS=$other_LIBS
+    else
+      FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS"
+    fi
+
+    LIBS=$save_LIBS
+  fi
+  if test x"$have_ffi_h" != x"yes" ; then
+    AC_MSG_ERROR([ffi.h not found])
+  fi
+
+  FFI_CFLAGS=
+
+  AC_MSG_RESULT([$have_ffi_h])
+  AC_SUBST(FFI_LIBS)
+  AC_SUBST(FFI_CFLAGS)
+fi
 
 PKG_CHECK_MODULES(LIBSEED, gobject-introspection-1.0 webkit-1.0)
 PKG_CHECK_MODULES(SEED, gobject-introspection-1.0 webkit-1.0)
+
 AC_CONFIG_FILES([
 seed.pc])
 AC_OUTPUT([

Modified: trunk/libseed/Makefile.in
==============================================================================
--- trunk/libseed/Makefile.in	(original)
+++ trunk/libseed/Makefile.in	Sat Nov  8 01:10:43 2008
@@ -103,6 +103,8 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FFI_CFLAGS = @FFI_CFLAGS@
+FFI_LIBS = @FFI_LIBS@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@

Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in	(original)
+++ trunk/src/Makefile.in	Sat Nov  8 01:10:43 2008
@@ -95,6 +95,8 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FFI_CFLAGS = @FFI_CFLAGS@
+FFI_LIBS = @FFI_LIBS@
 FGREP = @FGREP@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@