[typelib] Remove space/indent mismatch

[gnome.gobject-introspection] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2567702..6ea2707 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, 3)
+m4_define(gi_micro_version, 9)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ(2.59)
@@ -12,6 +12,9 @@ AC_INIT(gobject-introspection, gi_version,
         http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection)
 AM_INIT_AUTOMAKE([1.7 -Wno-portability])
 AM_MAINTAINER_MODE
+
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
+
 AC_CONFIG_HEADER([config.h])
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -41,7 +44,7 @@ if test "$LEX" = :; then
        AC_MSG_ERROR([flex not found but required])
 fi
 
-AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc, :)
+AC_CHECK_PROGS(YACC, 'bison -y', :)
 if test "$YACC" = :; then
        AC_MSG_ERROR([bison not found but required])
 fi
@@ -126,8 +129,12 @@ 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)
-
-if test x"$have_ffi_pkgconfig" = xno ; then
+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)
@@ -153,12 +160,16 @@ if test x"$have_ffi_pkgconfig" = xno ; 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>])
 
@@ -200,7 +211,6 @@ case "$host" in
 esac
 AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found]))
 
-SHAVE_INIT([scripts])
 AC_CONFIG_FILES([
 Makefile
 gir/Makefile
@@ -208,8 +218,6 @@ girepository/Makefile
 giscanner/Makefile
 giscanner/config.py
 m4/Makefile
-scripts/shave
-scripts/shave-libtool
 tools/Makefile
 tests/Makefile
 tests/invoke/Makefile
@@ -219,5 +227,6 @@ tests/repository/Makefile
 examples/Makefile
 docs/Makefile
 docs/reference/Makefile
-gobject-introspection-1.0.pc])
+gobject-introspection-1.0.pc
+gobject-introspection-no-export-1.0.pc])
 AC_OUTPUT