Merge commit 'upstream/2.91.91'

1 files changed, 28 insertions, 127 deletions

diff --git a/configure b/configure
index 932044d..9f98833 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.67 for krb5-auth-dialog 2.91.90.
+# Generated by GNU Autoconf 2.67 for krb5-auth-dialog 2.91.91.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='krb5-auth-dialog'
 PACKAGE_TARNAME='krb5-auth-dialog'
-PACKAGE_VERSION='2.91.90'
-PACKAGE_STRING='krb5-auth-dialog 2.91.90'
+PACKAGE_VERSION='2.91.91'
+PACKAGE_STRING='krb5-auth-dialog 2.91.91'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -778,8 +778,6 @@ GIO_LIBS
 GIO_CFLAGS
 GCONF_LIBS
 GCONF_CFLAGS
-DBUS_LIBS
-DBUS_CFLAGS
 GTK_LIBS
 GTK_CFLAGS
 HAVE_GNOME_DOC_UTILS_FALSE
@@ -999,8 +997,6 @@ PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 GTK_CFLAGS
 GTK_LIBS
-DBUS_CFLAGS
-DBUS_LIBS
 GCONF_CFLAGS
 GCONF_LIBS
 GIO_CFLAGS
@@ -1555,7 +1551,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 krb5-auth-dialog 2.91.90 to adapt to many kinds of systems.
+\`configure' configures krb5-auth-dialog 2.91.91 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1626,7 +1622,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of krb5-auth-dialog 2.91.90:";;
+     short | recursive ) echo "Configuration of krb5-auth-dialog 2.91.91:";;
    esac
   cat <<\_ACEOF
 
@@ -1699,8 +1695,6 @@ Some influential environment variables:
               path overriding pkg-config's built-in search path
   GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
   GTK_LIBS    linker flags for GTK, overriding pkg-config
-  DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
-  DBUS_LIBS   linker flags for DBUS, overriding pkg-config
   GCONF_CFLAGS
               C compiler flags for GCONF, overriding pkg-config
   GCONF_LIBS  linker flags for GCONF, overriding pkg-config
@@ -1789,7 +1783,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-krb5-auth-dialog configure 2.91.90
+krb5-auth-dialog configure 2.91.91
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2211,7 +2205,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 krb5-auth-dialog $as_me 2.91.90, which was
+It was created by krb5-auth-dialog $as_me 2.91.91, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -3027,7 +3021,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='krb5-auth-dialog'
- VERSION='2.91.90'
+ VERSION='2.91.91'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7140,13 +7134,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:7143: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7137: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7146: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7140: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7149: output\"" >&5)
+  (eval echo "\"\$as_me:7143: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8351,7 +8345,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8354 "configure"' > conftest.$ac_ext
+  echo '#line 8348 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9609,11 +9603,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9612: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9606: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9616: \$? = $ac_status" >&5
+   echo "$as_me:9610: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9948,11 +9942,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9951: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9945: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9955: \$? = $ac_status" >&5
+   echo "$as_me:9949: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10053,11 +10047,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10056: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10050: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10060: \$? = $ac_status" >&5
+   echo "$as_me:10054: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10108,11 +10102,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10111: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10105: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10115: \$? = $ac_status" >&5
+   echo "$as_me:10109: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12492,7 +12486,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12495 "configure"
+#line 12489 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12588,7 +12582,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12591 "configure"
+#line 12585 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13516,17 +13510,15 @@ $as_echo "$with_gtk" >&6; }
 case "$with_gtk" in
   2.0) GTK_API_VERSION=2.0
        GTK_REQUIRED=2.18.0
-       GLIB_REQUIRED=2.16.0
-       DBUS_REQUIRED=0.60
+       GLIB_REQUIRED=2.26.0
        GCONF_REQUIRED=2.8
        LIBNOTIFY_REQUIRED=0.4
        ;;
   3.0) GTK_API_VERSION=3.0
        GTK_REQUIRED=2.90.4
-       GLIB_REQUIRED="2.25.10"
-       DBUS_REQUIRED="0.82"
-       GCONF_REQUIRED="2.31"
-       LIBNOTIFY_REQUIRED="0.5.1"
+       GLIB_REQUIRED=2.26.0
+       GCONF_REQUIRED=2.31
+       LIBNOTIFY_REQUIRED=0.5.1
        ;;
 esac
 
@@ -13621,95 +13613,6 @@ $as_echo "yes" >&6; }
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
-$as_echo_n "checking for DBUS... " >&6; }
-
-if test -n "$DBUS_CFLAGS"; then
-    pkg_cv_DBUS_CFLAGS="$DBUS_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 >= \$DBUS_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_REQUIRED" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$DBUS_LIBS"; then
-    pkg_cv_DBUS_LIBS="$DBUS_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 >= \$DBUS_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQUIRED") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_REQUIRED" 2>/dev/null`
-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_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQUIRED" 2>&1`
-        else
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQUIRED" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DBUS_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (dbus-glib-1 >= $DBUS_REQUIRED) were not met:
-
-$DBUS_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_CFLAGS
-and DBUS_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_CFLAGS
-and DBUS_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_CFLAGS=$pkg_cv_DBUS_CFLAGS
-	DBUS_LIBS=$pkg_cv_DBUS_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 GCONF" >&5
 $as_echo_n "checking for GCONF... " >&6; }
 
@@ -15752,7 +15655,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 krb5-auth-dialog $as_me 2.91.90, which was
+This file was extended by krb5-auth-dialog $as_me 2.91.91, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15818,7 +15721,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="\\
-krb5-auth-dialog config.status 2.91.90
+krb5-auth-dialog config.status 2.91.91
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -17623,8 +17526,6 @@ $as_echo "$as_me: " >&6;}
 $as_echo "$as_me:          Kerberos: $KRB5_CFLAGS $KRB5_LIBS" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}:               GTK: $GTK_CFLAGS $GTK_LIBS" >&5
 $as_echo "$as_me:               GTK: $GTK_CFLAGS $GTK_LIBS" >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}:              DBus: $DBUS_CFLAGS $DBUS_LIBS" >&5
-$as_echo "$as_me:              DBus: $DBUS_CFLAGS $DBUS_LIBS" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}:             gconf: $GCONF_CFLAGS $GCONF_LIBS" >&5
 $as_echo "$as_me:             gconf: $GCONF_CFLAGS $GCONF_LIBS" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}:          gio-unix: $GIO_UNIX_CFLAGS $GIO_UNIX_LIBS $GIO_CFLAGS $GIO_LIBS" >&5