← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-main-menu/trusty

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Julian Andres Klode, Julian Andres Klode, Josselin Mouette
  • Date: 2011-03-14 19:09:51 UTC
  • mfrom: (1.1.7 upstream) (2.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20110314190951-kfrk4hocrw1pk0ow
Tags: 0.9.16-1
http://bugs.debian.org/611550
http://bugs.debian.org/587880
[ Julian Andres Klode ]
* New upstream release:
  - All patches merged upstream (except for default-applications.diff)
  - Correctly links against libxml2 (Closes: #611550)
* default-applications.diff: remove the firefox change (upstream now)

[ Josselin Mouette ]
* Drop type-handling usage. Closes: #587880.
* Bump standards version accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
1
 
AC_INIT([gnome-main-menu], [0.9.14], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-main-menu])
 
1
AC_INIT([gnome-main-menu], [0.9.16], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-main-menu])
2
2
 
3
3
AC_CONFIG_SRCDIR([.])
4
4
AC_CONFIG_HEADERS([config.h])
5
5
 
6
 
AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
6
AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar])
7
7
AM_MAINTAINER_MODE
8
8
 
9
9
AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
31
31
dnl ==============================================
32
32
 
33
33
GLIB_REQUIRED=2.16.0
34
 
GTK_REQUIRED=2.14
 
34
GTK_REQUIRED=2.18
35
35
SLAB_REQUIRED=2.29.0
36
36
 
37
37
AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject)
43
43
                gdk-2.0                         \
44
44
                libslab >= $SLAB_REQUIRED"
45
45
 
46
 
PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 x11 cairo ])
47
 
 
 
46
 
 
47
PKG_CHECK_MODULES(APPLICATION_BROWSER, [ $COMMON_MODULES gnome-desktop-2.0 unique-1.0 ])
 
48
AC_SUBST(APPLICATION_BROWSER_CFLAGS)
 
49
AC_SUBST(APPLICATION_BROWSER_LIBS)
 
50
 
 
51
PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libxml-2.0 x11 cairo ])
48
52
AC_SUBST(MAIN_MENU_CFLAGS)
49
53
AC_SUBST(MAIN_MENU_LIBS)
50
54
 
51
 
# Check for Network Manager
 
55
# Check for network support
52
56
NM_GLIB=
53
 
PKG_CHECK_EXISTS(libnm-glib, [ NM_GLIB=libnm-glib],
54
 
                 PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ]))
55
 
 
56
 
PKG_CHECK_MODULES(NETWORK, [NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0], HAVE_NETWORK=1, HAVE_NETWORK=0)
57
 
AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, , HAVE_NETWORK=0, -lm)], HAVE_NETWORK=0)
58
 
 
59
 
if test "x$HAVE_NETWORK" != "x1" ; then
60
 
        AC_WARN(Missing network manager or iwlib, network support disabled)
 
57
PKG_CHECK_EXISTS(libnm-glib, [ NM_GLIB=libnm-glib ],
 
58
                 PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ]))
 
59
if test "x$NM_GLIB" = "x"; then
 
60
        # make sure we have something set for the call to PKG_CHECK_MODULES
 
61
        NM_GLIB=libnm-glib
 
62
fi
 
63
 
 
64
PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0], HAVE_NM=1, HAVE_NM=0)
 
65
if test "x$HAVE_NM" != "x1"; then
 
66
        AC_WARN(NetworkManager is not available)
 
67
fi
 
68
 
 
69
AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, HAVE_IWLIB=1, HAVE_IWLIB=0, -lm)], HAVE_IWLIB=0)
 
70
if test "x$HAVE_IWLIB" != "x1"; then
 
71
        AC_WARN(iwlib is not available)
 
72
fi
 
73
 
 
74
HAVE_NETWORK=0
 
75
NETWORK_CFLAGS=
 
76
NETWORK_LIBS=
 
77
if test "x$HAVE_NM" != "x1" -o "x$HAVE_IWLIB" != "x1"; then
 
78
        AC_WARN(network support disabled)
61
79
else
62
 
        AC_DEFINE(HAVE_NETWORK, 1, [use network-manager and wireless])
63
 
        NETWORK_LIBS="$NETWORK_LIBS -liw -lm"
 
80
        HAVE_NETWORK=1
 
81
        NETWORK_CFLAGS="$NETWORKMANAGER_CFLAGS"
 
82
        NETWORK_LIBS="$NETWORKMANAGER_LIBS -liw -lm"
 
83
        AC_DEFINE(HAVE_NETWORK, 1, [Use NetworkManager and wireless library])
64
84
fi
65
85
 
66
86
AM_CONDITIONAL(HAVE_NETWORK, test "x$HAVE_NETWORK" = "x1")
 
87
AC_SUBST(NETWORK_CFLAGS)
67
88
AC_SUBST(NETWORK_LIBS)
68
 
AC_SUBST(NETWORK_MAIN)
69
 
 
70
 
 
71
 
PKG_CHECK_MODULES(APPLICATION_BROWSER, [ $COMMON_MODULES gnome-desktop-2.0 unique-1.0 ])
72
 
 
73
 
AC_SUBST(APPLICATION_BROWSER_CFLAGS)
74
 
AC_SUBST(APPLICATION_BROWSER_LIBS)
75
89
 
76
90
dnl ==============================================
77
91
dnl Gconf