[gir-repository] Use --library=libgirepo*.la for scanning custom libraries

[Owen Taylor <otaylor src gnome org>]

commit e42bc267f3d4b17d51cf440289cc87384d252f04
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Mon Aug 17 13:13:47 2009 -0400

    Use --library=libgirepo*.la for scanning custom libraries
    
    When scanning custom libraries, use --library=libgirepo*.la to find
    the uninstalled version reliably.
    
    Up gobject-introspection requirement to 0.6.4 to get that capability.
    
    Set LD_LIBRARY_PATH to include .libs when running the typelib compiler.
    
    http://bugzilla.gnome.org/show_bug.cgi?id=592113

 configure.ac    |    2 +-
 gir/Makefile.am |   14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index af09164..995cd72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 # GObject Introspection
-GOBJECT_INTROSPECTION_REQUIRE(0.6.3)
+GOBJECT_INTROSPECTION_REQUIRE(0.6.4)
 
 dnl dbus
 PKG_CHECK_MODULES(DBUS, dbus-glib-1,
diff --git a/gir/Makefile.am b/gir/Makefile.am
index cc60a97..77cedae 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -33,7 +33,7 @@ DBus-1.0.gir: libgirepo-DBus-custom.la
 	$(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
             --include=GObject-2.0 \
-	    --library=girepo-DBus-custom \
+	    --library=libgirepo-DBus-custom.la \
             --library=dbus-glib-1 \
 	    --libtool="$(LIBTOOL)" \
             --output $@ \
@@ -275,7 +275,7 @@ Gdk-2.0.gir: Pango-1.0.gir GdkPixbuf-2.0.gir libgirepo-Gdk-custom.la $(INTROSPEC
 	     $(GDK_TARGET_GIRS:%=--include=%) \
              --include=GdkPixbuf-2.0 \
 	     --library=gdk-$(GDK_TARGET)-2.0 \
-	     --library=girepo-Gdk-custom \
+	     --library=libgirepo-Gdk-custom.la \
 	     --libtool="$(LIBTOOL)" \
              --output $@ \
              --pkg gobject-2.0 \
@@ -300,7 +300,7 @@ Gtk-2.0.gir: Pango-1.0.gir Atk-1.0.gir GdkPixbuf-2.0.gir Gdk-2.0.gir libgirepo-G
              --include=GdkPixbuf-2.0 \
              --include=Gdk-2.0 \
 	     --library=gtk-$(GDK_TARGET)-2.0 \
-	     --library=girepo-Gtk-custom \
+	     --library=libgirepo-Gtk-custom.la \
 	     --libtool="$(LIBTOOL)" \
              --pkg gobject-2.0 \
              --pkg gio-2.0 \
@@ -439,7 +439,7 @@ Clutter-0.8.gir: libgirepo-Clutter-custom.la ClutterJson-0.8.gir GdkPixbuf-2.0.g
              --include=GdkPixbuf-2.0 \
              --include=ClutterJson-0.8 \
 	     --library=clutter-$(CLUTTER_BACKEND)-0.8 \
-	     --library=girepo-Clutter-custom \
+	     --library=libgirepo-Clutter-custom.la \
 	     --libtool="$(LIBTOOL)" \
              --pkg gobject-2.0 \
              --pkg clutter-$(CLUTTER_BACKEND)-0.8 \
@@ -974,10 +974,12 @@ vpath %.gir $(srcdir)
 	$(INTROSPECTION_SCANNER) --xpath-assertions=$(srcdir)/$*.xpath $*.gir
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $@
+	LD_LIBRARY_PATH=.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \
+		$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $@
 
 %.typelib.gdb: %.gir
-	libtool --mode=execute gdb --args $(INTROSPECTION_COMPILER) $< -o $@
+	LD_LIBRARY_PATH=.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \
+		libtool --mode=execute gdb --args $(INTROSPECTION_COMPILER) $< -o $@
 
 %.tgir: %.typelib $(INTROSPECTION_GENERATE) Makefile
 	 $(DEBUG) $(INTROSPECTION_GENERATE) --includedir=$(srcdir) --includedir=. $< -o $@