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
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
Description: Update build system to use gladeui-2.0 instead of gladeui-1.0
Bug-Debian: http://bugs.debian.org/709242
Author: Daniele E. Domenichelli <daniele.domenichelli@gmail.com>
Last-Update: 2013-05-26
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,7 @@ PKG_CHECK_MODULES(CAIRO, cairo >= [cairo
AC_SUBST(GTK_REQUIRED, [gtk_required_version])
AC_SUBST(PANGO_REQUIRED, [pango_required_version])
AC_SUBST(CAIRO_REQUIRED, [cairo_required_version])
+AC_SUBST(GTK_CFLAGS)
# ------------------ Libglade configuration ------------------------
AC_ARG_ENABLE(libglade,
@@ -86,13 +87,13 @@ AC_ARG_ENABLE(glade,
AC_MSG_CHECKING([whether to build glade-3 support module])
if test x"$ac_cv_enable_glade" = xyes; then
AC_MSG_RESULT(yes)
- PKG_CHECK_MODULES(GLADE3, gladeui-1.0 >= 3.4.0,
+ PKG_CHECK_MODULES(GLADE3, gladeui-2.0 >= 3.4.0,
ac_cv_enable_glade=yes, ac_cv_enable_glade=no)
if test x"$ac_cv_enable_glade" = xyes; then
AC_DEFINE(USE_GLADE, 1, Define if you want glade interface builder support)
- glade_moduledir=`pkg-config gladeui-1.0 --variable=moduledir`
+ glade_moduledir=`pkg-config gladeui-2.0 --variable=moduledir`
AC_DEFINE_UNQUOTED(GLADE_MODULEDIR, [$glade_moduledir], [Glade-3 module directory])
- glade_catalogdir=`pkg-config gladeui-1.0 --variable=catalogdir`
+ glade_catalogdir=`pkg-config gladeui-2.0 --variable=catalogdir`
AC_DEFINE_UNQUOTED(GLADE_CATALOGDIR, [$glade_catalogdir], [Glade-3 catalog directory])
else
AC_MSG_RESULT(not found)
--- a/configure
+++ b/configure
@@ -12868,12 +12868,12 @@ if test -n "$GLADE3_CFLAGS"; then
pkg_cv_GLADE3_CFLAGS="$GLADE3_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0 >= 3.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gladeui-1.0 >= 3.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-2.0 >= 3.4.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gladeui-2.0 >= 3.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GLADE3_CFLAGS=`$PKG_CONFIG --cflags "gladeui-1.0 >= 3.4.0" 2>/dev/null`
+ pkg_cv_GLADE3_CFLAGS=`$PKG_CONFIG --cflags "gladeui-2.0 >= 3.4.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12885,12 +12885,12 @@ if test -n "$GLADE3_LIBS"; then
pkg_cv_GLADE3_LIBS="$GLADE3_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0 >= 3.4.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gladeui-1.0 >= 3.4.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-2.0 >= 3.4.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gladeui-2.0 >= 3.4.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GLADE3_LIBS=`$PKG_CONFIG --libs "gladeui-1.0 >= 3.4.0" 2>/dev/null`
+ pkg_cv_GLADE3_LIBS=`$PKG_CONFIG --libs "gladeui-2.0 >= 3.4.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12911,9 +12911,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GLADE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gladeui-1.0 >= 3.4.0" 2>&1`
+ GLADE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gladeui-2.0 >= 3.4.0" 2>&1`
else
- GLADE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gladeui-1.0 >= 3.4.0" 2>&1`
+ GLADE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gladeui-2.0 >= 3.4.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GLADE3_PKG_ERRORS" >&5
@@ -12934,13 +12934,13 @@ fi
$as_echo "#define USE_GLADE 1" >>confdefs.h
- glade_moduledir=`pkg-config gladeui-1.0 --variable=moduledir`
+ glade_moduledir=`pkg-config gladeui-2.0 --variable=moduledir`
cat >>confdefs.h <<_ACEOF
#define GLADE_MODULEDIR $glade_moduledir
_ACEOF
- glade_catalogdir=`pkg-config gladeui-1.0 --variable=catalogdir`
+ glade_catalogdir=`pkg-config gladeui-2.0 --variable=catalogdir`
cat >>confdefs.h <<_ACEOF
#define GLADE_CATALOGDIR $glade_catalogdir
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -12,7 +12,9 @@ INCLUDES = \
glademoduledir = @libglade_moduledir@
glademodule_LTLIBRARIES = libdatabox.la
-libdatabox_la_CFLAGS = @LIBGLADE_CFLAGS@
+libdatabox_la_CFLAGS = \
+ @GTK_CFLAGS@ \
+ @LIBGLADE_CFLAGS@
libdatabox_la_LIBADD = \
$(top_builddir)/gtk/libgtkdatabox.la \
@@ -39,7 +41,9 @@ INCLUDES = \
gladeuimoduledir = @glade_moduledir@
gladeuimodule_LTLIBRARIES = libgladedatabox.la
-libgladedatabox_la_CFLAGS = @GLADE3_CFLAGS@
+libgladedatabox_la_CFLAGS = \
+ @GTK_CFLAGS@ \
+ @GLADE3_CFLAGS@
libgladedatabox_la_LIBADD = \
$(top_builddir)/gtk/libgtkdatabox.la \
--- a/glade/Makefile.in
+++ b/glade/Makefile.in
@@ -276,7 +276,10 @@ top_srcdir = @top_srcdir@
# @LIBGLADE_CFLAGS@
@BUILD_LIBGLADE_TRUE@glademoduledir = @libglade_moduledir@
@BUILD_LIBGLADE_TRUE@glademodule_LTLIBRARIES = libdatabox.la
-@BUILD_LIBGLADE_TRUE@libdatabox_la_CFLAGS = @LIBGLADE_CFLAGS@
+@BUILD_LIBGLADE_TRUE@libdatabox_la_CFLAGS = \
+@BUILD_LIBGLADE_TRUE@ @GTK_CFLAGS@ \
+@BUILD_LIBGLADE_TRUE@ @LIBGLADE_CFLAGS@
+
@BUILD_LIBGLADE_TRUE@libdatabox_la_LIBADD = \
@BUILD_LIBGLADE_TRUE@ $(top_builddir)/gtk/libgtkdatabox.la \
@BUILD_LIBGLADE_TRUE@ @LIBGLADE_LIBS@
@@ -289,7 +292,10 @@ top_srcdir = @top_srcdir@
@BUILD_GLADE_TRUE@gladeuimoduledir = @glade_moduledir@
@BUILD_GLADE_TRUE@gladeuimodule_LTLIBRARIES = libgladedatabox.la
-@BUILD_GLADE_TRUE@libgladedatabox_la_CFLAGS = @GLADE3_CFLAGS@
+@BUILD_GLADE_TRUE@libgladedatabox_la_CFLAGS = \
+@BUILD_GLADE_TRUE@ @GTK_CFLAGS@ \
+@BUILD_GLADE_TRUE@ @GLADE3_CFLAGS@
+
@BUILD_GLADE_TRUE@libgladedatabox_la_LIBADD = \
@BUILD_GLADE_TRUE@ $(top_builddir)/gtk/libgtkdatabox.la \
@BUILD_GLADE_TRUE@ @GLADE3_LIBS@
|
