diff options
| author | Glenn Morris | 2011-05-10 06:18:34 -0400 |
|---|---|---|
| committer | Glenn Morris | 2011-05-10 06:18:34 -0400 |
| commit | b8bd6c8db8b1bb0b38c0827ecc7029521087470e (patch) | |
| tree | 1d51922883a3c51f94d480ca569aa4905d4d007b | |
| parent | b40448691347ceef93c4bba74a623c61fcbc19a1 (diff) | |
| download | emacs-b8bd6c8db8b1bb0b38c0827ecc7029521087470e.tar.gz emacs-b8bd6c8db8b1bb0b38c0827ecc7029521087470e.zip | |
Auto-commit of generated files.
| -rwxr-xr-x | autogen/configure | 14 |
1 files 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 | |||
| 11199 | else | 11199 | else |
| 11200 | PKG_CONFIG_MIN_VERSION=0.9.0 | 11200 | PKG_CONFIG_MIN_VERSION=0.9.0 |
| 11201 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | 11201 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then |
| 11202 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 2.2.4" >&5 | 11202 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 2.6.0" >&5 |
| 11203 | $as_echo_n "checking for gnutls >= 2.2.4... " >&6; } | 11203 | $as_echo_n "checking for gnutls >= 2.6.0... " >&6; } |
| 11204 | 11204 | ||
| 11205 | if $PKG_CONFIG --exists "gnutls >= 2.2.4" 2>&5; then | 11205 | if $PKG_CONFIG --exists "gnutls >= 2.6.0" 2>&5; then |
| 11206 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 11206 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| 11207 | $as_echo "yes" >&6; } | 11207 | $as_echo "yes" >&6; } |
| 11208 | succeeded=yes | 11208 | succeeded=yes |
| 11209 | 11209 | ||
| 11210 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGNUTLS_CFLAGS" >&5 | 11210 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGNUTLS_CFLAGS" >&5 |
| 11211 | $as_echo_n "checking LIBGNUTLS_CFLAGS... " >&6; } | 11211 | $as_echo_n "checking LIBGNUTLS_CFLAGS... " >&6; } |
| 11212 | LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.2.4"|sed -e 's,///*,/,g'` | 11212 | LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.6.0"|sed -e 's,///*,/,g'` |
| 11213 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_CFLAGS" >&5 | 11213 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_CFLAGS" >&5 |
| 11214 | $as_echo "$LIBGNUTLS_CFLAGS" >&6; } | 11214 | $as_echo "$LIBGNUTLS_CFLAGS" >&6; } |
| 11215 | 11215 | ||
| 11216 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGNUTLS_LIBS" >&5 | 11216 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGNUTLS_LIBS" >&5 |
| 11217 | $as_echo_n "checking LIBGNUTLS_LIBS... " >&6; } | 11217 | $as_echo_n "checking LIBGNUTLS_LIBS... " >&6; } |
| 11218 | LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.2.4"|sed -e 's,///*,/,g'` | 11218 | LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.6.0"|sed -e 's,///*,/,g'` |
| 11219 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_LIBS" >&5 | 11219 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_LIBS" >&5 |
| 11220 | $as_echo "$LIBGNUTLS_LIBS" >&6; } | 11220 | $as_echo "$LIBGNUTLS_LIBS" >&6; } |
| 11221 | else | 11221 | else |
| @@ -11225,7 +11225,7 @@ $as_echo "no" >&6; } | |||
| 11225 | LIBGNUTLS_LIBS="" | 11225 | LIBGNUTLS_LIBS="" |
| 11226 | ## If we have a custom action on failure, don't print errors, but | 11226 | ## If we have a custom action on failure, don't print errors, but |
| 11227 | ## do set a variable so people can do so. | 11227 | ## do set a variable so people can do so. |
| 11228 | LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 2.2.4"` | 11228 | LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 2.6.0"` |
| 11229 | 11229 | ||
| 11230 | fi | 11230 | fi |
| 11231 | 11231 | ||
| @@ -21589,7 +21589,7 @@ echo " Does Emacs use -lgpm? ${HAVE_GPM}" | |||
| 21589 | echo " Does Emacs use -ldbus? ${HAVE_DBUS}" | 21589 | echo " Does Emacs use -ldbus? ${HAVE_DBUS}" |
| 21590 | echo " Does Emacs use -lgconf? ${HAVE_GCONF}" | 21590 | echo " Does Emacs use -lgconf? ${HAVE_GCONF}" |
| 21591 | echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" | 21591 | echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" |
| 21592 | echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" | 21592 | echo " Does Emacs use -lgnutls (2.6.x or higher)? ${HAVE_GNUTLS}" |
| 21593 | echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" | 21593 | echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" |
| 21594 | 21594 | ||
| 21595 | echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}" | 21595 | echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}" |