← Back to branch summary

~dylanmccall/ubuntu/oneiric/network-manager-applet/lp852961-disable-autostart-for-gnome-shell

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-05-30 13:25:18 UTC
  • mto: This revision was merged to the branch mainline in revision 68.
  • Revision ID: james.westby@ubuntu.com-20110530132518-ya5i5mcrl8szsmoj
Tags: upstream-0.8.9997+git.20110529t170033.9ec4c5d
Import upstream version 0.8.9997+git.20110529t170033.9ec4c5d

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
AC_PREREQ([2.63])
2
2
AC_INIT([nm-applet],
3
 
        [0.8.4],
 
3
        [0.8.9997],
4
4
        [https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager],
5
5
        [network-manager-applet])
6
6
 
8
8
AC_CONFIG_MACRO_DIR([m4])
9
9
 
10
10
AM_INIT_AUTOMAKE([1.10 subdir-objects no-dist-gzip dist-bzip2])
11
 
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
12
11
AM_MAINTAINER_MODE([enable])
13
12
 
14
13
# Support silent build rules, requires at least automake-1.11. Disable
69
68
PKG_CHECK_MODULES(NMA,
70
69
                [dbus-glib-1 >= 0.74
71
70
                 glib-2.0 >= 2.16
72
 
                 NetworkManager >= 0.8.4
73
 
                 libnm-glib >= 0.8.4
74
 
                 libnm-util >= 0.8.4
75
 
                 libnm-glib-vpn >= 0.8.4
76
 
                 gtk+-2.0 >= 2.14
77
 
                 gmodule-export-2.0
78
 
                 gconf-2.0
79
 
                 gnome-keyring-1
80
 
                 libnotify >= 0.4.3])
 
71
                 NetworkManager >= 0.8.998
 
72
                 libnm-glib >= 0.8.998
 
73
                 libnm-util >= 0.8.998
 
74
                 libnm-glib-vpn >= 0.8.998
 
75
                 gmodule-export-2.0])
 
76
 
 
77
PKG_CHECK_MODULES(GCONF, [gconf-2.0])
 
78
AC_SUBST(GCONF_CFLAGS)
 
79
AC_SUBST(GCONF_LIBS)
 
80
 
 
81
PKG_CHECK_MODULES(GNOME_KEYRING, [gnome-keyring-1])
 
82
AC_SUBST(GNOME_KEYRING_CFLAGS)
 
83
AC_SUBST(GNOME_KEYRING_LIBS)
 
84
 
 
85
# Check for libnotify >= 0.7
 
86
PKG_CHECK_MODULES(LIBNOTIFY_07, [libnotify >= 0.7], [have_libnotify_07=yes],[have_libnotify_07=no])
 
87
if test x"$have_libnotify_07" = "xyes"; then
 
88
        AC_DEFINE(HAVE_LIBNOTIFY_07, 1, [Define if you have libnotify 0.7 or later])
 
89
fi
 
90
PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.4.3])
 
91
AC_SUBST(NOTIFY_CFLAGS)
 
92
AC_SUBST(NOTIFY_LIBS)
 
93
 
 
94
AC_ARG_WITH([gtkver], AS_HELP_STRING([--with-gtkver], [The major version of GTK+ to build with]),
 
95
            with_gtkver="$withval",with_gtkver=3)
 
96
case "${with_gtkver}" in
 
97
       2) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.20)
 
98
          gtkver=2
 
99
          ;;
 
100
       *) PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.91.4)
 
101
          gtkver=3
 
102
          ;;
 
103
esac
 
104
AC_SUBST(GTK_CFLAGS)
 
105
AC_SUBST(GTK_LIBS)
81
106
 
82
107
# Check for dbus-1.2.6 or later for deny-by-default rules
83
108
PKG_CHECK_MODULES(DBUS_126, [dbus-1 >= 1.2.6], [have_dbus_126=yes],[have_dbus_126=no])
106
131
        *)
107
132
                AC_MSG_CHECKING(for gnome-bluetooth)
108
133
                PKG_CHECK_MODULES(GNOME_BLUETOOTH,
109
 
                                  gconf-2.0
110
134
                                  gnome-bluetooth-1.0 >= 2.27.6
111
 
                                  libnm-util >= 0.8.4
112
 
                                  libnm-glib >= 0.8.4,
 
135
                                  libnm-util >= 0.8.998
 
136
                                  libnm-glib >= 0.8.998,
113
137
                                  have_gbt=yes, have_gbt=no)
114
138
                ;;
115
139
esac
116
140
 
117
141
AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
118
142
 
119
 
# Check for libnotify >= 0.7
120
 
PKG_CHECK_MODULES(LIBNOTIFY_07, [libnotify >= 0.7], [have_libnotify_07=yes],[have_libnotify_07=no])
121
 
if test x"$have_libnotify_07" = "xyes"; then
122
 
        AC_DEFINE(HAVE_LIBNOTIFY_07, 1, [Define if you have libnotify 0.7 or later])
123
 
fi
124
 
 
125
143
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
126
144
 
127
145
dnl GConf stuff
143
161
src/utils/Makefile
144
162
src/utils/tests/Makefile
145
163
src/gconf-helpers/Makefile
 
164
src/gconf-helpers/tests/Makefile
146
165
src/wireless-security/Makefile
147
166
src/connection-editor/Makefile
148
167
src/gnome-bluetooth/Makefile
155
174
po/Makefile.in
156
175
])
157
176
AC_OUTPUT
 
177
 
 
178
echo Building for GTK+ version: ${gtkver}
 
179