Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 463920 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (-2 / +44 lines)
Lines 94-101 Link Here
94
			       libcanberra libcanberra-gtk3
94
			       libcanberra libcanberra-gtk3
95
                               telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
95
                               telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
96
                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
96
                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
97
                               libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
98
                               libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
99
                               libsecret-unstable gcr-3 >= $GCR_MIN_VERSION)
97
                               libsecret-unstable gcr-3 >= $GCR_MIN_VERSION)
100
98
101
PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
99
PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
Lines 154-159 Link Here
154
            [Define if _NL_TIME_FIRST_WEEKDAY is available])
157
            [Define if _NL_TIME_FIRST_WEEKDAY is available])
155
fi
158
fi
156
159
160
AC_ARG_ENABLE(networkmanager,
161
	      AS_HELP_STRING([--disable-networkmanager],
162
			     [disable NetworkManager support  @<:@default=auto@:>@]),,
163
              [enable_networkmanager=auto])
164
165
if test "x$enable_networkmanager" != "xno"; then
166
   PKG_CHECK_MODULES(NETWORKMANAGER,
167
                     [libnm-glib 
168
		      libnm-util >= $NETWORKMANAGER_MIN_VERSION
169
		      libnm-gtk >= $NETWORKMANAGER_MIN_VERSION 
170
		      gnome-keyring-1],
171
                     [have_networkmanager=yes],
172
                     [have_networkmanager=no])
173
174
   GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
175
   GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
176
else
177
   have_networkmanager="no  (disabled)"
178
fi
179
180
if test "x$have_networkmanager" = "xyes"; then
181
   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
182
   AC_SUBST([HAVE_NETWORKMANAGER], [1])
183
else
184
   if test "x$enable_networkmanager" = "xyes"; then
185
      AC_MSG_ERROR([Couldn't find NetworkManager.])
186
   fi
187
   AC_SUBST([HAVE_NETWORKMANAGER], [0])
188
fi
189
190
AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
191
157
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS
192
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS
158
AM_PATH_GLIB_2_0()
193
AM_PATH_GLIB_2_0()
159
194
Lines 199-201 Link Here
199
  man/Makefile
234
  man/Makefile
200
])
235
])
201
AC_OUTPUT
236
AC_OUTPUT
237
238
echo "
239
Build configuration:
240
241
	Prefix:                                 ${prefix}
242
	Source code location:                   ${srcdir}
243
	Compiler:                               ${CC}
244
	Compiler Warnings:                      $enable_compile_warnings
245
246
	Support for NetworkManager:             $have_networkmanager
247
	Support for GStreamer recording:        $build_recorder
248
"

Return to bug 463920