diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /configure | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz | |
Merge from mainline.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure index 9fa20d66244..a15a9ea56a3 100755 --- a/configure +++ b/configure @@ -12262,23 +12262,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 libxml-2.0 > 2.2.0" >&5 -$as_echo_n "checking for libxml-2.0 > 2.2.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 > 2.6.17" >&5 +$as_echo_n "checking for libxml-2.0 > 2.6.17... " >&6; } - if $PKG_CONFIG --exists "libxml-2.0 > 2.2.0" 2>&5; then + if $PKG_CONFIG --exists "libxml-2.0 > 2.6.17" 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 LIBXML2_CFLAGS" >&5 $as_echo_n "checking LIBXML2_CFLAGS... " >&6; } - LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 > 2.2.0"|sed -e 's,///*,/,g'` + LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 > 2.6.17"|sed -e 's,///*,/,g'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_CFLAGS" >&5 $as_echo "$LIBXML2_CFLAGS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML2_LIBS" >&5 $as_echo_n "checking LIBXML2_LIBS... " >&6; } - LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 > 2.2.0"|sed -e 's,///*,/,g'` + LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 > 2.6.17"|sed -e 's,///*,/,g'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_LIBS" >&5 $as_echo "$LIBXML2_LIBS" >&6; } else @@ -12288,7 +12288,7 @@ $as_echo "no" >&6; } LIBXML2_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 > 2.2.0"` + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 > 2.6.17"` fi |