--- libglade-0.17/glade/Makefile.am	2009-04-20 20:54:24.000000000 +0100
+++ libglade-0.17/glade/Makefile.am	2009-04-20 20:59:54.000000000 +0100
@@ -43,12 +43,14 @@
 	$(build_glade_gnomedb)
 
 libglade_la_SOURCES  = $(the_sources)
-libglade_la_LIBADD   = $(GTK_LIBS) $(XML_LIBS)
+libglade_la_LIBADD   = $(filter-out -ldl -lm -lX11 -lXext -lXi, $(GTK_LIBS) $(XML_LIBS))
 libglade_la_LDFLAGS  = -version-info $(LTVERSION)
+libglade_la_DEPENDENCIES =
 
 libglade_gnome_la_SOURCES  = glade-gnome.c glade-build.h glade-xml.h
-libglade_gnome_la_LIBADD   = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
+libglade_gnome_la_LIBADD   = libglade.la $(filter-out -ldl -lm -lart_lgpl -laudiofile -lesd -lgmodule -lgnomesupport -lxml -lSM -lICE -lX11 -lXext -lXi, $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS))
 libglade_gnome_la_LDFLAGS  = -version-info $(LTVERSION)
+libglade_gnome_la_DEPENDENCIES = libglade.la
 
 libglade_bonobo_la_SOURCES  = glade-bonobo.c glade-build.h glade-xml.h
 libglade_bonobo_la_LIBADD   = $(BONOBO_LIBS) $(XML_LIBS)
--- libglade-0.17/glade/Makefile.in	2009-04-20 20:54:30.000000000 +0100
+++ libglade-0.17/glade/Makefile.in	2009-04-20 21:00:09.000000000 +0100
@@ -172,12 +172,14 @@
 
 
 libglade_la_SOURCES = $(the_sources)
-libglade_la_LIBADD = $(GTK_LIBS) $(XML_LIBS)
+libglade_la_LIBADD = $(filter-out -ldl -lm -lX11 -lXext -lXi, $(GTK_LIBS) $(XML_LIBS))
 libglade_la_LDFLAGS = -version-info $(LTVERSION)
+libglade_la_DEPENDENCIES = 
 
 libglade_gnome_la_SOURCES = glade-gnome.c glade-build.h glade-xml.h
-libglade_gnome_la_LIBADD = libglade.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS)
+libglade_gnome_la_LIBADD = libglade.la $(filter-out -ldl -lm -lart_lgpl -laudiofile -lesd -lgmodule -lgnomesupport -lxml -lSM -lICE -lX11 -lXext -lXi, $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(XML_LIBS))
 libglade_gnome_la_LDFLAGS = -version-info $(LTVERSION)
+libglade_gnome_la_DEPENDENCIES = libglade.la
 
 libglade_bonobo_la_SOURCES = glade-bonobo.c glade-build.h glade-xml.h
 libglade_bonobo_la_LIBADD = $(BONOBO_LIBS) $(XML_LIBS)
@@ -203,13 +205,11 @@
 libglade_bonobo_la_DEPENDENCIES =
 am_libglade_bonobo_la_OBJECTS = glade-bonobo.lo
 libglade_bonobo_la_OBJECTS = $(am_libglade_bonobo_la_OBJECTS)
-libglade_gnome_la_DEPENDENCIES =
 am_libglade_gnome_la_OBJECTS = glade-gnome.lo
 libglade_gnome_la_OBJECTS = $(am_libglade_gnome_la_OBJECTS)
 libglade_gnomedb_la_DEPENDENCIES =
 am_libglade_gnomedb_la_OBJECTS = glade-gnomedb.lo
 libglade_gnomedb_la_OBJECTS = $(am_libglade_gnomedb_la_OBJECTS)
-libglade_la_DEPENDENCIES =
 am_libglade_la_OBJECTS = glade-init.lo glade-sax.lo glade-xml.lo \
 	glade-gtk.lo glade-tree.lo
 libglade_la_OBJECTS = $(am_libglade_la_OBJECTS)
--- libglade-0.17/ltmain.sh	2001-09-05 03:58:41.000000000 +0100
+++ libglade-0.17/ltmain.sh	2009-04-20 17:09:38.000000000 +0100
@@ -754,6 +757,7 @@
     linker_flags=
     dllsearchpath=
     lib_search_path=`pwd`
+    inst_prefix_dir=
 
     avoid_version=no
     dlfiles=
@@ -884,6 +888,11 @@
 	  prev=
 	  continue
 	  ;;
+        inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
 	release)
 	  release="-$arg"
 	  prev=
@@ -985,6 +994,11 @@
 	continue
 	;;
 
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
       # so, if we see these flags be careful not to treat them like -L
       -L[A-Z][A-Z]*:*)
@@ -1872,7 +1885,16 @@
 	    if test "$hardcode_direct" = yes; then
 	      add="$libdir/$linklib"
 	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      add_dir=
+	      if test -n "$inst_prefix_dir"; then
+		case "$libdir" in
+		[\\/]*)
+		  add_dir="-L$inst_prefix_dir$libdir"
+		  ;;
+		esac
+	      fi
+	      add_dir="$add_dir -L$libdir"
 	      add="-l$name"
 	    elif test "$hardcode_shlibpath_var" = yes; then
 	      case :$finalize_shlibpath: in
@@ -1882,11 +1904,21 @@
 	      add="-l$name"
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      add_dir=
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case "$libdir" in
+ 		[\\/]*)
+ 		  add_dir="-L$inst_prefix_dir$libdir"
+ 		  ;;
+ 		esac
+ 	      fi
+ 	      add_dir="$add_dir -L$libdir"
+
 	      add="-l$name"
 	    fi
 
-	    if test $linkmode = prog; then
+	    if test "$linkmode" = prog; then
 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	    else
@@ -3856,7 +3888,7 @@
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
+      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@"
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
 
       # Only create the output if not a dry run.
@@ -4157,12 +4189,30 @@
 	dir="$dir$objdir"
 
 	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  if test "$inst_prefix_dir" = "$destdir"; then
+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+	    exit 1
+	  fi
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
+	  fi
+
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
 	  $show "$relink_command"
 	  if $run eval "$relink_command"; then :
 	  else
 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    continue
+	    exit 1
 	  fi
 	fi