diff -Naur gnome-libs-1.4.2/configure gnome-libs-new/configure
--- gnome-libs-1.4.2/configure	2002-08-15 18:24:44.000000000 -0400
+++ gnome-libs-new/configure	2005-05-22 15:47:13.000000000 -0400
@@ -3578,14 +3578,14 @@
     ;;
 
   darwin* | rhapsody*)
-    allow_undefined_flag='-undefined suppress'
+    allow_undefined_flag='-undefined suppress -flat_namespace'
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts $(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-    hardcode_direct=yes
+    hardcode_direct=no
     hardcode_shlibpath_var=no
     whole_archive_flag_spec='-all_load $convenience'
     ;;
diff -Naur gnome-libs-1.4.2/gtk-xmhtml/Makefile.in gnome-libs-new/gtk-xmhtml/Makefile.in
--- gnome-libs-1.4.2/gtk-xmhtml/Makefile.in	2002-08-15 18:25:39.000000000 -0400
+++ gnome-libs-new/gtk-xmhtml/Makefile.in	2005-05-22 15:47:13.000000000 -0400
@@ -211,7 +211,7 @@
 
 htmltest_SOURCES = test.c
 
-htmltest_LDADD = libgtkxmhtml.la  $(LIBGTKXMHTML_LIBS) $(INTLLIBS)
+htmltest_LDADD = libgtkxmhtml.la $(LIBSUPPORT) $(LIBGTKXMHTML_LIBS) $(INTLLIBS)
 
 EXTRA_DIST = gtk-xmhtml.c XmHTML-motif.c 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff -Naur gnome-libs-1.4.2/gtk-xmhtml/colors.c gnome-libs-new/gtk-xmhtml/colors.c
--- gnome-libs-1.4.2/gtk-xmhtml/colors.c	2002-08-06 17:25:41.000000000 -0400
+++ gnome-libs-new/gtk-xmhtml/colors.c	2005-05-22 15:47:13.000000000 -0400
@@ -292,33 +292,6 @@
 #define BMASK		0xc0
 #define BSHIFT		6
 
-/* XXX: This function does an XQueryColors() the hard way, because there is
- * no corresponding function in Gdk.
- */
-#ifndef WITH_MOTIF
-static void
-my_x_query_colors(GdkColormap *colormap,
-		  GdkColor    *colors,
-		  gint         ncolors)
-{
-	XColor *xcolors;
-	gint    i;
-
-	xcolors = g_new(XColor, ncolors);
-	for (i = 0; i < ncolors; i++)
-		xcolors[i].pixel = colors[i].pixel;
-
-	XQueryColors(gdk_display, GDK_COLORMAP_XCOLORMAP(colormap), xcolors, ncolors);
-
-	for (i = 0; i < ncolors; i++) {
-		colors[i].red   = xcolors[i].red;
-		colors[i].green = xcolors[i].green;
-		colors[i].blue  = xcolors[i].blue;
-	}
-
-	g_free(xcolors);
-}
-#endif
 /*****
 * Name: 		tryColor
 * Return Type: 	Boolean
diff -Naur gnome-libs-1.4.2/libart_lgpl/configure gnome-libs-new/libart_lgpl/configure
--- gnome-libs-1.4.2/libart_lgpl/configure	2002-08-01 10:30:58.000000000 -0400
+++ gnome-libs-new/libart_lgpl/configure	2005-05-22 15:47:13.000000000 -0400
@@ -3329,14 +3329,14 @@
     ;;
 
   darwin* | rhapsody*)
-    allow_undefined_flag='-undefined suppress'
+    allow_undefined_flag='-undefined suppress -flat_namespace'
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts $(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-    hardcode_direct=yes
+    hardcode_direct=no
     hardcode_shlibpath_var=no
     whole_archive_flag_spec='-all_load $convenience'
     ;;
diff -Naur gnome-libs-1.4.2/libgnorba/Makefile.in gnome-libs-new/libgnorba/Makefile.in
--- gnome-libs-1.4.2/libgnorba/Makefile.in	2002-08-15 18:25:44.000000000 -0400
+++ gnome-libs-new/libgnorba/Makefile.in	2005-05-22 15:47:36.000000000 -0400
@@ -229,7 +229,7 @@
 
 
 libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir)
-libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
+libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) ../libgnome/libgnome.la $(GTK_LIBS) -lm
 
 loadshlib_SOURCES = loadshlib.c
 
diff -Naur gnome-libs-1.4.2/ltmain.sh gnome-libs-new/ltmain.sh
--- gnome-libs-1.4.2/ltmain.sh	2002-08-01 10:30:57.000000000 -0400
+++ gnome-libs-new/ltmain.sh	2005-05-22 15:47:13.000000000 -0400
@@ -1598,10 +1598,17 @@
 	    absdir="$libdir"
 	  fi
 	else
-	  dir="$ladir/$objdir"
-	  absdir="$abs_ladir/$objdir"
-	  # Remove this search path later
-	  notinst_path="$notinst_path $abs_ladir"
+          if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+            dir="$ladir"
+            absdir="$abs_ladir"
+            # Remove this search path later
+            notinst_path="$notinst_path $abs_ladir"
+          else
+            dir="$ladir/$objdir"
+            absdir="$abs_ladir/$objdir"
+            # Remove this search path later
+            notinst_path="$notinst_path $abs_ladir"
+          fi
 	fi # $installed = yes
 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
 
@@ -2862,6 +2869,11 @@
 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	  eval cmds=\"$archive_expsym_cmds\"
 	else
+	  if test "x$verstring" = "x0.0"; then
+	    tmp_verstring=
+	  else
+	    tmp_verstring="$verstring"
+	  fi
 	  eval cmds=\"$archive_cmds\"
 	fi
 	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
@@ -3549,7 +3561,7 @@
 # if CDPATH is set.
 if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
 
-relink_command=\"$relink_command\"
+relink_command=\"\"
 
 # This environment variable determines our operation mode.
 if test \"\$libtool_install_magic\" = \"$magic\"; then
@@ -3919,7 +3931,7 @@
 libdir='$install_libdir'"
 	  if test "$installed" = no && test $need_relink = yes; then
 	    $echo >> $output "\
-relink_command=\"$relink_command\""
+relink_command=\"\""
 	  fi
 	done
       fi
diff -Naur gnome-libs-1.4.2/po/Makefile.in.in gnome-libs-new/po/Makefile.in.in
--- gnome-libs-1.4.2/po/Makefile.in.in	2002-08-01 10:30:49.000000000 -0400
+++ gnome-libs-new/po/Makefile.in.in	2005-05-22 15:47:13.000000000 -0400
@@ -106,7 +106,10 @@
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+	  case "$$cat" in \
+	    *.gmo) lang=`echo $$cat | sed 's/\.gmo$$//'` ;; \
+	    *.mo)  lang=`echo $$cat | sed 's/\.mo$$//'` ;; \
+	  esac; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then \
diff -Naur gnome-libs-1.4.2/zvt/Makefile.in gnome-libs-new/zvt/Makefile.in
--- gnome-libs-1.4.2/zvt/Makefile.in	2002-08-15 18:25:41.000000000 -0400
+++ gnome-libs-new/zvt/Makefile.in	2005-05-22 15:47:13.000000000 -0400
@@ -611,7 +611,7 @@
 
 install-exec-local:
 	-file=$(DESTDIR)$(sbindir)/gnome-pty-helper; \
-	chown root $$file && chgrp root $$file && chmod u+s $$file
+	chown root $$file && chgrp admin $$file && chmod u+s $$file
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur gnome-libs-1.4.2/zvt/gnome-pty-helper.c gnome-libs-new/zvt/gnome-pty-helper.c
--- gnome-libs-1.4.2/zvt/gnome-pty-helper.c	2001-11-25 05:05:45.000000000 -0500
+++ gnome-libs-new/zvt/gnome-pty-helper.c	2005-05-22 15:47:14.000000000 -0400
@@ -646,10 +646,13 @@
 		if (getrlimit (sensible_limits [i].limit, &rlim) != 0)
 			continue;
 
-		if (rlim.rlim_cur != RLIM_INFINITY &&
-		    rlim.rlim_cur < sensible_limits [i].value){
-			fprintf (stderr, "Living environment not ok\n");
-			exit (1);
+		if (rlim.rlim_max != RLIM_INFINITY &&
+		    rlim.rlim_max < sensible_limits [i].value){
+			rlim.rlim_cur = sensible_limits [i].value;
+			if (setrlimit (sensible_limits [i].limit, &rlim) != 0) {
+				fprintf (stderr, "Living environment not ok\n");
+				exit (1);
+			}
 		}
 	}