--- gtk+-1.2.10/configure.orig 2006-05-19 02:40:13.000000000 -0700 +++ gtk+-1.2.10/configure 2006-05-19 02:38:31.000000000 -0700 @@ -5378,7 +5378,7 @@ saved_ldflags="$LDFLAGS" CFLAGS="$CFLAGS $X_CFLAGS" -LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS" +LDFLAGS="$LDFLAGS $X_LDFLAGS" if test "x$no_x" = "xyes"; then { echo "configure: error: @@ -5681,7 +5681,7 @@ fi x_cflags="$X_CFLAGS" -x_ldflags="$X_LDFLAGS $X_LIBS" +x_ldflags="$X_LDFLAGS" # set up things for XInput --- gtk+-1.2.10/configure.in.orig 2006-05-19 02:40:28.000000000 -0700 +++ gtk+-1.2.10/configure.in 2006-05-19 02:43:08.000000000 -0700 @@ -312,8 +312,7 @@ saved_ldflags="$LDFLAGS" CFLAGS="$CFLAGS $X_CFLAGS" -LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS" - +LDFLAGS="$LDFLAGS $X_LDFLAGS" if test "x$no_x" = "xyes"; then AC_MSG_ERROR([ *** X libraries or include files not found. Check 'config.log' for @@ -384,7 +383,7 @@ fi x_cflags="$X_CFLAGS" -x_ldflags="$X_LDFLAGS $X_LIBS" +x_ldflags="$X_LDFLAGS" # set up things for XInput --- gtk+-1.2.10/gdk/Makefile.am.orig 2006-05-19 02:41:18.000000000 -0700 +++ gtk+-1.2.10/gdk/Makefile.am 2006-05-19 02:11:54.000000000 -0700 @@ -21,12 +21,11 @@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ -export-dynamic \ - @GLIB_DEPLIBS@ \ @x_ldflags@ \ - @x_libs@ \ - -lm \ @STRIP_END@ +libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm + # # setup source file variables # @@ -104,14 +103,13 @@ EXTRA_PROGRAMS = gxid bin_PROGRAMS = @xinput_progs@ LDADDS = @STRIP_BEGIN@ \ - @x_ldflags@ \ @x_libs@ \ @GLIB_LIBS@ \ -lm \ @STRIP_END@ gxid_SOURCES = gxid.c gxid_LDADD = $(LDADDS) - +gxid_LDFLAGS = @x_ldflags@ .PHONY: files --- gtk+-1.2.10/gdk/Makefile.in.orig 2006-05-19 02:41:27.000000000 -0700 +++ gtk+-1.2.10/gdk/Makefile.in 2006-05-19 02:10:42.000000000 -0700 @@ -135,7 +135,7 @@ # libtool stuff: set version and export symbols for resolving libgdkincludedir = $(includedir)/gtk-1.2/gdk -libgdk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@ +libgdk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @x_ldflags@ @STRIP_END@ # @@ -161,7 +161,7 @@ # EXTRA_PROGRAMS = gxid bin_PROGRAMS = @xinput_progs@ -LDADDS = @STRIP_BEGIN@ @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm @STRIP_END@ +LDADDS = @STRIP_BEGIN@ @x_libs@ @GLIB_LIBS@ -lm @STRIP_END@ gxid_SOURCES = gxid.c gxid_LDADD = $(LDADDS) @@ -179,7 +179,7 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -libgdk_la_LIBADD = +libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm libgdk_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \ gdkdraw.lo gdkevents.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkim.lo \ gdkimage.lo gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo \ @@ -189,7 +189,7 @@ gxid_OBJECTS = gxid.o gxid_DEPENDENCIES = -gxid_LDFLAGS = +gxid_LDFLAGS = @x_ldflags@ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --- gtk+-1.2.10/gtk/Makefile.am.orig 2006-05-19 02:40:52.000000000 -0700 +++ gtk+-1.2.10/gtk/Makefile.am 2006-05-19 02:25:47.000000000 -0700 @@ -27,13 +27,15 @@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ -export-dynamic \ - @GLIB_DEPLIBS@ \ @x_ldflags@ \ - @x_libs@ \ - -lm \ @STRIP_END@ -# $(top_builddir)/gdk/libgdk.la - +libgtk_la_LIBADD = @STRIP_BEGIN@ \ + $(top_builddir)/gdk/libgdk.la \ + @x_libs@ \ + @GDK_WLIBS@ \ + @GLIB_LIBS@ \ + -lm \ + @STRIP_END@ # # setup source file variables @@ -428,7 +430,6 @@ LDADDS = @STRIP_BEGIN@ \ libgtk.la \ $(top_builddir)/gdk/libgdk.la \ - @x_ldflags@ \ @x_libs@ \ @GDK_WLIBS@ \ @GLIB_LIBS@ \ @@ -441,12 +442,20 @@ testdnd_DEPENDENCIES = $(DEPS) simple_DEPENDENCIES = $(DEPS) #testthreads_DEPENDENCIES = $(DEPS) + testgtk_LDADD = $(LDADDS) +testgtk_LDFLAGS=@x_ldflags@ testinput_LDADD = $(LDADDS) +testinput_LDFLAGS = @x_ldflags@ testselection_LDADD = $(LDADDS) +testselection_LDFLAGS = @x_ldflags@ testrgb_LDADD = $(LDADDS) +testrgb_LDFLAGS = @x_ldflags@ testdnd_LDADD = $(LDADDS) +testdnd_LDFLAGS = @x_ldflags@ simple_LDADD = $(LDADDS) +simple_LDFLAGS = @x_ldflags@ + #testthreads_LDADD = $(LDADDS) .PHONY: files test test-debug --- gtk+-1.2.10/gtk/Makefile.in.orig 2006-05-19 02:41:02.000000000 -0700 +++ gtk+-1.2.10/gtk/Makefile.in 2006-05-19 02:27:58.000000000 -0700 @@ -135,9 +135,7 @@ # libtool stuff: set version and export symbols for resolving libgtkincludedir = $(includedir)/gtk-1.2/gtk -libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@ - -# $(top_builddir)/gdk/libgdk.la +libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @x_ldflags@ @STRIP_END@ # # setup source file variables @@ -209,11 +207,17 @@ simple_DEPENDENCIES = $(DEPS) #testthreads_DEPENDENCIES = $(DEPS) testgtk_LDADD = $(LDADDS) +testgtk_LDFLAGS=@x_ldflags@ testinput_LDADD = $(LDADDS) +testinput_LDFLAGS = @x_ldflags@ testselection_LDADD = $(LDADDS) +testselection_LDFLAGS = @x_ldflags@ testrgb_LDADD = $(LDADDS) +testrgb_LDFLAGS = @x_ldflags@ testdnd_LDADD = $(LDADDS) +testdnd_LDFLAGS = @x_ldflags@ simple_LDADD = $(LDADDS) +simple_LDFLAGS = @x_ldflags@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = gtkfeatures.h @@ -228,7 +232,14 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ -libgtk_la_LIBADD = +libgtk_la_LIBADD = @STRIP_BEGIN@ \ + $(top_builddir)/gdk/libgdk.la \ + @x_libs@ \ + @GDK_WLIBS@ \ + @GLIB_LIBS@ \ + -lm \ + @STRIP_END@ + libgtk_la_OBJECTS = gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \ gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \ gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \