Imported Upstream version 0.8.9997upstream/0.8.9997

1 files changed, 58 insertions, 87 deletions

diff --git a/configure b/configure
index 7405069dc..2f3e24415 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.68 for NetworkManager 0.8.999.
+# Generated by GNU Autoconf 2.68 for NetworkManager 0.8.9997.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -571,8 +571,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='0.8.999'
-PACKAGE_STRING='NetworkManager 0.8.999'
+PACKAGE_VERSION='0.8.9997'
+PACKAGE_STRING='NetworkManager 0.8.9997'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -656,6 +656,8 @@ GNUTLS_CFLAGS
 PKGCONFIG_PATH
 NSS_LIBS
 NSS_CFLAGS
+WITH_POLKIT_FALSE
+WITH_POLKIT_TRUE
 POLKIT_LIBS
 POLKIT_CFLAGS
 WITH_WIMAX_FALSE
@@ -921,6 +923,7 @@ with_udev_dir
 with_systemdsystemunitdir
 with_ck
 enable_wimax
+enable_polkit
 with_crypto
 with_dbus_sys_dir
 enable_ppp
@@ -1520,7 +1523,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 NetworkManager 0.8.999 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 0.8.9997 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1590,7 +1593,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 0.8.999:";;
+     short | recursive ) echo "Configuration of NetworkManager 0.8.9997:";;
    esac
   cat <<\_ACEOF
 
@@ -1615,6 +1618,7 @@ Optional Features:
                           Enable introspection for this build
   --enable-qt             enable Qt examples
   --enable-wimax          enable WiMAX support
+  --enable-polkit         enable PolicyKit support
   --enable-ppp            enable PPP/PPPoE support
   --enable-more-warnings  Maximum compiler warnings
   --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
@@ -1783,7 +1787,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 0.8.999
+NetworkManager configure 0.8.9997
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2327,7 +2331,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 NetworkManager $as_me 0.8.999, which was
+It was created by NetworkManager $as_me 0.8.9997, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3148,7 +3152,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='0.8.999'
+ VERSION='0.8.9997'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16275,8 +16279,8 @@ fi
 
 NM_MAJOR_VERSION=0
 NM_MINOR_VERSION=8
-NM_MICRO_VERSION=999
-NM_VERSION=0.8.999
+NM_MICRO_VERSION=9997
+NM_VERSION=0.8.9997
 
 
 
@@ -21209,12 +21213,12 @@ if test -n "$POLKIT_CFLAGS"; then
     pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "polkit-gobject-1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= 0.97\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= 0.97") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-gobject-1" 2>/dev/null`
+  pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-gobject-1 >= 0.97" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -21225,12 +21229,12 @@ if test -n "$POLKIT_LIBS"; then
     pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "polkit-gobject-1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= 0.97\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= 0.97") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-gobject-1" 2>/dev/null`
+  pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-gobject-1 >= 0.97" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -21250,98 +21254,55 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gobject-1" 2>&1`
+	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gobject-1 >= 0.97" 2>&1`
         else
-	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1" 2>&1`
+	        POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1 >= 0.97" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$POLKIT_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (polkit-gobject-1) were not met:
-
-$POLKIT_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 POLKIT_CFLAGS
-and POLKIT_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-
+	have_polkit=no
 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 POLKIT_CFLAGS
-and POLKIT_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; }
-
+	have_polkit=no
 else
 	POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS
 	POLKIT_LIBS=$pkg_cv_POLKIT_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
+	have_polkit=yes
+fi
+# Check whether --enable-polkit was given.
+if test "${enable_polkit+set}" = set; then :
+  enableval=$enable_polkit; enable_polkit=${enableval}
+else
+  enable_polkit=${have_polkit}
 fi
 
+if (test "${enable_polkit}" = "yes"); then
+	if test x"$have_polkit" = x"no"; then
+		as_fn_error $? "PolicyKit development headers are required" "$LINENO" 5
+	fi
 
-# Check for polkit_authority_get_sync()
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for polkit_authority_get_sync in -lpolkit-gobject-1" >&5
-$as_echo_n "checking for polkit_authority_get_sync in -lpolkit-gobject-1... " >&6; }
-if ${ac_cv_lib_polkit_gobject_1_polkit_authority_get_sync+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpolkit-gobject-1  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char polkit_authority_get_sync ();
-int
-main ()
-{
-return polkit_authority_get_sync ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_polkit_gobject_1_polkit_authority_get_sync=yes
+
+$as_echo "#define WITH_POLKIT 1" >>confdefs.h
+
 else
-  ac_cv_lib_polkit_gobject_1_polkit_authority_get_sync=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+$as_echo "#define WITH_POLKIT 0" >>confdefs.h
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_polkit_gobject_1_polkit_authority_get_sync" >&5
-$as_echo "$ac_cv_lib_polkit_gobject_1_polkit_authority_get_sync" >&6; }
-if test "x$ac_cv_lib_polkit_gobject_1_polkit_authority_get_sync" = xyes; then :
-  ac_have_pk_auth_get_sync="1"
+ if test "${enable_polkit}" = "yes"; then
+  WITH_POLKIT_TRUE=
+  WITH_POLKIT_FALSE='#'
 else
-  ac_have_pk_auth_get_sync="0"
+  WITH_POLKIT_TRUE='#'
+  WITH_POLKIT_FALSE=
 fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_POLKIT_AUTHORITY_GET_SYNC $ac_have_pk_auth_get_sync
-_ACEOF
-
-
 
 # Check whether --with-crypto was given.
 if test "${with_crypto+set}" = set; then :
@@ -22516,6 +22477,10 @@ if test -z "${WITH_WIMAX_TRUE}" && test -z "${WITH_WIMAX_FALSE}"; then
   as_fn_error $? "conditional \"WITH_WIMAX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_POLKIT_TRUE}" && test -z "${WITH_POLKIT_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_POLKIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_NSS_TRUE}" && test -z "${WITH_NSS_FALSE}"; then
   as_fn_error $? "conditional \"WITH_NSS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -22961,7 +22926,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 NetworkManager $as_me 0.8.999, which was
+This file was extended by NetworkManager $as_me 0.8.9997, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23027,7 +22992,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="\\
-NetworkManager config.status 0.8.999
+NetworkManager config.status 0.8.9997
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -25323,6 +25288,12 @@ else
 	echo systemd support: no
 fi
 
+if test "${enable_polkit}" = "yes"; then
+	echo PolicyKit support: yes
+else
+	echo PolicyKit support: no
+fi
+
 if test -n "${with_ck}"; then
 	echo ConsoleKit support: ${with_ck}
 else