← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gtkhtml3.14/trusty-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2010-11-02 14:34:48 UTC
  • mfrom: (1.6.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20101102143448-3cxzy1h4oh5v7igz
Tags: 1:3.32.0-0ubuntu1
https://launchpad.net/bugs/178959
https://launchpad.net/bugs/284060
https://launchpad.net/bugs/562633
* New upstream release 3.32.0
  - Crash after closing inline view of text attachment (LP: #178959, #284060)
  - Translations not working in Emoticons, Find/Replace dialogs (LP: #562633)
* debian/patches/gtkhtml3.14_ftbfs.patch: dropped.
* debian/rules: append API_VER for libgtkhtml-editor chrpath as well
* debian/libgtkhtml-editor-dev.install: append api version to pkgconfig
  file name.
* debian/*.shlibs: update shlibs files for new version with same soname, also
  rename libgtkhtml-editor to libgtkhtml-editor-3.14
* debian/control: Replaces/Conflicts gtkhtml3.14 (<< 3.32.0)
* debian/control: bump libgtk2.0-dev and libgail-dev Build-Depends to 2.20
* debian/rules: disable deprecation warnings so the build completes

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
dnl Initialization
2
2
AC_PREREQ(2.58)
3
 
AC_INIT([gtkhtml], [3.30.3], [http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml])
 
3
AC_INIT([gtkhtml], [3.32.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=GtkHtml])
4
4
AM_INIT_AUTOMAKE([gnu 1.9])
5
5
AC_CONFIG_MACRO_DIR([m4])
6
6
AC_CONFIG_HEADERS(config.h)
9
9
PACKAGE=gtkhtml
10
10
 
11
11
dnl Required Package Versions
12
 
m4_define([gtk_minimum_version], [2.18.0])
13
 
m4_define([gail_minimum_version], [1.1.0])
14
12
m4_define([enchant_minimum_version], [1.1.7])
15
13
m4_define([gnome_icon_theme_minimum_version], [2.22.0])
16
14
 
17
 
GTKHTML_API_VERSION=3.14
 
15
dnl **********************************
 
16
dnl GTK version
 
17
dnl **********************************
 
18
 
 
19
AC_ARG_ENABLE([gtk3],
 
20
        AS_HELP_STRING([--enable-gtk3],
 
21
        [Attempt to use gtk+-3]),
 
22
        [enable_gtk3=$enableval],[enable_gtk3=no])
 
23
 
 
24
if test "x${enable_gtk3}" = "xyes"; then
 
25
        GTK_PACKAGE="gtk+-3.0"
 
26
        GAIL_PACKAGE="gail-3.0"
 
27
        gtk_minimum_version="2.90.4"
 
28
        GTKHTML_API_VERSION=4.0
 
29
        EDITOR_API_VERSION=4.0
 
30
else    
 
31
        GTK_PACKAGE="gtk+-2.0"
 
32
        GAIL_PACKAGE="gail"
 
33
        gtk_minimum_version="2.20.0"
 
34
        GTKHTML_API_VERSION=3.14
 
35
        EDITOR_API_VERSION=3.14
 
36
fi
 
37
AM_CONDITIONAL([ENABLE_GTK3], [test "$enable_gtk3" = yes])
 
38
 
18
39
AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "${GTKHTML_API_VERSION}", [GtkHTML API Version])
19
40
AC_SUBST(GTKHTML_API_VERSION)
20
41
 
21
 
EDITOR_API_VERSION=3.14
22
42
AC_DEFINE_UNQUOTED(EDITOR_API_VERSION, "${EDITOR_API_VERSION}", [Editor API Version])
23
43
AC_SUBST(EDITOR_API_VERSION)
24
44
 
47
67
dnl **********************************
48
68
dnl Compiler Warning Flags
49
69
dnl **********************************
 
70
AC_ARG_ENABLE([deprecated_warning_flags],
 
71
        AS_HELP_STRING([--enable-deprecated-warning-flags],
 
72
        [Enable warning flags for deprecated apis]),
 
73
        [enable_deprecated_flags=$enableval],[enable_deprecated_flags=yes])
 
74
 
 
75
if test "x${enable_deprecated_flags}" = "xyes"; then
 
76
        AS_COMPILER_FLAGS(DEPRECATED_WARNING_FLAGS,
 
77
                "-DG_DISABLE_DEPRECATED
 
78
                -DPANGO_DISABLE_DEPRECATED
 
79
                -DGDK_DISABLE_DEPRECATED
 
80
                -DGDK_PIXBUF_DISABLE_DEPRECATED
 
81
                -DGTK_DISABLE_DEPRECATED
 
82
                -DGNOME_DISABLE_DEPRECATED")
 
83
        AC_SUBST(WARNING_FLAGS)
 
84
fi
 
85
 
50
86
AS_COMPILER_FLAGS(WARNING_FLAGS,
51
 
        "-DG_DISABLE_DEPRECATED
52
 
        -DPANGO_DISABLE_DEPRECATED
53
 
        -DGDK_DISABLE_DEPRECATED
54
 
        -DGDK_PIXBUF_DISABLE_DEPRECATED
55
 
        -DGTK_DISABLE_DEPRECATED
56
 
        -DGNOME_DISABLE_DEPRECATED
57
 
        -DG_DISABLE_SINGLE_INCLUDES
 
87
        "-DG_DISABLE_SINGLE_INCLUDES
58
88
        -DGTK_DISABLE_SINGLE_INCLUDES
59
89
        -Wall -Wextra
60
90
        -Wno-missing-field-initializers
76
106
dnl     -Wshadow
77
107
dnl     -Wstrict-aliasing=2
78
108
 
79
 
dnl GCC 4.4 got more aggressive in its aliasing optimizations, changing
80
 
dnl behavior that -- according to the C99 standard -- is supposed to be
81
 
dnl undefined.  We may still have aliasing abuses lying around that rely
82
 
dnl on GCC's previous "undefined" behavior, so disable strict-aliasing
83
 
dnl optimization until we can find and fix all the abuses.
84
 
dnl XXX This really belongs in AM_CFLAGS.
85
 
CFLAGS="$CFLAGS $WARNING_FLAGS -fno-strict-aliasing"
 
109
dnl XXX This really belongs in AM_CPPFLAGS.
 
110
CFLAGS="$CFLAGS $DEPRECATED_WARNING_FLAGS  $WARNING_FLAGS"
86
111
 
87
112
dnl *********************
88
113
dnl Necessary programs
97
122
AC_CHECK_FUNCS([memchr memmove memset regcomp setlocale strchr strcspn strrchr strstr strtol strtoull])
98
123
AC_CHECK_HEADERS([fcntl.h libintl.h])
99
124
 
 
125
dnl GCC 4.4 got more aggressive in its aliasing optimizations, changing
 
126
dnl behavior that -- according to the C99 standard -- is supposed to be
 
127
dnl undefined.  We may still have aliasing abuses lying around that rely
 
128
dnl on GCC's previous "undefined" behavior, so disable strict-aliasing
 
129
dnl optimization until we can find and fix all the abuses.
 
130
dnl (AC_PROG_CC must run first to set the GCC variable.)
 
131
dnl XXX This really belongs in AM_CFLAGS.
 
132
if test "x${GCC}" = "xyes"; then
 
133
        CFLAGS="$CFLAGS -fno-strict-aliasing"
 
134
fi
 
135
 
100
136
dnl *****************
101
137
dnl libtool
102
138
dnl *****************
129
165
dnl **********************************
130
166
dnl GAIL modules
131
167
dnl **********************************
132
 
GAIL_MODULES="gail >= gail_minimum_version"
 
168
GAIL_MODULES="$GAIL_PACKAGE >= $gtk_minimum_version"
133
169
PKG_CHECK_MODULES(GAIL, $GAIL_MODULES)
134
170
AC_SUBST(GAIL_CFLAGS)
135
171
AC_SUBST(GAIL_LIBS)
136
172
AC_SUBST(GAIL_MODULES)
137
173
 
138
174
dnl **********************************
139
 
dnl GTHREAD modules
140
 
dnl **********************************
141
 
GTHREAD_MODULES="gthread-2.0"
142
 
PKG_CHECK_MODULES(GTHREAD, $GTHREAD_MODULES)
143
 
AC_SUBST(GTHREAD_CFLAGS)
144
 
AC_SUBST(GTHREAD_LIBS)
145
 
 
146
 
dnl **********************************
147
175
dnl GTKHTML modules
148
176
dnl **********************************
149
 
GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 iso-codes"
 
177
GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 iso-codes"
150
178
PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
151
179
AC_SUBST(GTKHTML_CFLAGS)
152
180
AC_SUBST(GTKHTML_LIBS)
228
256
fi
229
257
 
230
258
dnl **************************************************
 
259
dnl XF86 multimedia keys support
 
260
dnl **************************************************
 
261
AC_CHECK_HEADER([X11/XF86keysym.h],
 
262
        [AC_DEFINE([HAVE_XFREE], 1, [Have <X11/XF86keysym.h>])],,
 
263
        [[      #if HAVE_XFREE
 
264
                #include <X11/XF86keysym.h>
 
265
                #endif
 
266
        ]])
 
267
 
 
268
dnl **************************************************
231
269
dnl regex library
232
270
dnl **************************************************
233
271
AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,[REGEX_LIBS=-lregex],[AC_MSG_ERROR([No regex library found])])])
260
298
dnl Increment the following if the interface has additions, changes,
261
299
dnl removals.
262
300
GTKHTML_CURRENT=20
 
301
GTKHTML_GTK3_CURRENT=0
263
302
 
264
303
dnl Increment any time the source changes; set to 0 if you
265
304
dnl increment CURRENT.
266
305
GTKHTML_REVISION=1
 
306
GTKHTML_GTK3_REVISION=0
267
307
 
268
308
dnl Increment if any interfaces have been added; set to 0
269
309
dnl if any interfaces have been removed. removal has 
270
310
dnl precedence over adding, so set to 0 if both happened.
271
311
GTKHTML_AGE=1
 
312
GTKHTML_GTK3_AGE=0
272
313
 
273
314
AC_SUBST(GTKHTML_CURRENT)
274
315
AC_SUBST(GTKHTML_REVISION)
275
316
AC_SUBST(GTKHTML_AGE)
 
317
AC_SUBST(GTKHTML_GTK3_CURRENT)
 
318
AC_SUBST(GTKHTML_GTK3_REVISION)
 
319
AC_SUBST(GTKHTML_GTK3_AGE)
276
320
 
277
321
dnl **************
278
322
dnl Done.
295
339
echo "
296
340
Configuration:
297
341
 
 
342
        GTK+ package            :               ${GTK_PACKAGE}
298
343
        Cookies support in soup :               ${HAVE_NEWSOUP}
299
344
        Editor component type   :               ${GNOME_GTKHTML_EDITOR_TYPE}
300
345
"