Attachment #87076 for bug #133819

Lines 5378-5384 Link Here

(-)gtk+-1.2.10/configure.orig (-2 / +2 lines)
5378	saved_ldflags="$LDFLAGS"	5378	saved_ldflags="$LDFLAGS"
5379		5379
5380	CFLAGS="$CFLAGS $X_CFLAGS"	5380	CFLAGS="$CFLAGS $X_CFLAGS"
5381	LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"	5381	LDFLAGS="$LDFLAGS $X_LDFLAGS"
5382		5382
5383	if test "x$no_x" = "xyes"; then	5383	if test "x$no_x" = "xyes"; then
5384	{ echo "configure: error:	5384	{ echo "configure: error:
Lines 5681-5687 Link Here
5681	fi	5681	fi
5682		5682
5683	x_cflags="$X_CFLAGS"	5683	x_cflags="$X_CFLAGS"
5684	x_ldflags="$X_LDFLAGS $X_LIBS"	5684	x_ldflags="$X_LDFLAGS"
5685		5685
5686	# set up things for XInput	5686	# set up things for XInput
5687		5687

Lines 312-319 Link Here

(-)gtk+-1.2.10/configure.in.orig (-3 / +2 lines)
312	saved_ldflags="$LDFLAGS"	312	saved_ldflags="$LDFLAGS"
313		313
314	CFLAGS="$CFLAGS $X_CFLAGS"	314	CFLAGS="$CFLAGS $X_CFLAGS"
315	LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"	315	LDFLAGS="$LDFLAGS $X_LDFLAGS"
316
317	if test "x$no_x" = "xyes"; then	316	if test "x$no_x" = "xyes"; then
318	AC_MSG_ERROR([	317	AC_MSG_ERROR([
319	*** X libraries or include files not found. Check 'config.log' for	318	*** X libraries or include files not found. Check 'config.log' for
Lines 384-390 Link Here
384	fi	383	fi
385		384
386	x_cflags="$X_CFLAGS"	385	x_cflags="$X_CFLAGS"
387	x_ldflags="$X_LDFLAGS $X_LIBS"	386	x_ldflags="$X_LDFLAGS"
388		387
389	# set up things for XInput	388	# set up things for XInput
390		389




	-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
#

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






# 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 	@x_ldflags@		@STRIP_END@


#

#
EXTRA_PROGRAMS = gxid
bin_PROGRAMS = @xinput_progs@
LDADDS = @STRIP_BEGIN@ 		@x_libs@		@GLIB_LIBS@		-lm		@STRIP_END@

gxid_SOURCES = gxid.c
gxid_LDADD = $(LDADDS)

X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
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 \


gxid_OBJECTS =  gxid.o
gxid_DEPENDENCIES = 
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)




	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
	-release $(LT_RELEASE) 					\
	-export-dynamic						\
	@GLIB_DEPLIBS@ 						\
	@x_ldflags@						\
	@x_libs@ 						\
	-lm							\
@STRIP_END@
libgtk_la_LIBADD = @STRIP_BEGIN@ \
        $(top_builddir)/gdk/libgdk.la   \
        @x_libs@                        \
        @GDK_WLIBS@                     \
        @GLIB_LIBS@                     \
        -lm                             \
	@STRIP_END@

#
# setup source file variables

LDADDS = @STRIP_BEGIN@ \
	libgtk.la			\
	$(top_builddir)/gdk/libgdk.la	\
	@x_ldflags@			\
	@x_libs@			\
	@GDK_WLIBS@			\
	@GLIB_LIBS@			\

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





# 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		@x_ldflags@		@STRIP_END@

#	$(top_builddir)/gdk/libgdk.la

#
# setup source file variables

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

X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
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 \

Return to bug 133819

Lines 21-32 Link Here

(-)gtk+-1.2.10/gdk/Makefile.am.orig (-5 / +3 lines)
21	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \	21	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
22	-release $(LT_RELEASE) \	22	-release $(LT_RELEASE) \
23	-export-dynamic \	23	-export-dynamic \
24	@GLIB_DEPLIBS@ \
25	@x_ldflags@ \	24	@x_ldflags@ \
26	@x_libs@ \
27	-lm \
28	@STRIP_END@	25	@STRIP_END@
29		26
		27	libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm
		28
30	#	29	#
31	# setup source file variables	30	# setup source file variables
32	#	31	#
Lines 104-117 Link Here
104	EXTRA_PROGRAMS = gxid	103	EXTRA_PROGRAMS = gxid
105	bin_PROGRAMS = @xinput_progs@	104	bin_PROGRAMS = @xinput_progs@
106	LDADDS = @STRIP_BEGIN@ \	105	LDADDS = @STRIP_BEGIN@ \
107	@x_ldflags@ \
108	@x_libs@ \	106	@x_libs@ \
109	@GLIB_LIBS@ \	107	@GLIB_LIBS@ \
110	-lm \	108	-lm \
111	@STRIP_END@	109	@STRIP_END@
112	gxid_SOURCES = gxid.c	110	gxid_SOURCES = gxid.c
113	gxid_LDADD = $(LDADDS)	111	gxid_LDADD = $(LDADDS)
114		112	gxid_LDFLAGS = @x_ldflags@
115		113
116	.PHONY: files	114	.PHONY: files
117		115

Lines 135-141 Link Here

(-)gtk+-1.2.10/gdk/Makefile.in.orig (-4 / +4 lines)
135		135
136	# libtool stuff: set version and export symbols for resolving	136	# libtool stuff: set version and export symbols for resolving
137	libgdkincludedir = $(includedir)/gtk-1.2/gdk	137	libgdkincludedir = $(includedir)/gtk-1.2/gdk
138	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@	138	libgdk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @x_ldflags@ @STRIP_END@
139		139
140		140
141	#	141	#
Lines 161-167 Link Here
161	#	161	#
162	EXTRA_PROGRAMS = gxid	162	EXTRA_PROGRAMS = gxid
163	bin_PROGRAMS = @xinput_progs@	163	bin_PROGRAMS = @xinput_progs@
164	LDADDS = @STRIP_BEGIN@ @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm @STRIP_END@	164	LDADDS = @STRIP_BEGIN@ @x_libs@ @GLIB_LIBS@ -lm @STRIP_END@
165		165
166	gxid_SOURCES = gxid.c	166	gxid_SOURCES = gxid.c
167	gxid_LDADD = $(LDADDS)	167	gxid_LDADD = $(LDADDS)
Lines 179-185 Link Here
179	X_LIBS = @X_LIBS@	179	X_LIBS = @X_LIBS@
180	X_EXTRA_LIBS = @X_EXTRA_LIBS@	180	X_EXTRA_LIBS = @X_EXTRA_LIBS@
181	X_PRE_LIBS = @X_PRE_LIBS@	181	X_PRE_LIBS = @X_PRE_LIBS@
182	libgdk_la_LIBADD =	182	libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm
183	libgdk_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \	183	libgdk_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \
184	gdkdraw.lo gdkevents.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkim.lo \	184	gdkdraw.lo gdkevents.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkim.lo \
185	gdkimage.lo gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo \	185	gdkimage.lo gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo \
Lines 189-195 Link Here
189		189
190	gxid_OBJECTS = gxid.o	190	gxid_OBJECTS = gxid.o
191	gxid_DEPENDENCIES =	191	gxid_DEPENDENCIES =
192	gxid_LDFLAGS =	192	gxid_LDFLAGS = @x_ldflags@
193	CFLAGS = @CFLAGS@	193	CFLAGS = @CFLAGS@
194	COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)	194	COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
195	LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)	195	LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

Lines 135-143 Link Here

(-)gtk+-1.2.10/gtk/Makefile.in.orig (-4 / +15 lines)
135		135
136	# libtool stuff: set version and export symbols for resolving	136	# libtool stuff: set version and export symbols for resolving
137	libgtkincludedir = $(includedir)/gtk-1.2/gtk	137	libgtkincludedir = $(includedir)/gtk-1.2/gtk
138	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@	138	libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @x_ldflags@ @STRIP_END@
139
140	# $(top_builddir)/gdk/libgdk.la
141		139
142	#	140	#
143	# setup source file variables	141	# setup source file variables
Lines 209-219 Link Here
209	simple_DEPENDENCIES = $(DEPS)	207	simple_DEPENDENCIES = $(DEPS)
210	#testthreads_DEPENDENCIES = $(DEPS)	208	#testthreads_DEPENDENCIES = $(DEPS)
211	testgtk_LDADD = $(LDADDS)	209	testgtk_LDADD = $(LDADDS)
		210	testgtk_LDFLAGS=@x_ldflags@
212	testinput_LDADD = $(LDADDS)	211	testinput_LDADD = $(LDADDS)
		212	testinput_LDFLAGS = @x_ldflags@
213	testselection_LDADD = $(LDADDS)	213	testselection_LDADD = $(LDADDS)
		214	testselection_LDFLAGS = @x_ldflags@
214	testrgb_LDADD = $(LDADDS)	215	testrgb_LDADD = $(LDADDS)
		216	testrgb_LDFLAGS = @x_ldflags@
215	testdnd_LDADD = $(LDADDS)	217	testdnd_LDADD = $(LDADDS)
		218	testdnd_LDFLAGS = @x_ldflags@
216	simple_LDADD = $(LDADDS)	219	simple_LDADD = $(LDADDS)
		220	simple_LDFLAGS = @x_ldflags@
217	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	221	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
218	CONFIG_HEADER = ../config.h	222	CONFIG_HEADER = ../config.h
219	CONFIG_CLEAN_FILES = gtkfeatures.h	223	CONFIG_CLEAN_FILES = gtkfeatures.h
Lines 228-234 Link Here
228	X_LIBS = @X_LIBS@	232	X_LIBS = @X_LIBS@
229	X_EXTRA_LIBS = @X_EXTRA_LIBS@	233	X_EXTRA_LIBS = @X_EXTRA_LIBS@
230	X_PRE_LIBS = @X_PRE_LIBS@	234	X_PRE_LIBS = @X_PRE_LIBS@
231	libgtk_la_LIBADD =	235	libgtk_la_LIBADD = @STRIP_BEGIN@ \
		236	$(top_builddir)/gdk/libgdk.la \
		237	@x_libs@ \
		238	@GDK_WLIBS@ \
		239	@GLIB_LIBS@ \
		240	-lm \
		241	@STRIP_END@
		242
232	libgtk_la_OBJECTS = gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \	243	libgtk_la_OBJECTS = gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
233	gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \	244	gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \
234	gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \	245	gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \

Lines 27-39 Link Here

(-)gtk+-1.2.10/gtk/Makefile.am.orig (-6 / +15 lines)
27	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \	27	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
28	-release $(LT_RELEASE) \	28	-release $(LT_RELEASE) \
29	-export-dynamic \	29	-export-dynamic \
30	@GLIB_DEPLIBS@ \
31	@x_ldflags@ \	30	@x_ldflags@ \
32	@x_libs@ \
33	-lm \
34	@STRIP_END@	31	@STRIP_END@
35	# $(top_builddir)/gdk/libgdk.la	32	libgtk_la_LIBADD = @STRIP_BEGIN@ \
36		33	$(top_builddir)/gdk/libgdk.la \
		34	@x_libs@ \
		35	@GDK_WLIBS@ \
		36	@GLIB_LIBS@ \
		37	-lm \
		38	@STRIP_END@
37		39
38	#	40	#
39	# setup source file variables	41	# setup source file variables
Lines 428-434 Link Here
428	LDADDS = @STRIP_BEGIN@ \	430	LDADDS = @STRIP_BEGIN@ \
429	libgtk.la \	431	libgtk.la \
430	$(top_builddir)/gdk/libgdk.la \	432	$(top_builddir)/gdk/libgdk.la \
431	@x_ldflags@ \
432	@x_libs@ \	433	@x_libs@ \
433	@GDK_WLIBS@ \	434	@GDK_WLIBS@ \
434	@GLIB_LIBS@ \	435	@GLIB_LIBS@ \
Lines 441-452 Link Here
441	testdnd_DEPENDENCIES = $(DEPS)	442	testdnd_DEPENDENCIES = $(DEPS)
442	simple_DEPENDENCIES = $(DEPS)	443	simple_DEPENDENCIES = $(DEPS)
443	#testthreads_DEPENDENCIES = $(DEPS)	444	#testthreads_DEPENDENCIES = $(DEPS)
		445
444	testgtk_LDADD = $(LDADDS)	446	testgtk_LDADD = $(LDADDS)
		447	testgtk_LDFLAGS=@x_ldflags@
445	testinput_LDADD = $(LDADDS)	448	testinput_LDADD = $(LDADDS)
		449	testinput_LDFLAGS = @x_ldflags@
446	testselection_LDADD = $(LDADDS)	450	testselection_LDADD = $(LDADDS)
		451	testselection_LDFLAGS = @x_ldflags@
447	testrgb_LDADD = $(LDADDS)	452	testrgb_LDADD = $(LDADDS)
		453	testrgb_LDFLAGS = @x_ldflags@
448	testdnd_LDADD = $(LDADDS)	454	testdnd_LDADD = $(LDADDS)
		455	testdnd_LDFLAGS = @x_ldflags@
449	simple_LDADD = $(LDADDS)	456	simple_LDADD = $(LDADDS)
		457	simple_LDFLAGS = @x_ldflags@
		458
450	#testthreads_LDADD = $(LDADDS)	459	#testthreads_LDADD = $(LDADDS)
451		460
452	.PHONY: files test test-debug	461	.PHONY: files test test-debug