[STRIP_SUFFIX]

[gnome.gobject-introspection] / configure.ac

diff --git a/configure.ac b/configure.ac
index f5f723c..ac8a44a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 dnl the gi version number
 m4_define(gi_major_version, 0)
 m4_define(gi_minor_version, 6)
-m4_define(gi_micro_version, 6)
+m4_define(gi_micro_version, 9)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ(2.59)
@@ -127,10 +127,58 @@ AM_CONDITIONAL(HAVE_GIO_UNIX, test x$have_gio_unix = xtrue)
 
 PKG_CHECK_MODULES(SCANNER, [gobject-2.0 gthread-2.0 gio-2.0])
 
+dnl libffi
+PKG_CHECK_MODULES(FFI, libffi, have_ffi_pkgconfig=yes, have_ffi_pkgconfig=no)
+FFI_PC_CFLAGS=""
+FFI_PC_LIBS=""
+FFI_PC_PACKAGES=""
+if test x"$have_ffi_pkgconfig" = xyes ; then
+    FFI_PC_PACKAGES="libffi"
+else
+  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_PC_LIBS=$FFI_LIBS
+  FFI_PC_CFLAGS=$FFI_CFLAGS
+  FFI_CFLAGS=
+  AC_MSG_RESULT([$have_ffi_h])
+  AC_SUBST(FFI_LIBS)
+  AC_SUBST(FFI_CFLAGS)
+fi
+AC_SUBST(FFI_PC_CFLAGS)
+AC_SUBST(FFI_PC_LIBS)
+AC_SUBST(FFI_PC_PACKAGES)
 
 AC_CHECK_SIZEOF(time_t, [], [#include <time.h>])
 
-PKG_CHECK_MODULES(GIREPO, [glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 libffi])
+PKG_CHECK_MODULES(GIREPO, [glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0])
+
+# if we ever remove manual check for ffi and require .pc file, then 
+# just put libffi in the PKG_CHECK_MODULES(GIREPO) deps
+GIREPO_LIBS="$GIREPO_LIBS $GCOV_LIBS $FFI_LIBS"
+GIREPO_CFLAGS="$GIREPO_CFLAGS $FFI_CFLAGS"
 
 GIREPO_CFLAGS="$GIREPO_CFLAGS $GCOV_CFLAGS"
 
@@ -163,6 +211,21 @@ case "$host" in
 esac
 AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found]))
 
+# Glib documentation
+
+GLIBSRC=
+AC_MSG_CHECKING([for glib source directory to use for documentation])
+
+AC_ARG_WITH(glib-src,
+       [  --with-glib-src=PATH    Source directory for glib - needed to add docs to gir],
+       GLIBSRC=$withval
+) 
+AM_CONDITIONAL(WITH_GLIBSRC, test x"$GLIBSRC" != x)
+AC_SUBST(GLIBSRC)
+AC_MSG_RESULT([$GLIBSRC])
+
+
+
 AC_CONFIG_FILES([
 Makefile
 gir/Makefile