← Back to branch summary

~ubuntu-branches/ubuntu/trusty/epiphany-browser/trusty

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2011-11-21 17:15:18 UTC
  • mfrom: (1.6.3) (98.2.3 sid)
  • Revision ID: package-import@ubuntu.com-20111121171518-0f07y0i5rvb2wrix
Tags: 3.2.1-2ubuntu1
* Resynchronize on Debian, remaining diffs:
* debian/branding.conf.in: set the branding to Ubuntu.
* debian/epiphany-browser-data.gsettings-override:
  - set startpage and search to Ubuntu
* debian/patches/80_ubuntu_search_url.patch: use Ubuntu search
* debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
  - update the bookmarks menu every time the internal structure
    is changed (needed for the indicator application menu to work correctly).

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
16
16
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
17
17
 
18
18
m4_define([epiphany_version_major],[3])
19
 
m4_define([epiphany_version_minor],[0])
20
 
m4_define([epiphany_version_micro],[4])
 
19
m4_define([epiphany_version_minor],[2])
 
20
m4_define([epiphany_version_micro],[1])
21
21
m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro])
22
22
 
23
23
# This can be either "trunk" or "branches/gnome-x-y"
31
31
AC_CONFIG_HEADERS([config.h])
32
32
AC_CONFIG_SRCDIR([configure.ac])
33
33
 
34
 
EPIPHANY_API_VERSION=3.0
 
34
EPIPHANY_API_VERSION=3.2
35
35
 
36
36
# This should stay at the major version of the latest stable releases
37
 
EPIPHANY_UA_VERSION=3.0
 
37
EPIPHANY_UA_VERSION=3.2
38
38
 
39
39
AC_SUBST([EPIPHANY_MAJOR],[epiphany_version_major.epiphany_version_minor])
40
40
AC_SUBST([EPIPHANY_API_VERSION])
45
45
AC_SUBST([EPIPHANY_MINOR_VERSION], [epiphany_version_minor])
46
46
AC_SUBST([EPIPHANY_MICRO_VERSION], [epiphany_version_micro])
47
47
 
48
 
# Build ID
49
 
BUILDID="$(TZ=UTC0 date +'%Y%m%d')"
50
 
AC_SUBST([BUILDID])
51
 
 
52
 
AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip tar-ustar])
 
48
AM_INIT_AUTOMAKE([1.9 foreign dist-xz no-dist-gzip tar-ustar])
53
49
 
54
50
# Use AM_SILENT_RULES if present
55
51
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
87
83
        DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
88
84
fi
89
85
 
90
 
GLIB_REQUIRED=2.25.13
 
86
GLIB_REQUIRED=2.29.10
91
87
GTK_REQUIRED=3.0.2
92
88
LIBXML_REQUIRED=2.6.12
93
89
LIBXSLT_REQUIRED=1.1.7
94
 
LIBSTARTUP_NOTIFICATION_REQUIRED=0.5
95
 
DBUS_GLIB_REQUIRED=0.35
96
 
WEBKIT_GTK_REQUIRED=1.4.2
 
90
WEBKIT_GTK_REQUIRED=1.6.1
97
91
LIBSOUP_GNOME_REQUIRED=2.33.1
98
92
GNOME_KEYRING_REQUIRED=2.26.0
99
93
GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.1
 
94
LIBNOTIFY_REQUIRED=0.5.1
100
95
 
101
96
# Tests
102
97
 
120
115
                  sm
121
116
                  libxml-2.0 >= $LIBXML_REQUIRED
122
117
                  libxslt >= $LIBXSLT_REQUIRED
123
 
                  libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
124
118
                  webkitgtk-3.0 >= $WEBKIT_GTK_REQUIRED
125
119
                  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
126
120
                  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
127
 
                  gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
 
121
                  gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
 
122
                  libnotify >= $LIBNOTIFY_REQUIRED
128
123
                  ])
129
124
 
130
 
# ****
131
 
# DBUS
132
 
# ****
133
 
 
134
 
PKG_CHECK_MODULES([DBUS],[dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
135
 
 
136
 
AC_PATH_PROG([DBUS_BINDING_TOOL],[dbus-binding-tool],[no])
137
 
 
138
 
if test "$DBUS_BINDING_TOOL" = "no"; then
139
 
        AC_MSG_ERROR([dbus-binding-tool not found])
140
 
fi
141
 
 
142
125
# ******************
143
126
# Portability checks
144
127
# ******************
308
291
 
309
292
AM_CONDITIONAL([ENABLE_ZEROCONF],[test "$enable_zeroconf" = "yes"])
310
293
 
311
 
# NetworkManager
312
 
 
313
 
AC_MSG_CHECKING([whether to enable NetworkManager support])
314
 
AC_ARG_ENABLE([network-manager],
315
 
        AS_HELP_STRING([--enable-network-manager],[Whether to enable automatic network status with NetworkManager (default: disabled)]),
316
 
        [],[enable_network_manager=no])
317
 
AC_MSG_RESULT([$enable_network_manager])
318
 
 
319
 
if test "$enable_network_manager" != "no"; then
320
 
        PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager, [have_network_manager=yes],[have_network_manager=no])
321
 
 
322
 
        if test "$enable_network_manager" = "yes" -a "$have_network_manager" = "no"; then
323
 
                AC_MSG_ERROR([NetworkManager support requested but NetworkManager headers not found])
324
 
        elif test "$have_network_manager" = "no"; then
325
 
                AC_MSG_WARN([NetworkManager headers not found; disabling NetworkManager support])
326
 
        fi
327
 
fi
328
 
 
329
 
if test "$enable_network_manager" = "yes"; then
330
 
        AC_DEFINE([ENABLE_NETWORK_MANAGER],[1],[Define for NetworkManager support])
331
 
fi
332
 
 
333
 
AM_CONDITIONAL([ENABLE_NETWORK_MANAGER],[test "$enable_network_manager" = "yes"])
 
294
# GDBus codegen
 
295
AC_PATH_PROG([GDBUS_CODEGEN], [gdbus-codegen], AC_MSG_ERROR([gdbus-codegen is required but was not found]))
334
296
 
335
297
# ************
336
298
# Misc defines
459
421
        Extra debugging support    : $enable_debug
460
422
 
461
423
        Zeroconf bookmarks support : $enable_zeroconf
462
 
        NetworkManager support     : $enable_network_manager
463
424
        GObject introspection      : $found_introspection
464
425
        Seed support               : $enable_seed
465
426
        NSS support                : $enable_nss