pyrox.dev
lol
1# https://savannah.nongnu.org/bugs/?25362
2# https://bugs.gentoo.org/show_bug.cgi?id=226837
3diff -Nura a/configure.ac b/configure.ac
4--- a/configure.ac 2009-01-19 22:15:30.000000000 +0100
5+++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100
6@@ -43,6 +43,9 @@
7 PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0])
8 PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0])
9
10+PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0])
11+PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0])
12+
13 # Checks for library functions.
14 ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN"
15
16diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am
17--- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100
18+++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100
19@@ -3,7 +3,7 @@
20 AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
21
22 bin_PROGRAMS = gksu-properties
23-gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS}
24+gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS}
25 gksu_properties_SOURCES = gksu-properties.c
26
27 gladedir = ${prefix}/share/${PACKAGE}
28diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am
29--- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100
30+++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100
31@@ -8,8 +8,8 @@
32 # major -> breaks backward compatibility (changes to existing ABI)
33 # minor -> keeps compatibility (additions to the API)
34 # micro -> no change to the API/ABI
35-libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
36-libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS}
37+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS}
38+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1
39 if USE_VERSION_SCRIPT
40 libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver
41 endif
42@@ -24,12 +24,11 @@
43
44 pkglibdir = ${libdir}/${PACKAGE}
45 pkglib_PROGRAMS = gksu-run-helper
46-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
47+gksu_run_helper_LDADD = ${GLIB_LIBS}
48 gksu_run_helper_SOURCES = gksu-run-helper.c
49
50 noinst_PROGRAMS = test-gksu
51 test_gksu_SOURCES = test-gksu.c
52-test_gksu_LDADD = libgksu2.la
53-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
54+test_gksu_LDADD = libgksu2.la ${GLIB_LIBS}
55
56 EXTRA_DIST = libgksu.ver
57diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am
58--- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100
59+++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100
60@@ -4,12 +4,13 @@
61
62 noinst_LTLIBRARIES = libgksuui1.0.la
63 libgksuui1_0_la_SOURCES = gksuui-dialog.c
64-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0`
65+libgksuui1_0_la_LDFLAGS = -Wl,-O1
66+libgksuui1_0_la_LIBADD = ${GTK_LIBS}
67
68 noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
69 includedir = ${prefix}/include/$(PACKAGE)
70
71 noinst_PROGRAMS = test-gksuui
72 test_gksuui_SOURCES = test-gksuui.c
73-test_gksuui_LDADD = libgksuui1.0.la
74-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
75+test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS}
76+