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

diff --git a/AUTHORS b/AUTHORS
index b2d0bf257d52763ef967195f0498e7ea58349b83..446dc4ba109caf9152cf1f25302cc12cd0b274ca 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,4 +24,5 @@ Frederic Peters <fpeters@0d.be>
 Cosimo Cecchi <cosimoc@gnome.org>
 Vincent Untz <vuntz@gnome.org>
 Felix Riemann <friemann@gnome.org>
-Cédric Bosdonnat <cedric.bosdonnat@gmail.com>
+Cédric Bosdonnat <cedric.bosdonnat@free.fr>
+Halton Huo <halton.huo@sun.com>

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

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