Fix 595534 add --libtool to allow build pass on Solaris

diff --git a/AUTHORS b/AUTHORS
index 328eabf2673ef0ac24eb4a70cf3c204b4abe3eb9..9502c6779aaa548a2adddd111b1b760316576273 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,3 +24,4 @@ Frederic Peters <fpeters@0d.be>
 Cosimo Cecchi <cosimoc@gnome.org>
 Vincent Untz <vuntz@gnome.org>
 Felix Riemann <friemann@gnome.org>
+Halton Huo <halton.huo@sun.com>

diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 0a64f5c0e4b7a97c2f5ac48d5780254a4a21f07a..9e2a5c332ccb886677b4ae7bfc2ff69af3f64069 100644 (file)
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -49,6 +49,7 @@ GtkChamplain-0.4.gir: $(INTROSPECTION_SCANNER) libchamplain-gtk-0.4.la
        --include=Clutter-1.0 \
        --include=Gtk-2.0 \
        --library=champlain-gtk-0.4 \
+       --libtool="$(LIBTOOL)" \
        --output $@ \
        --pkg gobject-2.0 \
        --pkg gtk+-2.0 \

diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 26ae16e3ed702cd2e917c39e212db46f54ba0b64..4ac1cfef42d4e771e3d936b0e75a25337fa6884b 100644 (file)
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -170,6 +170,7 @@ Champlain-0.4.gir: $(INTROSPECTION_SCANNER) libchamplain-0.4.la
        --include=Clutter-1.0 \
        --include=Gtk-2.0 \
        --library=champlain-0.4 \
+       --libtool="$(LIBTOOL)" \
        --output $@ \
        --pkg gobject-2.0 \
        --pkg gtk+-2.0 \