Imported Upstream version 1.1.92

1 files changed, 112 insertions, 112 deletions

diff --git a/configure b/configure
index 4d4dab1e..fb5e6cdc 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for nm-applet 1.1.91.
+# Generated by GNU Autoconf 2.69 for nm-applet 1.1.92.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='nm-applet'
 PACKAGE_TARNAME='network-manager-applet'
-PACKAGE_VERSION='1.1.91'
-PACKAGE_STRING='nm-applet 1.1.91'
+PACKAGE_VERSION='1.1.92'
+PACKAGE_STRING='nm-applet 1.1.92'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -663,6 +663,8 @@ MM_GLIB_LIBS
 MM_GLIB_CFLAGS
 HAVE_GBT_FALSE
 HAVE_GBT_TRUE
+DBUSMENU_LIBS
+DBUSMENU_CFLAGS
 APPINDICATOR_LIBS
 APPINDICATOR_CFLAGS
 GTK_LIBS
@@ -677,8 +679,6 @@ LIBNM_LIBS
 LIBNM_CFLAGS
 LIBNM_GLIB_LIBS
 LIBNM_GLIB_CFLAGS
-DBUS_GLIB_LIBS
-DBUS_GLIB_CFLAGS
 ISO_CODES_LIBS
 ISO_CODES_CFLAGS
 MKINSTALLDIRS
@@ -886,8 +886,6 @@ CPP
 LT_SYS_LIBRARY_PATH
 ISO_CODES_CFLAGS
 ISO_CODES_LIBS
-DBUS_GLIB_CFLAGS
-DBUS_GLIB_LIBS
 LIBNM_GLIB_CFLAGS
 LIBNM_GLIB_LIBS
 LIBNM_CFLAGS
@@ -902,6 +900,8 @@ GTK_CFLAGS
 GTK_LIBS
 APPINDICATOR_CFLAGS
 APPINDICATOR_LIBS
+DBUSMENU_CFLAGS
+DBUSMENU_LIBS
 MM_GLIB_CFLAGS
 MM_GLIB_LIBS
 GUDEV_CFLAGS
@@ -1448,7 +1448,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures nm-applet 1.1.91 to adapt to many kinds of systems.
+\`configure' configures nm-applet 1.1.92 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1519,7 +1519,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nm-applet 1.1.91:";;
+     short | recursive ) echo "Configuration of nm-applet 1.1.92:";;
    esac
   cat <<\_ACEOF
 
@@ -1587,10 +1587,6 @@ Some influential environment variables:
               C compiler flags for ISO_CODES, overriding pkg-config
   ISO_CODES_LIBS
               linker flags for ISO_CODES, overriding pkg-config
-  DBUS_GLIB_CFLAGS
-              C compiler flags for DBUS_GLIB, overriding pkg-config
-  DBUS_GLIB_LIBS
-              linker flags for DBUS_GLIB, overriding pkg-config
   LIBNM_GLIB_CFLAGS
               C compiler flags for LIBNM_GLIB, overriding pkg-config
   LIBNM_GLIB_LIBS
@@ -1615,6 +1611,10 @@ Some influential environment variables:
               C compiler flags for APPINDICATOR, overriding pkg-config
   APPINDICATOR_LIBS
               linker flags for APPINDICATOR, overriding pkg-config
+  DBUSMENU_CFLAGS
+              C compiler flags for DBUSMENU, overriding pkg-config
+  DBUSMENU_LIBS
+              linker flags for DBUSMENU, overriding pkg-config
   MM_GLIB_CFLAGS
               C compiler flags for MM_GLIB, overriding pkg-config
   MM_GLIB_LIBS
@@ -1691,7 +1691,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-nm-applet configure 1.1.91
+nm-applet configure 1.1.92
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2114,7 +2114,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by nm-applet $as_me 1.1.91, which was
+It was created by nm-applet $as_me 1.1.92, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2982,7 +2982,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='network-manager-applet'
- VERSION='1.1.91'
+ VERSION='1.1.92'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12436,7 +12436,7 @@ CC=$lt_save_CC
 
 
 
-NMA_GIT_SHA=7009f47262415b2afe4e0b1c935734ee11622876
+NMA_GIT_SHA=24a429fdf51a5c683db86312f89ee9f13b8b3256
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13834,98 +13834,6 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS_GLIB" >&5
-$as_echo_n "checking for DBUS_GLIB... " >&6; }
-
-if test -n "$DBUS_GLIB_CFLAGS"; then
-    pkg_cv_DBUS_GLIB_CFLAGS="$DBUS_GLIB_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.74\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.74") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.74" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$DBUS_GLIB_LIBS"; then
-    pkg_cv_DBUS_GLIB_LIBS="$DBUS_GLIB_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.74\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.74") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.74" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-glib-1 >= 0.74" 2>&1`
-        else
-	        DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-glib-1 >= 0.74" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DBUS_GLIB_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (dbus-glib-1 >= 0.74) were not met:
-
-$DBUS_GLIB_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
-and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
-and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS
-	DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
-pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNM_GLIB" >&5
 $as_echo_n "checking for LIBNM_GLIB... " >&6; }
 
@@ -14612,7 +14520,98 @@ $as_echo "yes" >&6; }
 
 fi
 
-$as_echo "#define ENABLE_INDICATOR 1" >>confdefs.h
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUSMENU" >&5
+$as_echo_n "checking for DBUSMENU... " >&6; }
+
+if test -n "$DBUSMENU_CFLAGS"; then
+    pkg_cv_DBUSMENU_CFLAGS="$DBUSMENU_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-gtk3-0.4 >= 16.04.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbusmenu-gtk3-0.4 >= 16.04.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DBUSMENU_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-gtk3-0.4 >= 16.04.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$DBUSMENU_LIBS"; then
+    pkg_cv_DBUSMENU_LIBS="$DBUSMENU_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-gtk3-0.4 >= 16.04.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "dbusmenu-gtk3-0.4 >= 16.04.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DBUSMENU_LIBS=`$PKG_CONFIG --libs "dbusmenu-gtk3-0.4 >= 16.04.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        DBUSMENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbusmenu-gtk3-0.4 >= 16.04.0" 2>&1`
+        else
+	        DBUSMENU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbusmenu-gtk3-0.4 >= 16.04.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$DBUSMENU_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (dbusmenu-gtk3-0.4 >= 16.04.0) were not met:
+
+$DBUSMENU_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables DBUSMENU_CFLAGS
+and DBUSMENU_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables DBUSMENU_CFLAGS
+and DBUSMENU_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	DBUSMENU_CFLAGS=$pkg_cv_DBUSMENU_CFLAGS
+	DBUSMENU_LIBS=$pkg_cv_DBUSMENU_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+$as_echo "#define WITH_APPINDICATOR 1" >>confdefs.h
 
 fi
 
@@ -14900,6 +14899,7 @@ $as_echo "$found_introspection" >&6; }
        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
     fi
+    INTROSPECTION_SCANNER='CFLAGS="${CFLAGS} -Wno-error" '"$INTROSPECTION_SCANNER"
 
 
 
@@ -16405,7 +16405,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nm-applet $as_me 1.1.91, which was
+This file was extended by nm-applet $as_me 1.1.92, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16471,7 +16471,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-nm-applet config.status 1.1.91
+nm-applet config.status 1.1.92
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"