diff -Naur libgnome-2.5.92-old/libgnome/gnome-config.c libgnome-2.5.92/libgnome/gnome-config.c
--- libgnome-2.5.92-old/libgnome/gnome-config.c	Thu May  1 07:31:38 2003
+++ libgnome-2.5.92/libgnome/gnome-config.c	Sun Mar 21 12:06:44 2004
@@ -100,6 +100,31 @@
 
 static TProfile *Current = 0;
 
+#ifndef HAVE_STRTOK_R
+static char *
+strtok_r (char *s, const char *delim, char **save_ptr)
+{
+	char *token;
+
+	if (s == NULL)
+		s = *save_ptr;
+
+	s += strspn (s, delim);
+	if (*s == '\0')
+		return NULL;
+
+	token = s;
+	s = strpbrk (token, delim);
+	if (s == NULL) {
+		*save_ptr = strchr (token, '\0');
+	} else {
+		*s = '\0';
+		*save_ptr = s + 1;
+	}
+	return token;
+}
+#endif
+
 /*
  * This one keeps track of all of the opened files
  */
diff -Naur libgnome-2.5.92-old/libgnome/gnome-init.h libgnome-2.5.92/libgnome/gnome-init.h
--- libgnome-2.5.92-old/libgnome/gnome-init.h	Thu Nov 14 23:11:46 2002
+++ libgnome-2.5.92/libgnome/gnome-init.h	Sun Mar 21 12:06:44 2004
@@ -36,8 +36,8 @@
  * to override .gnome2 via environment variable and this is
  * an important feature for environments that mix GNOME versions)
  */
-#define GNOME_DOT_GNOME		".gnome2/"
-#define GNOME_DOT_GNOME_PRIVATE	".gnome2_private/"
+#define GNOME_DOT_GNOME		".gnome2"
+#define GNOME_DOT_GNOME_PRIVATE	".gnome2_private"
 
 #define LIBGNOME_MODULE libgnome_module_info_get()
 const GnomeModuleInfo *libgnome_module_info_get (void) G_GNUC_CONST;
diff -Naur libgnome-2.5.92-old/libgnome/gnome-score.c libgnome-2.5.92/libgnome/gnome-score.c
--- libgnome-2.5.92-old/libgnome/gnome-score.c	Thu Jul 10 14:33:28 2003
+++ libgnome-2.5.92/libgnome/gnome-score.c	Sun Mar 21 12:06:44 2004
@@ -73,6 +73,31 @@
 
 /********************** internal functions ***********************************/
 
+#ifndef HAVE_STRTOK_R
+static char *
+strtok_r (char *s, const char *delim, char **save_ptr)
+{
+	char *token;
+
+	if (s == NULL)
+		s = *save_ptr;
+
+	s += strspn (s, delim);
+	if (*s == '\0')
+		return NULL;
+
+	token = s;
+	s = strpbrk (token, delim);
+	if (s == NULL) {
+		*save_ptr = strchr (token, '\0');
+	} else {
+		*s = '\0';
+		*save_ptr = s + 1;
+	}
+	return token;
+}
+#endif
+
 static gchar *
 gnome_get_score_file_name (const gchar * progname, const gchar * level)
 {
diff -Naur libgnome-2.5.92-old/libgnome/gnome-util.c libgnome-2.5.92/libgnome/gnome-util.c
--- libgnome-2.5.92-old/libgnome/gnome-util.c	Tue Jun 24 05:27:46 2003
+++ libgnome-2.5.92/libgnome/gnome-util.c	Sun Mar 21 12:06:44 2004
@@ -39,6 +39,10 @@
 #endif
 #include <sys/types.h>
 
+#include <crt_externs.h>
+#include <sys/time.h>
+#define environ (*_NSGetEnviron())
+
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff -Naur libgnome-2.5.92-old/libgnome/gnome-util.h libgnome-2.5.92/libgnome/gnome-util.h
--- libgnome-2.5.92-old/libgnome/gnome-util.h	Sat Jun  1 21:41:45 2002
+++ libgnome-2.5.92/libgnome/gnome-util.h	Sun Mar 21 12:06:44 2004
@@ -49,7 +49,7 @@
 /* very similar to above, but adds $HOME/.gnome2/ to beginning
  * This is meant to be the most useful version.
  */
-#define gnome_util_home_file(afile) (g_strconcat(g_get_home_dir(), "/", GNOME_DOT_GNOME, (afile), NULL))
+#define gnome_util_home_file(afile) (g_build_filename (g_get_home_dir(), "/", GNOME_DOT_GNOME, (afile), NULL))
 
 /* Find the name of the user's shell.  */
 char *gnome_util_user_shell (void);
diff -Naur libgnome-2.5.92-old/ltmain.sh libgnome-2.5.92/ltmain.sh
--- libgnome-2.5.92-old/ltmain.sh	Fri Mar  5 00:22:34 2004
+++ libgnome-2.5.92/ltmain.sh	Sun Mar 21 12:10:42 2004
@@ -3745,6 +3745,12 @@
 	  eval test_cmds=\"$archive_expsym_cmds\"
 	  cmds=$archive_expsym_cmds
 	else
+	  if test "x$verstring" = "x0.0"; then
+            tmp_verstring=
+          else
+            tmp_verstring="$verstring"
+          fi
+
 	  eval test_cmds=\"$archive_cmds\"
 	  cmds=$archive_cmds
 	  fi
@@ -5247,10 +5253,10 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
+#	  if test "$installed" = no && test "$need_relink" = yes; then
+#	    $echo >> $output "\
+#relink_command=\"$relink_command\""
+#	  fi
 	done
       fi