--- gnome-libs-1.4.2/configure.orig 2006-05-19 09:19:15.000000000 -0700 +++ gnome-libs-1.4.2/configure.orig 2006-05-19 09:22:16.000000000 -0700 @@ -8784,8 +8784,8 @@ echo $ac_n "(cached) $ac_c" 1>&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS `glib-config --libs gmodule`" + save_LIBS="$LIBS" + LIBS="$LIBS `glib-config --libs gmodule`" if test "$cross_compiling" = yes; then ac_cv_gmodule=yes else @@ -8812,7 +8812,7 @@ rm -fr conftest* fi - LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" fi echo "$ac_t""$ac_cv_gmodule" 1>&6 --- gnome-libs-1.4.2/libgnome/Makefile.am.orig 2006-05-19 09:38:12.000000000 -0700 +++ gnome-libs-1.4.2/libgnome/Makefile.am.orig 2006-05-17 20:29:44.000000000 -0700 @@ -87,7 +87,7 @@ gnome-config.o: parse-path.cP libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir) -libgnome_la_LIBADD = $(GLIB_LIBS) -lm +libgnome_la_LIBADD = $(GLIB_LIBS) -lm -lesd /usr/lib64/libaudiofile.la -lpopt -ldb1 bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \ gconfigger gnome-gen-mimedb --- gnome-libs-1.4.2/libgnome/Makefile.in.orig 2006-05-19 09:38:25.000000000 -0700 +++ gnome-libs-1.4.2/libgnome/Makefile.in.orig 2006-05-17 20:29:52.000000000 -0700 @@ -238,7 +238,8 @@ EXTRA_DIST = parse-path.cP $(man_MANS) libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir) -libgnome_la_LIBADD = $(GLIB_LIBS) -lm +libgnome_la_LIBADD = $(GLIB_LIBS) -lm -lesd /usr/lib64/libaudiofile.la -lpopt -ldb1 + bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote \ gconfigger gnome-gen-mimedb --- gnome-libs-1.4.2/libgnomeui/Makefile.am.orig 2002-03-26 22:49:42.000000000 -0800 +++ gnome-libs-1.4.2/libgnomeui/Makefile.am.orig 2006-05-17 20:51:03.000000000 -0700 @@ -268,46 +268,47 @@ $(man_MANS) libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir) -libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) +libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) $(top_builddir)/libgnome/libgnome.la \ +$(top_builddir)/libart_lgpl/libart_lgpl.la -lpopt gnome_segv_LDADD = \ libgnomeui.la \ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt ted_demo_LDADD = \ libgnomeui.la \ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt stock_demo_LDADD = \ libgnomeui.la \ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt winhints_demo_LDADD = \ libgnomeui.la \ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt animator_demo_LDADD = \ libgnomeui.la \ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt dock_demo_LDADD = \ libgnomeui.la \ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt --- gnome-libs-1.4.2/libgnomeui/Makefile.in.orig 2002-08-15 15:25:34.000000000 -0700 +++ gnome-libs-1.4.2/libgnomeui/Makefile.in.orig 2006-05-17 20:52:10.000000000 -0700 @@ -392,14 +392,15 @@ libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir) -libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) +libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) $(top_builddir)/libgnome/libgnome.la \ +$(top_builddir)/libart_lgpl/libart_lgpl.la -lpopt gnome_segv_LDADD = \ libgnomeui.la \ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt ted_demo_LDADD = \ @@ -407,7 +408,7 @@ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt stock_demo_LDADD = \ @@ -415,7 +416,7 @@ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt winhints_demo_LDADD = \ @@ -423,7 +424,7 @@ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt animator_demo_LDADD = \ @@ -431,7 +432,7 @@ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt dock_demo_LDADD = \ @@ -439,7 +440,7 @@ $(top_builddir)/libgnome/libgnome.la \ $(top_builddir)/libart_lgpl/libart_lgpl.la \ @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) \ - $(INTLLIBS) + $(INTLLIBS) -lpopt mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h --- gnome-libs-1.4.2/libgnorba/Makefile.am.orig 2002-03-26 22:48:18.000000000 -0800 +++ gnome-libs-1.4.2/libgnorba/Makefile.am.orig 2006-05-17 21:45:13.000000000 -0700 @@ -80,7 +80,16 @@ Table.h 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) \ + $(top_builddir)/libgnome/libgnome.la \ + $(top_builddir)/libgnomeui/libgnomeui.la \ + $(top_builddir)/libart_lgpl/libart_lgpl.la \ + -lpopt -lm + +libgnorbagtk_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) +libgnorbagtk_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) loadshlib_SOURCES = loadshlib.c --- gnome-libs-1.4.2/libgnorba/Makefile.in.orig 2002-08-15 15:25:44.000000000 -0700 +++ gnome-libs-1.4.2/libgnorba/Makefile.in.orig 2006-05-17 21:45:40.000000000 -0700 @@ -229,7 +229,13 @@ 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) \ + $(top_builddir)/libgnome/libgnome.la \ + $(top_builddir)/libgnomeui/libgnomeui.la \ + $(top_builddir)/libart_lgpl/libart_lgpl.la \ + -lpopt -lm loadshlib_SOURCES = loadshlib.c @@ -294,8 +300,8 @@ gnome-factory-common.lo Table-skels.lo Table-stubs.lo Table-common.lo \ gnome-unknown-skels.lo gnome-unknown-stubs.lo gnome-unknown-common.lo \ goad.lo orbitgtk.lo orbitgnome.lo orbitns.lo -libgnorbagtk_la_LDFLAGS = -libgnorbagtk_la_LIBADD = +libgnorbagtk_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) +libgnorbagtk_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) libgnorbagtk_la_OBJECTS = gnome-factory-skels.lo gnome-factory-stubs.lo \ gnome-factory-common.lo Table-skels.lo Table-stubs.lo Table-common.lo \ gnome-unknown-skels.lo gnome-unknown-stubs.lo gnome-unknown-common.lo \ --- gnome-libs-1.4.2/zvt/Makefile.am.orig 2002-03-18 13:18:10.000000000 -0800 +++ gnome-libs-1.4.2/zvt/Makefile.am.orig 2006-05-17 21:18:54.000000000 -0700 @@ -23,6 +23,8 @@ libzvt_la_LDFLAGS = -version-info 5:0:3 -rpath $(libdir) +libzvt_la_LIBADD = $(GTK_LIBS) $(GDK_IMLIB_LIBS) $(UTIL_LIBS) + libzvtinclude_HEADERS = \ lists.h \ vt.h \ @@ -56,7 +58,8 @@ $(UTIL_LIBS) \ $(GTK_LIBS) \ $(GDK_IMLIB_LIBS) \ - @LIBSUPPORT@ $(INTLLIBS) + @LIBSUPPORT@ $(INTLLIBS) \ + -lgdk test_utmp_SOURCES = \ gnome-utmp.c \ --- gnome-libs-1.4.2/zvt/Makefile.in.orig 2002-08-15 15:25:41.000000000 -0700 +++ gnome-libs-1.4.2/zvt/Makefile.in.orig 2006-05-17 21:20:49.000000000 -0700 @@ -221,7 +221,7 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -libzvt_la_LIBADD = +libzvt_la_LIBADD = $(GTK_LIBS) $(GDK_IMLIB_LIBS) $(UTIL_LIBS) libzvt_la_OBJECTS = gnome-login-support.lo lists.lo subshell.lo \ update.lo vt.lo zvtterm.lo noinst_PROGRAMS = zterm$(EXEEXT) test-utmp$(EXEEXT)