blob: 75d57f26b710b61d3476344e54ce1f69ad32377b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
diff -ur gwave-code-249-trunk.orig/configure.ac gwave-code-249-trunk/configure.ac
--- gwave-code-249-trunk.orig/configure.ac 2016-08-15 12:51:39.170423625 -0600
+++ gwave-code-249-trunk/configure.ac 2016-08-15 12:53:13.049707178 -0600
@@ -140,6 +140,9 @@
AC_SUBST(ggtk_hack_cflags)
AC_SUBST(ggtk_extra_loadpath)
+PKG_CHECK_MODULES([X11], [x11])
+PKG_CHECK_MODULES([GLIB], [glib-2.0])
+
dnl doesn't work if prefix isn't specified.
dnl AC_DEFINE_UNQUOTED(DATADIR,"${datadir}",Installation prefix for finding necessary guile code)
diff -ur gwave-code-249-trunk.orig/remote/Makefile.am gwave-code-249-trunk/remote/Makefile.am
--- gwave-code-249-trunk.orig/remote/Makefile.am 2016-08-15 12:51:39.170423625 -0600
+++ gwave-code-249-trunk/remote/Makefile.am 2016-08-15 12:52:15.810144514 -0600
@@ -4,7 +4,9 @@
AM_CFLAGS = @GTK_CFLAGS@
bin_PROGRAMS=gwave-exec gwaverepl
gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h
-gwave_exec_LDADD= @GTK_LIBS@
+gwave_exec_LDADD= @GTK_LIBS@ @X11_LIBS@
+gwave_exec_CFLAGS= @X11_CFLAGS@
gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c
-gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@
+gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ @X11_LIBS@ @GLIB_LIBS@
+gwaverepl_CFLAGS= @X11_CFLAGS@ @GLIB_CFLAGS@
diff -ur gwave-code-249-trunk.orig/spicefile/Makefile.am gwave-code-249-trunk/spicefile/Makefile.am
--- gwave-code-249-trunk.orig/spicefile/Makefile.am 2016-08-15 12:51:39.170423625 -0600
+++ gwave-code-249-trunk/spicefile/Makefile.am 2016-08-15 12:52:15.810144514 -0600
@@ -10,11 +10,9 @@
noinst_PROGRAMS = test_read
test_read_SOURCES = test_read.c
-test_read_LDFLAGS = @GTK_LIBS@
-test_read_LDADD = libspicefile.a
+test_read_LDADD = libspicefile.a @GTK_LIBS@
bin_PROGRAMS=sp2sp
sp2sp_SOURCES=sp2sp.c
-sp2sp_LDFLAGS= @GTK_LIBS@
-sp2sp_LDADD= libspicefile.a
+sp2sp_LDADD= libspicefile.a @GTK_LIBS@
diff -ur gwave-code-249-trunk.orig/src/Makefile.am gwave-code-249-trunk/src/Makefile.am
--- gwave-code-249-trunk.orig/src/Makefile.am 2016-08-15 12:51:39.170423625 -0600
+++ gwave-code-249-trunk/src/Makefile.am 2016-08-15 12:52:15.810144514 -0600
@@ -16,8 +16,7 @@
rgeval.c xgserver.c measurebtn.c measurebtn.h \
GtkTable_indel.c GtkTable_indel.h xsnarf.h
-gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILEGTK_LIBS@
-gwave_LDFLAGS = @GUILE_LDFLAGS@
+gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILEGTK_LIBS@ @GUILE_LDFLAGS@ -lX11 -lm
AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILEGTK_CFLAGS@ \
-DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\" @ggtk_hack_cflags@
|
GitWeb
