Attachment #218695 for bug #248351

Lines 15-22 Link Here

(-)gwave2-20090213.orig/src/Makefile.am (-2 / +1 lines)
15	rgeval.c xgserver.c measurebtn.c measurebtn.h \	15	rgeval.c xgserver.c measurebtn.c measurebtn.h \
16	GtkTable_indel.c GtkTable_indel.h xsnarf.h	16	GtkTable_indel.c GtkTable_indel.h xsnarf.h
17		17
18	gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILE_GNOME_LIBS@	18	gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILE_GNOME_LIBS@ @GUILE_LDFLAGS@
19	gwave_LDFLAGS = @GUILE_LDFLAGS@
20		19
21	AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILE_GNOME_CFLAGS@ \	20	AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILE_GNOME_CFLAGS@ \
22	-DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\"	21	-DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\"

Lines 10-20 Link Here

(-)gwave2-20090213.orig/spicefile/Makefile.am (-4 / +2 lines)
10		10
11	noinst_PROGRAMS = test_read	11	noinst_PROGRAMS = test_read
12	test_read_SOURCES = test_read.c	12	test_read_SOURCES = test_read.c
13	test_read_LDFLAGS = @GTK_LIBS@	13	test_read_LDADD = libspicefile.a @GTK_LIBS@
14	test_read_LDADD = libspicefile.a
15		14
16	bin_PROGRAMS=sp2sp	15	bin_PROGRAMS=sp2sp
17	sp2sp_SOURCES=sp2sp.c	16	sp2sp_SOURCES=sp2sp.c
18	sp2sp_LDFLAGS= @GTK_LIBS@	17	sp2sp_LDADD= libspicefile.a @GTK_LIBS@
19	sp2sp_LDADD= libspicefile.a
20		18

Lines 84-90 Link Here

(-)gwave2-20090213.orig/configure.ac (-1 / +2 lines)
84	dnl GUILE_MODULE_REQUIRED(gnome gtk)	84	dnl GUILE_MODULE_REQUIRED(gnome gtk)
85		85
86	PKG_CHECK_MODULES(GUILE_GNOME, guile-gnome-gtk-2, ,AC_MSG_ERROR(Can not find Guile-gnome-platform))	86	PKG_CHECK_MODULES(GUILE_GNOME, guile-gnome-gtk-2, ,AC_MSG_ERROR(Can not find Guile-gnome-platform))
87		87	PKG_CHECK_MODULES([X11], [x11])
		88	PKG_CHECK_MODULES([GLIB], [glib-2.0])
88	dnl remind myself how to check for somthing I know exists	89	dnl remind myself how to check for somthing I know exists
89	dnl GUILE_MODULE_EXPORTS(foo_widget_show, (gnome-0)(gnome gtk),gtk-widget-show)	90	dnl GUILE_MODULE_EXPORTS(foo_widget_show, (gnome-0)(gnome gtk),gtk-widget-show)
90	dnl if test "$foo_widget_show" = yes; then	91	dnl if test "$foo_widget_show" = yes; then

Lines 4-10 Link Here

(-)gwave2-20090213.orig/remote/Makefile.am (-2 / +4 lines)
4	AM_CFLAGS = @GTK_CFLAGS@	4	AM_CFLAGS = @GTK_CFLAGS@
5	bin_PROGRAMS=gwave-exec gwaverepl	5	bin_PROGRAMS=gwave-exec gwaverepl
6	gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h	6	gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h
7	gwave_exec_LDADD= @GTK_LIBS@	7	gwave_exec_CFLAGS= @X11_CFLAGS@
		8	gwave_exec_LDADD= @GTK_LIBS@ @X11_LIBS@
8		9
9	gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c	10	gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c
10	gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@	11	gwaverepl_CFLAGS= @X11_CFLAGS@ @GLIB_CFLAGS@
		12	gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ @X11_LIBS@ @GLIB_LIBS@

Return to bug 248351