← Back to branch summary

~ubuntu-branches/ubuntu/maverick/packagekit/maverick-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Heinlein
  • Date: 2009-08-25 13:03:26 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090825130326-jrky8pfx0ukz0lib
Tags: 0.4.9+20090825-0ubuntu1
https://launchpad.net/bugs/342671
https://launchpad.net/bugs/374011
https://launchpad.net/bugs/374011
https://launchpad.net/bugs/256245
https://launchpad.net/bugs/388623
https://launchpad.net/bugs/348053
https://launchpad.net/bugs/415993
https://launchpad.net/bugs/396513
https://launchpad.net/bugs/347327
https://launchpad.net/bugs/345706
https://launchpad.net/bugs/378419
* New upstream snapshot provding a lot of APT backend improvements:
  - Allow to install updates which require the installation of additional
    packages. Updates depending on the removal of a package are still
    blocked (LP: #342671, LP: #374011, LP: #374011)
  - Warn about the installation of untrusted package (LP: #256245)
  - Don't crash in APT post update hook if system D-Bus daemon isn't 
    running (LP: #388623)
  - Don't try to estimate a download progress during cache updating, since
    APT reports only a forth- and backwards running progress. (LP: #348053)
  - Support for python-apt 0.7.12 (LP: #415993)
  - Translated package descriptions
* debian/patches:
  - Remove ignore_packages_in_conffile (Merged upstream)
  - Remove fix_typo (Merged upstream)
  - Add fix_unicode: Handle the encoding messages via stdin/stdout correctly
    (LP: #396513)
  - Add fix_unicode_debfile: Convert the path of the local file which
    should be installed to the correct encoding (LP: #347327)
* debian/libpackagekit-qt-dev.install: Fix install location of CMake module.
  Thanks to Sveinung Kvilhaugsvik (LP: #345706)
* debian/control: Fix spelling of Qt. Thanks to Sveinung Kvilhaugsvik
  (LP: #378419)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
3
3
 
4
4
m4_define([pk_major_version], [0])
5
5
m4_define([pk_minor_version], [4])
6
 
m4_define([pk_micro_version], [8])
 
6
m4_define([pk_micro_version], [10])
7
7
m4_define([pk_version],
8
8
          [pk_major_version.pk_minor_version.pk_micro_version])
9
9
 
10
 
AC_INIT(PackageKit, [pk_version])
 
10
AC_INIT(PackageKit, [pk_version], [richard@hughsie.com], [PackageKit])
11
11
AC_CONFIG_SRCDIR(src)
12
 
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
12
AM_INIT_AUTOMAKE([1.9 tar-ustar])
13
13
AM_CONFIG_HEADER(config.h)
14
14
AC_CONFIG_MACRO_DIR([m4])
15
15
 
 
16
# enable nice build output on automake1.11
 
17
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
18
 
16
19
PK_MAJOR_VERSION=pk_major_version
17
20
PK_MINOR_VERSION=pk_minor_version
18
21
PK_MICRO_VERSION=pk_micro_version
69
72
CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
70
73
CPPFLAGS="$CPPFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED"
71
74
CPPFLAGS="$CPPFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
 
75
CPPFLAGS="$CPPFLAGS -DGSEAL_ENABLE"
72
76
 
73
77
if test "$GCC" = "yes"; then
74
78
        # work both in C and C++
163
167
AC_SUBST(DBUS_CFLAGS)
164
168
AC_SUBST(DBUS_LIBS)
165
169
 
 
170
PKG_CHECK_MODULES(GIO, \
 
171
 gio-2.0 >= $GIO_REQUIRED \
 
172
 gio-unix-2.0 >= $GIO_REQUIRED)
 
173
AC_SUBST(GIO_CFLAGS)
 
174
AC_SUBST(GIO_LIBS)
 
175
 
166
176
dnl ---------------------------------------------------------------------------
167
177
dnl - Build PackageKit-Qt
168
178
dnl ---------------------------------------------------------------------------
255
265
dnl ---------------------------------------------------------------------------
256
266
AC_PATH_PROG([MOC], [moc-qt4])
257
267
 
258
 
dnl ---------------------------------------------------------------------------
259
 
dnl - Is GIO available?
260
 
dnl ---------------------------------------------------------------------------
261
 
PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED gio-unix-2.0 >= $GIO_REQUIRED, PK_BUILD_GIO="yes", PK_BUILD_GIO="no")
262
 
if test "x$PK_BUILD_GIO" = "xyes"; then
263
 
        with_gio="yes"
264
 
        AC_DEFINE(PK_BUILD_GIO, 1, [define if GIO is installed])
265
 
else
266
 
        with_gio="no"
267
 
        PK_BUILD_GIO=no
268
 
fi
269
 
 
270
 
AM_CONDITIONAL(PK_BUILD_GIO, test x$PK_BUILD_GIO = xyes)
271
 
AC_SUBST(GIO_CFLAGS)
272
 
AC_SUBST(GIO_LIBS)
 
268
# unix networking stack always available
 
269
networking_apis="unix"
273
270
 
274
271
dnl ---------------------------------------------------------------------------
275
272
dnl - Is NetworkManager available?
276
273
dnl ---------------------------------------------------------------------------
277
274
PKG_CHECK_MODULES(LIBNM, libnm_glib >= $LIBNM_GLIB_REQUIRED, PK_BUILD_NETWORKMANAGER="yes", PK_BUILD_NETWORKMANAGER="no")
278
275
if test "x$PK_BUILD_NETWORKMANAGER" = "xyes"; then
279
 
        with_networking_stack="NetworkManager"
 
276
        networking_apis="${networking_apis},NetworkManager"
280
277
        AC_DEFINE(PK_BUILD_NETWORKMANAGER, 1, [define if NetworkManager is installed])
281
278
else
282
 
        with_networking_stack="dummy"
283
279
        PK_BUILD_NETWORKMANAGER=no
284
280
fi
285
281
 
288
284
AC_SUBST(LIBNM_LIBS)
289
285
 
290
286
dnl ---------------------------------------------------------------------------
 
287
dnl - Is ConnMan available?
 
288
dnl ---------------------------------------------------------------------------
 
289
PKG_CHECK_MODULES(CONNMAN, connman, PK_BUILD_CONNMAN="yes", PK_BUILD_CONNMAN="no")
 
290
if test "x$PK_BUILD_CONNMAN" = "xyes"; then
 
291
        networking_apis="${networking_apis},ConnMan"
 
292
        AC_DEFINE(PK_BUILD_CONNMAN, 1, [define if Connection Manager is installed])
 
293
else
 
294
        PK_BUILD_CONNMAN=no
 
295
fi
 
296
 
 
297
AM_CONDITIONAL(PK_BUILD_CONNMAN, test x$PK_BUILD_CONNMAN = xyes)
 
298
AC_SUBST(CONNMAN_CFLAGS)
 
299
AC_SUBST(CONNMAN_LIBS)
 
300
 
 
301
dnl ---------------------------------------------------------------------------
291
302
dnl - Is docbook2man available?
292
303
dnl ---------------------------------------------------------------------------
293
304
AC_PATH_PROG(DOCBOOK2MAN, docbook2man, no)
763
774
        Able to run locally:       ${enable_local}
764
775
        Developer warnings:        ${enable_developer}
765
776
        Security framework:        ${with_security_framework}
766
 
        Networking stack:          ${with_networking_stack}
767
 
        GIO support:               ${with_gio}
 
777
        Networking stacks:         ${networking_apis}
768
778
        Browser plugin:            ${build_browser_plugin}
769
779
        GStreamer plugin:          ${build_gstreamer_plugin}
770
780
        Pango module:              ${build_gtk_module}