Merge commit 'upstream/2.91.6'

1 files changed, 200 insertions, 100 deletions

diff --git a/configure b/configure
index f902f63..0769571 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 0.17.
+# Generated by GNU Autoconf 2.67 for krb5-auth-dialog 2.91.6.
 #
 #
 # 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='0.17'
-PACKAGE_STRING='krb5-auth-dialog 0.17'
+PACKAGE_VERSION='2.91.6'
+PACKAGE_STRING='krb5-auth-dialog 2.91.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -752,10 +752,9 @@ minimum_lifetime
 check_interval
 LIBCAP
 SETCAP
-HAVE_LIBNOTIFY_FALSE
-HAVE_LIBNOTIFY_TRUE
-LIBNOTIFY_LIBS
-LIBNOTIFY_CFLAGS
+PANELS_DIR
+CONTROL_CENTER_LIBS
+CONTROL_CENTER_CFLAGS
 ENABLE_NETWORK_MANAGER_FALSE
 ENABLE_NETWORK_MANAGER_TRUE
 NETWORK_MANAGER_LIBS
@@ -771,6 +770,8 @@ GCONF_SCHEMAS_INSTALL_FALSE
 GCONF_SCHEMAS_INSTALL_TRUE
 GCONF_SCHEMA_FILE_DIR
 GCONF_SCHEMA_CONFIG_SOURCE
+LIBNOTIFY_LIBS
+LIBNOTIFY_CFLAGS
 GMODULE_LIBS
 GMODULE_CFLAGS
 GIO_LIBS
@@ -979,7 +980,6 @@ enable_debug
 with_pkcs11
 enable_pkinit
 enable_network_manager
-with_libnotify
 with_libcap
 with_pam
 '
@@ -1007,10 +1007,12 @@ GIO_CFLAGS
 GIO_LIBS
 GMODULE_CFLAGS
 GMODULE_LIBS
+LIBNOTIFY_CFLAGS
+LIBNOTIFY_LIBS
 NETWORK_MANAGER_CFLAGS
 NETWORK_MANAGER_LIBS
-LIBNOTIFY_CFLAGS
-LIBNOTIFY_LIBS'
+CONTROL_CENTER_CFLAGS
+CONTROL_CENTER_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1553,7 +1555,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 0.17 to adapt to many kinds of systems.
+\`configure' configures krb5-auth-dialog 2.91.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1624,7 +1626,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of krb5-auth-dialog 0.17:";;
+     short | recursive ) echo "Configuration of krb5-auth-dialog 2.91.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1666,14 +1668,13 @@ Optional Packages:
   --with-omf-dir=DIR      path to OMF files
   --with-help-formats=FORMATS
                           list of formats
-  --with-gtk=2.0|3.0      which gtk+ version to compile against (default: 2.0)
+  --with-gtk=2.0|3.0      which gtk+ version to compile against (default: 3.0)
   --with-gconf-source=sourceaddress
                           Config database for installing schema files.
   --with-gconf-schema-file-dir=dir
                           Directory for installing schema files.
   --with-pkcs11           set path of PKCS11 smartcard helper
                           [default=/usr/lib/opensc/opensc-pkcs11.so]
-  --with-libnotify	use libnotify for status messages
   --without-libcap        Disable support for capabilities library
   --with-pam              use PAM [default=check]
 
@@ -1709,14 +1710,18 @@ Some influential environment variables:
               C compiler flags for GMODULE, overriding pkg-config
   GMODULE_LIBS
               linker flags for GMODULE, overriding pkg-config
-  NETWORK_MANAGER_CFLAGS
-              C compiler flags for NETWORK_MANAGER, overriding pkg-config
-  NETWORK_MANAGER_LIBS
-              linker flags for NETWORK_MANAGER, overriding pkg-config
   LIBNOTIFY_CFLAGS
               C compiler flags for LIBNOTIFY, overriding pkg-config
   LIBNOTIFY_LIBS
               linker flags for LIBNOTIFY, overriding pkg-config
+  NETWORK_MANAGER_CFLAGS
+              C compiler flags for NETWORK_MANAGER, overriding pkg-config
+  NETWORK_MANAGER_LIBS
+              linker flags for NETWORK_MANAGER, overriding pkg-config
+  CONTROL_CENTER_CFLAGS
+              C compiler flags for CONTROL_CENTER, overriding pkg-config
+  CONTROL_CENTER_LIBS
+              linker flags for CONTROL_CENTER, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1784,7 +1789,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-krb5-auth-dialog configure 0.17
+krb5-auth-dialog configure 2.91.6
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2206,7 +2211,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 0.17, which was
+It was created by krb5-auth-dialog $as_me 2.91.6, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -3022,7 +3027,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='krb5-auth-dialog'
- VERSION='0.17'
+ VERSION='2.91.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7135,13 +7140,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:7138: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7143: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7141: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7146: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7144: output\"" >&5)
+  (eval echo "\"\$as_me:7149: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8346,7 +8351,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8349 "configure"' > conftest.$ac_ext
+  echo '#line 8354 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9604,11 +9609,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:9607: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9612: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9611: \$? = $ac_status" >&5
+   echo "$as_me:9616: \$? = $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.
@@ -9943,11 +9948,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:9946: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9951: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9950: \$? = $ac_status" >&5
+   echo "$as_me:9955: \$? = $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.
@@ -10048,11 +10053,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:10051: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10056: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10055: \$? = $ac_status" >&5
+   echo "$as_me:10060: \$? = $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
@@ -10103,11 +10108,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:10106: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10111: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10110: \$? = $ac_status" >&5
+   echo "$as_me:10115: \$? = $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
@@ -12487,7 +12492,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12490 "configure"
+#line 12495 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12583,7 +12588,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12586 "configure"
+#line 12591 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13502,7 +13507,7 @@ if test "${with_gtk+set}" = set; then :
      *) as_fn_error $? "invalid gtk version specified" "$LINENO" 5  ;;
    esac
 else
-  with_gtk=2.0
+  with_gtk=3.0
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gtk" >&5
@@ -13510,7 +13515,7 @@ $as_echo "$with_gtk" >&6; }
 
 case "$with_gtk" in
   2.0) GTK_API_VERSION=2.0
-       GTK_REQUIRED=2.16.0
+       GTK_REQUIRED=2.18.0
        GLIB_REQUIRED=2.16.0
        DBUS_REQUIRED=0.60
        GCONF_REQUIRED=2.8
@@ -13971,6 +13976,95 @@ $as_echo "yes" >&6; }
 
 fi
 
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
+$as_echo_n "checking for LIBNOTIFY... " >&6; }
+
+if test -n "$LIBNOTIFY_CFLAGS"; then
+    pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBNOTIFY_LIBS"; then
+    pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_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
+	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
+        else
+	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBNOTIFY_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met:
+
+$LIBNOTIFY_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 LIBNOTIFY_CFLAGS
+and LIBNOTIFY_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 LIBNOTIFY_CFLAGS
+and LIBNOTIFY_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
+	LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
+	LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
 
 
   if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
@@ -14449,49 +14543,65 @@ else
 fi
 
 
-LIBNOTIFY_CFLAGS=
-LIBNOTIFY_LIBS=
 
-# Check whether --with-libnotify was given.
-if test "${with_libnotify+set}" = set; then :
-  withval=$with_libnotify;
-else
-  with_libnotify=check
+savedCFLAGS="$CFLAGS"
+savedLIBS="$LIBS"
+CFLAGS="$LIBNOTIFY_CFLAGS $CFLAGS"
+LIBS="$LIBNOTIFY_LIBS $LIBS"
+for ac_func in notify_notification_new_with_status_icon \
+                notify_notification_set_hint
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
 fi
+done
+
+CFLAGS="$savedCFLAGS"
+LIBS="$savedLIBS"
 
 
-if test "x$with_libnotify" = "xyes" -o "x$with_libnotify" = "xcheck"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
-$as_echo_n "checking for LIBNOTIFY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CONTROL_CENTER" >&5
+$as_echo_n "checking for CONTROL_CENTER... " >&6; }
 
-if test -n "$LIBNOTIFY_CFLAGS"; then
-    pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
+if test -n "$CONTROL_CENTER_CFLAGS"; then
+    pkg_cv_CONTROL_CENTER_CFLAGS="$CONTROL_CENTER_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+ libgnome-control-center >= 2.31.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "
+ libgnome-control-center >= 2.31.4") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`
+  pkg_cv_CONTROL_CENTER_CFLAGS=`$PKG_CONFIG --cflags "
+ libgnome-control-center >= 2.31.4" 2>/dev/null`
 else
   pkg_failed=yes
 fi
  else
     pkg_failed=untried
 fi
-if test -n "$LIBNOTIFY_LIBS"; then
-    pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
+if test -n "$CONTROL_CENTER_LIBS"; then
+    pkg_cv_CONTROL_CENTER_LIBS="$CONTROL_CENTER_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+ libgnome-control-center >= 2.31.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "
+ libgnome-control-center >= 2.31.4") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`
+  pkg_cv_CONTROL_CENTER_LIBS=`$PKG_CONFIG --libs "
+ libgnome-control-center >= 2.31.4" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -14511,55 +14621,49 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
+	        CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+ libgnome-control-center >= 2.31.4" 2>&1`
         else
-	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED" 2>&1`
+	        CONTROL_CENTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+ libgnome-control-center >= 2.31.4" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNOTIFY_PKG_ERRORS" >&5
+	echo "$CONTROL_CENTER_PKG_ERRORS" >&5
 
+	as_fn_error $? "Package requirements (
+ libgnome-control-center >= 2.31.4) were not met:
 
-    if test "x$with_libnotify" = "xcheck" ; then
-       with_libnotify=no
-    else
-       as_fn_error $? "You must install libnotify >= $LIBNOTIFY_REQUIRED to compile krb5-auth-dialog" "$LINENO" 5
-    fi
+$CONTROL_CENTER_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 CONTROL_CENTER_CFLAGS
+and CONTROL_CENTER_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.
 
-    if test "x$with_libnotify" = "xcheck" ; then
-       with_libnotify=no
-    else
-       as_fn_error $? "You must install libnotify >= $LIBNOTIFY_REQUIRED to compile krb5-auth-dialog" "$LINENO" 5
-    fi
+Alternatively, you may set the environment variables CONTROL_CENTER_CFLAGS
+and CONTROL_CENTER_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
-	LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
-	LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
+	CONTROL_CENTER_CFLAGS=$pkg_cv_CONTROL_CENTER_CFLAGS
+	CONTROL_CENTER_LIBS=$pkg_cv_CONTROL_CENTER_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	with_libnotify=yes
-fi
-  if test "x$with_libnotify" = "xyes" ; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNOTIFY 1
-_ACEOF
-
-  fi
 fi
- if test "x$with_libnotify" = "xyes"; then
-  HAVE_LIBNOTIFY_TRUE=
-  HAVE_LIBNOTIFY_FALSE='#'
-else
-  HAVE_LIBNOTIFY_TRUE='#'
-  HAVE_LIBNOTIFY_FALSE=
-fi
-
-
-
+PANELS_DIR="${libdir}/control-center-1/panels"
 
 
 for ac_func in seteuid stpcpy mmap
@@ -15088,7 +15192,7 @@ else
 fi
 
 
-ac_config_files="$ac_config_files Makefile krb5-auth-dialog.spec src/Makefile src/krb5-auth-dialog.1 secmem/Makefile gtksecentry/Makefile icons/Makefile icons/22x22/Makefile icons/48x48/Makefile icons/scalable/Makefile etpo/Makefile po/Makefile.in preferences/Makefile preferences/krb5-auth-dialog-preferences.1 help/Makefile examples/Makefile plugins/Makefile"
+ac_config_files="$ac_config_files Makefile krb5-auth-dialog.spec src/Makefile src/krb5-auth-dialog.1 secmem/Makefile icons/Makefile icons/22x22/Makefile icons/48x48/Makefile icons/scalable/Makefile etpo/Makefile po/Makefile.in help/Makefile examples/Makefile plugins/Makefile cc-panel/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -15236,10 +15340,6 @@ if test -z "${ENABLE_NETWORK_MANAGER_TRUE}" && test -z "${ENABLE_NETWORK_MANAGER
   as_fn_error $? "conditional \"ENABLE_NETWORK_MANAGER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_LIBNOTIFY_TRUE}" && test -z "${HAVE_LIBNOTIFY_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_LIBNOTIFY\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${ENABLE_PAM_PLUGIN_TRUE}" && test -z "${ENABLE_PAM_PLUGIN_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_PAM_PLUGIN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15652,7 +15752,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 0.17, which was
+This file was extended by krb5-auth-dialog $as_me 2.91.6, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15718,7 +15818,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 0.17
+krb5-auth-dialog config.status 2.91.6
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -16112,18 +16212,16 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/krb5-auth-dialog.1") CONFIG_FILES="$CONFIG_FILES src/krb5-auth-dialog.1" ;;
     "secmem/Makefile") CONFIG_FILES="$CONFIG_FILES secmem/Makefile" ;;
-    "gtksecentry/Makefile") CONFIG_FILES="$CONFIG_FILES gtksecentry/Makefile" ;;
     "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
     "icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES icons/22x22/Makefile" ;;
     "icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES icons/48x48/Makefile" ;;
     "icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES icons/scalable/Makefile" ;;
     "etpo/Makefile") CONFIG_FILES="$CONFIG_FILES etpo/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-    "preferences/Makefile") CONFIG_FILES="$CONFIG_FILES preferences/Makefile" ;;
-    "preferences/krb5-auth-dialog-preferences.1") CONFIG_FILES="$CONFIG_FILES preferences/krb5-auth-dialog-preferences.1" ;;
     "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
     "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
     "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
+    "cc-panel/Makefile") CONFIG_FILES="$CONFIG_FILES cc-panel/Makefile" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
@@ -17545,6 +17643,8 @@ else
 { $as_echo "$as_me:${as_lineno-$LINENO}:   Network Manager: no" >&5
 $as_echo "$as_me:   Network Manager: no" >&6;}
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}:          gnome-cc: $CONTROL_CENTER_CFLAGS $CONTROL_CENTER_LIBS" >&5
+$as_echo "$as_me:          gnome-cc: $CONTROL_CENTER_CFLAGS $CONTROL_CENTER_LIBS" >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
 $as_echo "$as_me: " >&6;}
 { $as_echo "$as_me:${as_lineno-$LINENO}: Miscellaneous" >&5