? compile
Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.25
diff -u -r1.25 autogen.sh
--- autogen.sh	28 Sep 2002 22:12:57 -0000	1.25
+++ autogen.sh	14 Oct 2002 00:11:46 -0000
@@ -60,7 +60,8 @@
 # Add other directories to this list if people continue to experience
 # brokennesses ...  Obviously the real answer is for them to fix it
 # themselves, but for Luke's sake we have this.
-for dir in "/usr/local/share/aclocal" \
+for dir in "/opt/garnome/usr/share/aclocal" \
+           "/usr/local/share/aclocal" \
            "/opt/gnome-1.4/share/aclocal"
 do
 	if test -d $dir ; then
@@ -68,10 +69,10 @@
 	fi
 done
 
-aclocal -I m4 $ACLOCAL_FLAGS || exit;
-autoheader || exit;
-automake --add-missing --copy;
-autoconf || exit;
-automake || exit;
+aclocal-1.5 -I m4 $ACLOCAL_FLAGS || exit;
+autoheader-2.53 || exit;
+automake-1.5 --add-missing --copy;
+autoconf-2.53 || exit;
+automake-1.5 || exit;
 ./configure $@
 
Index: src/gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.109
diff -u -r1.109 gaimrc.c
--- src/gaimrc.c	11 Oct 2002 03:13:58 -0000	1.109
+++ src/gaimrc.c	14 Oct 2002 00:11:47 -0000
@@ -1218,7 +1218,7 @@
 	if (opt_rcfile_arg)
 		g_snprintf(buf, sizeof(buf), "%s", opt_rcfile_arg);
 	else if (gaim_home_dir())
-		g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S ".gaimrc", gaim_home_dir());
+		g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S ".gaim2rc", gaim_home_dir());
 	else {
 #ifndef _WIN32
 		set_defaults();
@@ -1288,7 +1288,7 @@
 		g_snprintf(buf, sizeof(buf), "%s", opt_rcfile_arg);
 	}
 	else if (gaim_home_dir()) {
-		g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S ".gaimrc", gaim_home_dir());
+		g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S ".gaim2rc", gaim_home_dir());
 	}
 	else {
 #ifndef _WIN32
@@ -1315,7 +1315,7 @@
 #endif
 	}
 	else
-	  debug_printf("Error opening .gaimrc\n");
+	  debug_printf("Error opening .gaim2rc\n");
 }