diff options
author | Guido Günther <agx@sigxcpu.org> | 2013-03-31 16:25:03 +0200 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2013-03-31 16:25:03 +0200 |
commit | 589f31ff7858558b36d03e3abf24c96b3c001c50 (patch) | |
tree | 3955d872468d735adf63f7257757d4d9cb343820 /configure.ac | |
parent | watch: ignore archive extension (diff) | |
parent | New upstream version 3.8.0 (diff) | |
download | krb5-auth-dialog-589f31ff7858558b36d03e3abf24c96b3c001c50.tar.gz krb5-auth-dialog-589f31ff7858558b36d03e3abf24c96b3c001c50.tar.bz2 krb5-auth-dialog-589f31ff7858558b36d03e3abf24c96b3c001c50.zip |
Merge tag 'upstream/3.8.0'
Upstream version 3.8.0
# gpg: Signature made So 31 Mär 2013 16:25:02 CEST
# gpg: using DSA key 0x9FCF2CCD3F3E6426
# gpg: please do a --check-trustdb
# gpg: Good signature from "Guido Günther <agx@sigxcpu.org>"
# gpg: aka "Guido Guenther <agx@debian.org>"
# gpg: aka "Guido Guenther <agx@sigxcpu.org>"
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 43c84e6..2b21405 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ -AC_INIT([krb5-auth-dialog],[3.2.1]) +AC_INIT([krb5-auth-dialog],[3.8.0]) AC_CONFIG_SRCDIR(src/ka-kerberos.c) dnl Make automake keep quiet about wildcards & other GNUmake-isms -AM_INIT_AUTOMAKE([1.11.1 dist-bzip2 -Wno-portability]) +AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz -Wno-portability]) AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE @@ -29,11 +29,9 @@ GNOME_DOC_INIT GTK_REQUIRED=3.0 GLIB_REQUIRED=2.28 -GCONF_REQUIRED=2.31 LIBNOTIFY_REQUIRED=0.7.0 PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED]) -PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED) PKG_CHECK_MODULES(GIO, [gio-2.0, gio-unix-2.0]) PKG_CHECK_MODULES(GMODULE, gmodule-2.0) PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) @@ -41,12 +39,7 @@ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) dnl check for deprecated symbols: dnl GNOME_MAINTAINER_MODE_DEFINES -AM_GCONF_SOURCE_2 - -AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no]) -if test "$GCONFTOOL" = "no"; then - AC_MSG_ERROR([gconftool-2 not found]) -fi +GLIB_GSETTINGS dnl --enable-debug=(yes|no) AC_ARG_ENABLE(debug, @@ -261,7 +254,6 @@ AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Kerberos: $KRB5_CFLAGS $KRB5_LIBS]) AC_MSG_NOTICE([ GTK: $GTK_CFLAGS $GTK_LIBS]) -AC_MSG_NOTICE([ gconf: $GCONF_CFLAGS $GCONF_LIBS]) AC_MSG_NOTICE([ gio-unix: $GIO_UNIX_CFLAGS $GIO_UNIX_LIBS $GIO_CFLAGS $GIO_LIBS]) if test "$with_libnotify" = "yes" ; then AC_MSG_NOTICE([ libnotify: $LIBNOTIFY_CFLAGS $LIBNOTIFY_LIBS]) |