From b8bd6c8db8b1bb0b38c0827ecc7029521087470e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 May 2011 06:18:34 -0400 Subject: [PATCH] Auto-commit of generated files. --- autogen/configure | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autogen/configure b/autogen/configure index ca8be082e03..abefae0d55f 100755 --- a/autogen/configure +++ b/autogen/configure @@ -11199,23 +11199,23 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 2.2.4" >&5 -$as_echo_n "checking for gnutls >= 2.2.4... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 2.6.0" >&5 +$as_echo_n "checking for gnutls >= 2.6.0... " >&6; } - if $PKG_CONFIG --exists "gnutls >= 2.2.4" 2>&5; then + if $PKG_CONFIG --exists "gnutls >= 2.6.0" 2>&5; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } succeeded=yes { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGNUTLS_CFLAGS" >&5 $as_echo_n "checking LIBGNUTLS_CFLAGS... " >&6; } - LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.2.4"|sed -e 's,///*,/,g'` + LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.6.0"|sed -e 's,///*,/,g'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_CFLAGS" >&5 $as_echo "$LIBGNUTLS_CFLAGS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGNUTLS_LIBS" >&5 $as_echo_n "checking LIBGNUTLS_LIBS... " >&6; } - LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.2.4"|sed -e 's,///*,/,g'` + LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.6.0"|sed -e 's,///*,/,g'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_LIBS" >&5 $as_echo "$LIBGNUTLS_LIBS" >&6; } else @@ -11225,7 +11225,7 @@ $as_echo "no" >&6; } LIBGNUTLS_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 2.2.4"` + LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 2.6.0"` fi @@ -21589,7 +21589,7 @@ echo " Does Emacs use -lgpm? ${HAVE_GPM}" echo " Does Emacs use -ldbus? ${HAVE_DBUS}" echo " Does Emacs use -lgconf? ${HAVE_GCONF}" echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" -echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" +echo " Does Emacs use -lgnutls (2.6.x or higher)? ${HAVE_GNUTLS}" echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}" -- 2.11.4.GIT