[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs configure.in configure ChangeLog
|
From: |
Ken Raeburn |
|
Subject: |
[Emacs-diffs] emacs configure.in configure ChangeLog |
|
Date: |
Sun, 23 Aug 2009 02:15:06 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Ken Raeburn <raeburn> 09/08/23 02:15:03
Modified files:
. : configure.in configure ChangeLog
Log message:
* configure.in: Warn if package version specified here doesn't
match the version in version.el.
* configure: Regenerate.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/configure.in?cvsroot=emacs&r1=1.606&r2=1.607
http://cvs.savannah.gnu.org/viewcvs/emacs/configure?cvsroot=emacs&r1=1.329&r2=1.330
http://cvs.savannah.gnu.org/viewcvs/emacs/ChangeLog?cvsroot=emacs&r1=1.845&r2=1.846
Patches:
Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.606
retrieving revision 1.607
diff -u -b -r1.606 -r1.607
--- configure.in 22 Aug 2009 08:47:01 -0000 1.606
+++ configure.in 23 Aug 2009 02:15:00 -0000 1.607
@@ -2551,6 +2551,9 @@
if test x"${version}" = x; then
AC_MSG_ERROR([can't find current emacs version in
`${srcdir}/lisp/version.el'.])
fi
+if test x"${version}" != x"$PACKAGE_VERSION"; then
+ AC_MSG_WARN([version mismatch between `${srcdir}/configure.in' and
`${srcdir}/lisp/version.el'.])
+fi
### Specify what sort of things we'll be editing into Makefile and config.h.
### Use configuration here uncanonicalized to avoid exceeding size limits.
Index: configure
===================================================================
RCS file: /sources/emacs/emacs/configure,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -b -r1.329 -r1.330
--- configure 22 Aug 2009 08:48:03 -0000 1.329
+++ configure 23 Aug 2009 02:15:00 -0000 1.330
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for emacs 23.1.50.
+# Generated by GNU Autoconf 2.62 for emacs 23.1.50.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -638,133 +638,133 @@
ac_config_libobj_dir=src
ac_header_list=
ac_func_list=
-ac_subst_vars='LTLIBOBJS
-LIB_SRC_EXTRA_INSTALLABLES
-GNU_OBJC_CFLAGS
-GNUSTEP_SYSTEM_LIBRARIES
-GNUSTEP_SYSTEM_HEADERS
-GNUSTEP_MAKEFILES
-ns_appsrc
-ns_appresdir
-ns_appbindir
-ns_appdir
-opsysfile
-machfile
-X_TOOLKIT_TYPE
-C_SWITCH_X_SITE
-LD_SWITCH_X_SITE_AUX
-LD_SWITCH_X_SITE
-c_switch_machine
-c_switch_system
-gameuser
-gamedir
-bitmapdir
-archlibdir
-etcdir
-x_default_search_path
-lisppath
-locallisppath
-lispdir
-srcdir
-canonical
-configuration
-version
-GETOPTOBJS
-GETOPT_H
-GETLOADAVG_LIBS
-KMEM_GROUP
-NEED_SETGID
-LIBOBJS
-liblockfile
-ALLOCA
-FREETYPE_LIBS
-FREETYPE_CFLAGS
-M17N_FLT_LIBS
-M17N_FLT_CFLAGS
-LIBOTF_LIBS
-LIBOTF_CFLAGS
-XFT_LIBS
-XFT_CFLAGS
-FONTCONFIG_LIBS
-FONTCONFIG_CFLAGS
-DBUS_LIBS
-DBUS_CFLAGS
-GTK_LIBS
-GTK_CFLAGS
-RSVG_LIBS
-RSVG_CFLAGS
-HAVE_XSERVER
-XMKMF
-SET_MAKE
-CFLAGS_SOUND
-ALSA_LIBS
-ALSA_CFLAGS
-PKG_CONFIG
-LIBSOUND
-MAKEINFO
-GZIP_PROG
-INSTALL_INFO
-RANLIB
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-LN_S
-EGREP
-GREP
-CPP
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-MAINT
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
+ac_subst_vars='SHELL
PATH_SEPARATOR
-SHELL'
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+MAINT
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+CPP
+GREP
+EGREP
+LN_S
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+RANLIB
+INSTALL_INFO
+GZIP_PROG
+MAKEINFO
+LIBSOUND
+PKG_CONFIG
+ALSA_CFLAGS
+ALSA_LIBS
+CFLAGS_SOUND
+SET_MAKE
+XMKMF
+HAVE_XSERVER
+RSVG_CFLAGS
+RSVG_LIBS
+GTK_CFLAGS
+GTK_LIBS
+DBUS_CFLAGS
+DBUS_LIBS
+FONTCONFIG_CFLAGS
+FONTCONFIG_LIBS
+XFT_CFLAGS
+XFT_LIBS
+LIBOTF_CFLAGS
+LIBOTF_LIBS
+M17N_FLT_CFLAGS
+M17N_FLT_LIBS
+FREETYPE_CFLAGS
+FREETYPE_LIBS
+ALLOCA
+liblockfile
+LIBOBJS
+NEED_SETGID
+KMEM_GROUP
+GETLOADAVG_LIBS
+GETOPT_H
+GETOPTOBJS
+version
+configuration
+canonical
+srcdir
+lispdir
+locallisppath
+lisppath
+x_default_search_path
+etcdir
+archlibdir
+bitmapdir
+gamedir
+gameuser
+c_switch_system
+c_switch_machine
+LD_SWITCH_X_SITE
+LD_SWITCH_X_SITE_AUX
+C_SWITCH_X_SITE
+X_TOOLKIT_TYPE
+machfile
+opsysfile
+ns_appdir
+ns_appbindir
+ns_appresdir
+ns_appsrc
+GNUSTEP_MAKEFILES
+GNUSTEP_SYSTEM_HEADERS
+GNUSTEP_SYSTEM_LIBRARIES
+GNU_OBJC_CFLAGS
+LIB_SRC_EXTRA_INSTALLABLES
+LTLIBOBJS'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -1236,9 +1236,9 @@
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) { $as_echo "$as_me: error: unrecognized options:
$ac_unrecognized_opts" >&2
+ fatal) { $as_echo "$as_me: error: Unrecognized options:
$ac_unrecognized_opts" >&2
{ (exit 1); exit 1; }; } ;;
- *) $as_echo "$as_me: WARNING: unrecognized options:
$ac_unrecognized_opts" >&2 ;;
+ *) $as_echo "$as_me: WARNING: Unrecognized options:
$ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1291,7 +1291,7 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
+ { $as_echo "$as_me: error: Working directory cannot be determined" >&2
{ (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
{ $as_echo "$as_me: error: pwd does not report name of working directory" >&2
@@ -1580,7 +1580,7 @@
if $ac_init_version; then
cat <<\_ACEOF
emacs configure 23.1.50
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -1594,7 +1594,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by emacs $as_me 23.1.50, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -1717,8 +1717,8 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var
contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var
contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
@@ -1924,8 +1924,6 @@
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:$LINENO: error: changes in the environment can compromise
the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build"
>&2;}
{ { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm
$cache_file' and start over" >&5
@@ -3029,8 +3027,12 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host
triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet"
>&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect
cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -3229,8 +3231,12 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host
triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet"
>&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect
cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -3240,13 +3246,11 @@
fi
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler
found in \$PATH
See \`config.log' for more details." >&5
$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
# Provide some information about the compiler.
$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
@@ -3376,13 +3380,11 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
See \`config.log' for more details." >&5
$as_echo "$as_me: error: C compiler cannot create executables
See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
+ { (exit 77); exit 77; }; }
fi
ac_exeext=$ac_cv_exeext
@@ -3410,15 +3412,13 @@
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
fi
fi
fi
@@ -3461,13 +3461,11 @@
esac
done
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables:
cannot compile and link
+ { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables:
cannot compile and link
See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile
and link
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
fi
rm -f conftest$ac_cv_exeext
@@ -3521,13 +3519,11 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files:
cannot compile
See \`config.log' for more details." >&5
$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
@@ -4199,13 +4195,11 @@
if $ac_preproc_ok; then
:
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity
check
See \`config.log' for more details." >&5
$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
fi
ac_ext=c
@@ -4588,9 +4582,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -4728,7 +4721,7 @@
$as_echo "$ac_cv_header_minix_config_h" >&6; }
fi
-if test "x$ac_cv_header_minix_config_h" = x""yes; then
+if test $ac_cv_header_minix_config_h = yes; then
MINIX=yes
else
MINIX=
@@ -5120,13 +5113,11 @@
if $ac_preproc_ok; then
:
else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity
check
See \`config.log' for more details." >&5
$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+ { (exit 1); exit 1; }; }
fi
ac_ext=c
@@ -5311,8 +5302,12 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host
triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet"
>&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect
cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to address@hidden" >&2;}
ac_tool_warned=yes ;;
esac
RANLIB=$ac_ct_RANLIB
@@ -6281,9 +6276,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -6358,7 +6352,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
$as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
-if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then
+if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
LIBSOUND=-lossaudio
else
LIBSOUND=
@@ -6736,9 +6730,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -6851,9 +6844,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -7155,7 +7147,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5
$as_echo "$ac_cv_have_decl_sys_siglist" >&6; }
-if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then
+if test $ac_cv_have_decl_sys_siglist = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_SYS_SIGLIST 1
@@ -7226,7 +7218,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___sys_siglist" >&5
$as_echo "$ac_cv_have_decl___sys_siglist" >&6; }
-if test "x$ac_cv_have_decl___sys_siglist" = x""yes; then
+if test $ac_cv_have_decl___sys_siglist = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL___SYS_SIGLIST 1
@@ -7768,9 +7760,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -7833,9 +7824,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -8008,7 +7998,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
$as_echo "$ac_cv_member_struct_tm_tm_zone" >&6; }
-if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then
+if test $ac_cv_member_struct_tm_tm_zone = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_TM_TM_ZONE 1
@@ -8078,7 +8068,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
$as_echo "$ac_cv_have_decl_tzname" >&6; }
-if test "x$ac_cv_have_decl_tzname" = x""yes; then
+if test $ac_cv_have_decl_tzname = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_TZNAME 1
@@ -8259,7 +8249,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
$as_echo "$ac_cv_member_struct_tm_tm_gmtoff" >&6; }
-if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then
+if test $ac_cv_member_struct_tm_tm_gmtoff = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_TM_GMTOFF 1
@@ -8376,7 +8366,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_flags" >&5
$as_echo "$ac_cv_member_struct_ifreq_ifr_flags" >&6; }
-if test "x$ac_cv_member_struct_ifreq_ifr_flags" = x""yes; then
+if test $ac_cv_member_struct_ifreq_ifr_flags = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_FLAGS 1
@@ -8493,7 +8483,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_hwaddr" >&5
$as_echo "$ac_cv_member_struct_ifreq_ifr_hwaddr" >&6; }
-if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = x""yes; then
+if test $ac_cv_member_struct_ifreq_ifr_hwaddr = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_HWADDR 1
@@ -8610,7 +8600,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_netmask" >&5
$as_echo "$ac_cv_member_struct_ifreq_ifr_netmask" >&6; }
-if test "x$ac_cv_member_struct_ifreq_ifr_netmask" = x""yes; then
+if test $ac_cv_member_struct_ifreq_ifr_netmask = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_NETMASK 1
@@ -8727,7 +8717,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_broadaddr"
>&5
$as_echo "$ac_cv_member_struct_ifreq_ifr_broadaddr" >&6; }
-if test "x$ac_cv_member_struct_ifreq_ifr_broadaddr" = x""yes; then
+if test $ac_cv_member_struct_ifreq_ifr_broadaddr = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_BROADADDR 1
@@ -8844,7 +8834,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_addr" >&5
$as_echo "$ac_cv_member_struct_ifreq_ifr_addr" >&6; }
-if test "x$ac_cv_member_struct_ifreq_ifr_addr" = x""yes; then
+if test $ac_cv_member_struct_ifreq_ifr_addr = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_IFREQ_IFR_ADDR 1
@@ -9201,8 +9191,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names
containing '" >&5
-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
+ *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names
containing '" >&5
+$as_echo "$as_me: error: Cannot use X directory names containing '" >&2;}
{ (exit 1); exit 1; }; };; #(
*,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
$as_echo_n "(cached) " >&6
@@ -9240,7 +9230,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
- /usr/lib | /usr/lib64 | /lib | /lib64) ;;
+ /usr/lib | /lib) ;;
*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
esac
fi
@@ -9649,7 +9639,7 @@
$as_echo "$ac_cv_header_AppKit_AppKit_h" >&6; }
fi
-if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then
+if test $ac_cv_header_AppKit_AppKit_h = yes; then
HAVE_NS=yes
else
{ { $as_echo "$as_me:$LINENO: error: \`--with-ns' was specified, but the
include
@@ -9897,7 +9887,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_get_state" >&5
$as_echo "$ac_cv_func_malloc_get_state" >&6; }
-if test "x$ac_cv_func_malloc_get_state" = x""yes; then
+if test $ac_cv_func_malloc_get_state = yes; then
:
else
doug_lea_malloc=no
@@ -9988,7 +9978,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_set_state" >&5
$as_echo "$ac_cv_func_malloc_set_state" >&6; }
-if test "x$ac_cv_func_malloc_set_state" = x""yes; then
+if test $ac_cv_func_malloc_set_state = yes; then
:
else
doug_lea_malloc=no
@@ -10210,9 +10200,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -10312,9 +10301,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -10583,7 +10571,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDNET 1
_ACEOF
@@ -10652,7 +10640,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5
$as_echo "$ac_cv_lib_Xbsd_main" >&6; }
-if test "x$ac_cv_lib_Xbsd_main" = x""yes; then
+if test $ac_cv_lib_Xbsd_main = yes; then
LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd"
fi
@@ -10723,7 +10711,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_cma_open" >&5
$as_echo "$ac_cv_lib_pthreads_cma_open" >&6; }
-if test "x$ac_cv_lib_pthreads_cma_open" = x""yes; then
+if test $ac_cv_lib_pthreads_cma_open = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPTHREADS 1
_ACEOF
@@ -11106,9 +11094,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -11516,9 +11503,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -11656,9 +11642,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -11730,7 +11715,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_GTK_TYPE_FILE_SELECTION"
>&5
$as_echo "$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" >&6; }
-if test "x$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" = x""yes; then
+if test $ac_cv_have_decl_GTK_TYPE_FILE_SELECTION = yes; then
HAVE_GTK_FILE_SELECTION=yes
else
HAVE_GTK_FILE_SELECTION=no
@@ -11828,9 +11813,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -11898,7 +11882,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER" >&5
$as_echo "$ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER" >&6; }
-if test "x$ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER" = x""yes; then
+if test $ac_cv_have_decl_GTK_TYPE_FILE_CHOOSER = yes; then
HAVE_GTK_FILE_CHOOSER=yes
else
HAVE_GTK_FILE_CHOOSER=no
@@ -11996,9 +11980,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -12156,9 +12139,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -12233,7 +12215,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_self" >&5
$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; then
+if test $ac_cv_lib_pthread_pthread_self = yes; then
HAVE_GTK_AND_PTHREAD=yes
fi
@@ -12446,9 +12428,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -12752,7 +12733,7 @@
fi
{ $as_echo "$as_me:$LINENO: result:
$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5
$as_echo "$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; }
-if test "x$ac_cv_lib_Xmu_XmuConvertStandardSelection" = x""yes; then
+if test $ac_cv_lib_Xmu_XmuConvertStandardSelection = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXMU 1
_ACEOF
@@ -12833,7 +12814,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
$as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then
+if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXEXT 1
_ACEOF
@@ -12973,7 +12954,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpCreateContext" >&5
$as_echo "$ac_cv_lib_Xp_XpCreateContext" >&6; }
-if test "x$ac_cv_lib_Xp_XpCreateContext" = x""yes; then
+if test $ac_cv_lib_Xp_XpCreateContext = yes; then
HAVE_LIBXP=yes
fi
@@ -13564,7 +13545,7 @@
$as_echo "$ac_cv_header_X11_Xft_Xft_h" >&6; }
fi
-if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then
+if test $ac_cv_header_X11_Xft_Xft_h = yes; then
{ $as_echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
$as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then
@@ -13630,7 +13611,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
$as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
-if test "x$ac_cv_lib_Xft_XftFontOpen" = x""yes; then
+if test $ac_cv_lib_Xft_XftFontOpen = yes; then
HAVE_XFT=yes
fi
@@ -13841,7 +13822,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_otf_OTF_get_variation_glyphs"
>&5
$as_echo "$ac_cv_lib_otf_OTF_get_variation_glyphs" >&6; }
-if test "x$ac_cv_lib_otf_OTF_get_variation_glyphs" = x""yes; then
+if test $ac_cv_lib_otf_OTF_get_variation_glyphs = yes; then
HAVE_OTF_GET_VARIATION_GLYPHS=yes
else
HAVE_OTF_GET_VARIATION_GLYPHS=no
@@ -14112,7 +14093,7 @@
$as_echo "$ac_cv_header_X11_xpm_h" >&6; }
fi
-if test "x$ac_cv_header_X11_xpm_h" = x""yes; then
+if test $ac_cv_header_X11_xpm_h = yes; then
{ $as_echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in -lXpm" >&5
$as_echo_n "checking for XpmReadFileToPixmap in -lXpm... " >&6; }
if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then
@@ -14178,7 +14159,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
$as_echo "$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; }
-if test "x$ac_cv_lib_Xpm_XpmReadFileToPixmap" = x""yes; then
+if test $ac_cv_lib_Xpm_XpmReadFileToPixmap = yes; then
HAVE_XPM=yes
fi
@@ -14359,7 +14340,7 @@
$as_echo "$ac_cv_header_jerror_h" >&6; }
fi
-if test "x$ac_cv_header_jerror_h" = x""yes; then
+if test $ac_cv_header_jerror_h = yes; then
{ $as_echo "$as_me:$LINENO: checking for jpeg_destroy_compress in -ljpeg" >&5
$as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; }
if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then
@@ -14425,7 +14406,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = x""yes; then
+if test $ac_cv_lib_jpeg_jpeg_destroy_compress = yes; then
HAVE_JPEG=yes
fi
@@ -14608,9 +14589,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -14685,7 +14665,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_get_channels" >&5
$as_echo "$ac_cv_lib_png_png_get_channels" >&6; }
-if test "x$ac_cv_lib_png_png_get_channels" = x""yes; then
+if test $ac_cv_lib_png_png_get_channels = yes; then
HAVE_PNG=yes
fi
@@ -14832,7 +14812,7 @@
$as_echo "$ac_cv_header_tiffio_h" >&6; }
fi
-if test "x$ac_cv_header_tiffio_h" = x""yes; then
+if test $ac_cv_header_tiffio_h = yes; then
tifflibs="-lz -lm"
# At least one tiff package requires the jpeg library.
if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
@@ -14901,7 +14881,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5
$as_echo "$ac_cv_lib_tiff_TIFFGetVersion" >&6; }
-if test "x$ac_cv_lib_tiff_TIFFGetVersion" = x""yes; then
+if test $ac_cv_lib_tiff_TIFFGetVersion = yes; then
HAVE_TIFF=yes
fi
@@ -15049,7 +15029,7 @@
$as_echo "$ac_cv_header_gif_lib_h" >&6; }
fi
-if test "x$ac_cv_header_gif_lib_h" = x""yes; then
+if test $ac_cv_header_gif_lib_h = yes; then
# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
# Earlier versions can crash Emacs.
{ $as_echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5
@@ -15117,7 +15097,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
$as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = x""yes; then
+if test $ac_cv_lib_gif_EGifPutExtensionLast = yes; then
HAVE_GIF=yes
else
try_libungif=yes
@@ -15198,7 +15178,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
$as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then
+if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then
HAVE_GIF=yes
fi
@@ -15383,7 +15363,7 @@
$as_echo "$ac_cv_header_gpm_h" >&6; }
fi
-if test "x$ac_cv_header_gpm_h" = x""yes; then
+if test $ac_cv_header_gpm_h = yes; then
{ $as_echo "$as_me:$LINENO: checking for Gpm_Open in -lgpm" >&5
$as_echo_n "checking for Gpm_Open in -lgpm... " >&6; }
if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
@@ -15449,7 +15429,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gpm_Gpm_Open" >&5
$as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; }
-if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then
+if test $ac_cv_lib_gpm_Gpm_Open = yes; then
HAVE_GPM=yes
fi
@@ -15593,7 +15573,7 @@
$as_echo "$ac_cv_header_malloc_malloc_h" >&6; }
fi
-if test "x$ac_cv_header_malloc_malloc_h" = x""yes; then
+if test $ac_cv_header_malloc_malloc_h = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_MALLOC_MALLOC_H 1
@@ -15768,7 +15748,7 @@
$as_echo "$ac_cv_header_X11_SM_SMlib_h" >&6; }
fi
-if test "x$ac_cv_header_X11_SM_SMlib_h" = x""yes; then
+if test $ac_cv_header_X11_SM_SMlib_h = yes; then
{ $as_echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5
$as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; }
if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then
@@ -15834,7 +15814,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
$as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; }
-if test "x$ac_cv_lib_SM_SmcOpenConnection" = x""yes; then
+if test $ac_cv_lib_SM_SmcOpenConnection = yes; then
HAVE_X_SM=yes
fi
@@ -16200,9 +16180,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define CRAY_STACKSEG_END $ac_func
@@ -16371,7 +16350,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5
$as_echo "$ac_cv_lib_m_sqrt" >&6; }
-if test "x$ac_cv_lib_m_sqrt" = x""yes; then
+if test $ac_cv_lib_m_sqrt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
@@ -16449,7 +16428,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mail_maillock" >&5
$as_echo "$ac_cv_lib_mail_maillock" >&6; }
-if test "x$ac_cv_lib_mail_maillock" = x""yes; then
+if test $ac_cv_lib_mail_maillock = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBMAIL 1
_ACEOF
@@ -16524,7 +16503,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lockfile_maillock" >&5
$as_echo "$ac_cv_lib_lockfile_maillock" >&6; }
-if test "x$ac_cv_lib_lockfile_maillock" = x""yes; then
+if test $ac_cv_lib_lockfile_maillock = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLOCKFILE 1
_ACEOF
@@ -16678,9 +16657,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -16823,9 +16801,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -17005,9 +16982,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -17151,9 +17127,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -17301,9 +17276,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -17410,9 +17384,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -17797,7 +17770,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getloadavg" >&5
$as_echo "$ac_cv_func_getloadavg" >&6; }
-if test "x$ac_cv_func_getloadavg" = x""yes; then
+if test $ac_cv_func_getloadavg = yes; then
exit 0
else
exit 1
@@ -17896,9 +17869,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -17974,7 +17946,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5
$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
-if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then
+if test $ac_cv_lib_kstat_kstat_open = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKSTAT 1
_ACEOF
@@ -18055,7 +18027,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_elf_begin" >&5
$as_echo "$ac_cv_lib_elf_elf_begin" >&6; }
-if test "x$ac_cv_lib_elf_elf_begin" = x""yes; then
+if test $ac_cv_lib_elf_elf_begin = yes; then
LIBS="-lelf $LIBS"
fi
@@ -18126,7 +18098,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5
$as_echo "$ac_cv_lib_kvm_kvm_open" >&6; }
-if test "x$ac_cv_lib_kvm_kvm_open" = x""yes; then
+if test $ac_cv_lib_kvm_kvm_open = yes; then
LIBS="-lkvm $LIBS"
fi
@@ -18196,7 +18168,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_getloadavg" >&5
$as_echo "$ac_cv_lib_util_getloadavg" >&6; }
-if test "x$ac_cv_lib_util_getloadavg" = x""yes; then
+if test $ac_cv_lib_util_getloadavg = yes; then
LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes
fi
@@ -18272,7 +18244,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_getloadavg_getloadavg" >&5
$as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; }
-if test "x$ac_cv_lib_getloadavg_getloadavg" = x""yes; then
+if test $ac_cv_lib_getloadavg_getloadavg = yes; then
LIBS="-lgetloadavg $LIBS"
else
LIBS=$ac_getloadavg_LIBS
@@ -18373,9 +18345,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -18521,7 +18492,7 @@
$as_echo "$ac_cv_header_sys_dg_sys_info_h" >&6; }
fi
-if test "x$ac_cv_header_sys_dg_sys_info_h" = x""yes; then
+if test $ac_cv_header_sys_dg_sys_info_h = yes; then
ac_have_func=yes
cat >>confdefs.h <<\_ACEOF
@@ -18594,7 +18565,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dgc_dg_sys_info" >&5
$as_echo "$ac_cv_lib_dgc_dg_sys_info" >&6; }
-if test "x$ac_cv_lib_dgc_dg_sys_info" = x""yes; then
+if test $ac_cv_lib_dgc_dg_sys_info = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDGC 1
_ACEOF
@@ -18827,9 +18798,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -18978,7 +18948,7 @@
$as_echo "$ac_cv_header_inq_stats_cpustats_h" >&6; }
fi
-if test "x$ac_cv_header_inq_stats_cpustats_h" = x""yes; then
+if test $ac_cv_header_inq_stats_cpustats_h = yes; then
ac_have_func=yes
cat >>confdefs.h <<\_ACEOF
@@ -19123,7 +19093,7 @@
$as_echo "$ac_cv_header_sys_cpustats_h" >&6; }
fi
-if test "x$ac_cv_header_sys_cpustats_h" = x""yes; then
+if test $ac_cv_header_sys_cpustats_h = yes; then
ac_have_func=yes; cat >>confdefs.h <<\_ACEOF
#define UMAX 1
_ACEOF
@@ -19269,9 +19239,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -19417,9 +19386,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -19520,7 +19488,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5
$as_echo "$ac_cv_member_struct_nlist_n_un_n_name" >&6; }
-if test "x$ac_cv_member_struct_nlist_n_un_n_name" = x""yes; then
+if test $ac_cv_member_struct_nlist_n_un_n_name = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_NLIST_N_UN_N_NAME 1
@@ -19901,9 +19869,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -20006,9 +19973,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -20075,7 +20041,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5
$as_echo "$ac_cv_have_decl_optreset" >&6; }
-if test "x$ac_cv_have_decl_optreset" = x""yes; then
+if test $ac_cv_have_decl_optreset = yes; then
GETOPT_H=getopt.h
fi
@@ -20142,7 +20108,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getopt_clip" >&5
$as_echo "$ac_cv_have_decl_getopt_clip" >&6; }
-if test "x$ac_cv_have_decl_getopt_clip" = x""yes; then
+if test $ac_cv_have_decl_getopt_clip = yes; then
gl_cv_func_gnu_getopt=no
else
gl_cv_func_gnu_getopt=yes
@@ -20387,9 +20353,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -20461,7 +20426,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
$as_echo "$ac_cv_lib_intl_strftime" >&6; }
-if test "x$ac_cv_lib_intl_strftime" = x""yes; then
+if test $ac_cv_lib_intl_strftime = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_STRFTIME 1
_ACEOF
@@ -20565,9 +20530,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -20668,9 +20632,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -20749,7 +20712,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tparm" >&5
$as_echo "$ac_cv_lib_ncurses_tparm" >&6; }
-if test "x$ac_cv_lib_ncurses_tparm" = x""yes; then
+if test $ac_cv_lib_ncurses_tparm = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNCURSES 1
_ACEOF
@@ -20969,7 +20932,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_res_send" >&5
$as_echo "$ac_cv_func_res_send" >&6; }
-if test "x$ac_cv_func_res_send" = x""yes; then
+if test $ac_cv_func_res_send = yes; then
:
else
{ $as_echo "$as_me:$LINENO: checking for __res_send" >&5
@@ -21057,7 +21020,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func___res_send" >&5
$as_echo "$ac_cv_func___res_send" >&6; }
-if test "x$ac_cv_func___res_send" = x""yes; then
+if test $ac_cv_func___res_send = yes; then
:
else
{ $as_echo "$as_me:$LINENO: checking for res_send in -lresolv" >&5
@@ -21125,7 +21088,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_send" >&5
$as_echo "$ac_cv_lib_resolv_res_send" >&6; }
-if test "x$ac_cv_lib_resolv_res_send" = x""yes; then
+if test $ac_cv_lib_resolv_res_send = yes; then
resolv=yes
else
{ $as_echo "$as_me:$LINENO: checking for __res_send in -lresolv" >&5
@@ -21193,7 +21156,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_send" >&5
$as_echo "$ac_cv_lib_resolv___res_send" >&6; }
-if test "x$ac_cv_lib_resolv___res_send" = x""yes; then
+if test $ac_cv_lib_resolv___res_send = yes; then
resolv=yes
fi
@@ -21293,7 +21256,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_hes_getmailhost" >&5
$as_echo "$ac_cv_func_hes_getmailhost" >&6; }
-if test "x$ac_cv_func_hes_getmailhost" = x""yes; then
+if test $ac_cv_func_hes_getmailhost = yes; then
:
else
{ $as_echo "$as_me:$LINENO: checking for hes_getmailhost in -lhesiod" >&5
@@ -21361,7 +21324,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5
$as_echo "$ac_cv_lib_hesiod_hes_getmailhost" >&6; }
-if test "x$ac_cv_lib_hesiod_hes_getmailhost" = x""yes; then
+if test $ac_cv_lib_hesiod_hes_getmailhost = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBHESIOD 1
@@ -21452,7 +21415,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5
$as_echo "$ac_cv_lib_com_err_com_err" >&6; }
-if test "x$ac_cv_lib_com_err_com_err" = x""yes; then
+if test $ac_cv_lib_com_err_com_err = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCOM_ERR 1
_ACEOF
@@ -21527,7 +21490,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt"
>&5
$as_echo "$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = x""yes; then
+if test $ac_cv_lib_k5crypto_mit_des_cbc_encrypt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBK5CRYPTO 1
_ACEOF
@@ -21602,7 +21565,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5
$as_echo "$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = x""yes; then
+if test $ac_cv_lib_crypto_mit_des_cbc_encrypt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPTO 1
_ACEOF
@@ -21677,7 +21640,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_krb5_init_context" >&5
$as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; }
-if test "x$ac_cv_lib_krb5_krb5_init_context" = x""yes; then
+if test $ac_cv_lib_krb5_krb5_init_context = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB5 1
_ACEOF
@@ -21753,7 +21716,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5
$as_echo "$ac_cv_lib_des425_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_des425_des_cbc_encrypt" = x""yes; then
+if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDES425 1
_ACEOF
@@ -21827,7 +21790,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
$as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_des_des_cbc_encrypt" = x""yes; then
+if test $ac_cv_lib_des_des_cbc_encrypt = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDES 1
_ACEOF
@@ -21904,7 +21867,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_krb_get_cred" >&5
$as_echo "$ac_cv_lib_krb4_krb_get_cred" >&6; }
-if test "x$ac_cv_lib_krb4_krb_get_cred" = x""yes; then
+if test $ac_cv_lib_krb4_krb_get_cred = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB4 1
_ACEOF
@@ -21978,7 +21941,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_get_cred" >&5
$as_echo "$ac_cv_lib_krb_krb_get_cred" >&6; }
-if test "x$ac_cv_lib_krb_krb_get_cred" = x""yes; then
+if test $ac_cv_lib_krb_krb_get_cred = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB 1
_ACEOF
@@ -22127,9 +22090,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -22230,7 +22192,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_text" >&5
$as_echo "$ac_cv_member_krb5_error_text" >&6; }
-if test "x$ac_cv_member_krb5_error_text" = x""yes; then
+if test $ac_cv_member_krb5_error_text = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ERROR_TEXT 1
@@ -22335,7 +22297,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_krb5_error_e_text" >&5
$as_echo "$ac_cv_member_krb5_error_e_text" >&6; }
-if test "x$ac_cv_member_krb5_error_e_text" = x""yes; then
+if test $ac_cv_member_krb5_error_e_text = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ERROR_E_TEXT 1
@@ -22484,9 +22446,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -22627,9 +22588,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -22770,9 +22730,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -22924,9 +22883,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -23067,9 +23025,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -23210,9 +23167,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -23365,9 +23321,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -23446,7 +23401,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
+if test $ac_cv_lib_intl_dgettext = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINTL 1
_ACEOF
@@ -23646,9 +23601,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -23814,7 +23768,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
$as_echo "$ac_cv_func_socket" >&6; }
-if test "x$ac_cv_func_socket" = x""yes; then
+if test $ac_cv_func_socket = yes; then
:
else
ok_so_far=no
@@ -23948,7 +23902,7 @@
$as_echo "$ac_cv_header_netinet_in_h" >&6; }
fi
-if test "x$ac_cv_header_netinet_in_h" = x""yes; then
+if test $ac_cv_header_netinet_in_h = yes; then
:
else
ok_so_far=no
@@ -24084,7 +24038,7 @@
$as_echo "$ac_cv_header_arpa_inet_h" >&6; }
fi
-if test "x$ac_cv_header_arpa_inet_h" = x""yes; then
+if test $ac_cv_header_arpa_inet_h = yes; then
:
else
ok_so_far=no
@@ -24235,9 +24189,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -24364,7 +24317,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
$as_echo "$ac_cv_type_pid_t" >&6; }
-if test "x$ac_cv_type_pid_t" = x""yes; then
+if test $ac_cv_type_pid_t = yes; then
:
else
@@ -24509,9 +24462,8 @@
$as_echo "$ac_res" >&6; }
fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -24612,9 +24564,8 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
+if test `eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -25038,7 +24989,7 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
+if test $ac_cv_type_size_t = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_SIZE_T 1
@@ -25289,6 +25240,10 @@
$as_echo "$as_me: error: can't find current emacs version in
\`${srcdir}/lisp/version.el'." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test x"${version}" != x"$PACKAGE_VERSION"; then
+ { $as_echo "$as_me:$LINENO: WARNING: version mismatch between
\`${srcdir}/configure.in' and \`${srcdir}/lisp/version.el'." >&5
+$as_echo "$as_me: WARNING: version mismatch between \`${srcdir}/configure.in'
and \`${srcdir}/lisp/version.el'." >&2;}
+fi
### Specify what sort of things we'll be editing into Makefile and config.h.
### Use configuration here uncanonicalized to avoid exceeding size limits.
@@ -25593,8 +25548,8 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var
contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var
contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
@@ -25986,7 +25941,7 @@
# values after options handling.
ac_log="
This file was extended by emacs $as_me 23.1.50, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -25999,15 +25954,6 @@
_ACEOF
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
@@ -26021,12 +25967,11 @@
\`$as_me' instantiates files from templates according to the
current configuration.
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet, --silent
- do not print progress messages
+ -q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
@@ -26049,7 +25994,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
emacs config.status 23.1.50
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2008 Free Software Foundation, Inc.
@@ -26263,8 +26208,7 @@
$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` =
$ac_delim_num; then
break
elif $ac_last_try; then
{ { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -26469,9 +26413,9 @@
}
split(mac1, mac2, "(") #)
macro = mac2[1]
- prefix = substr(line, 1, index(line, defundef) - 1)
if (D_is_set[macro]) {
# Preserve the white space surrounding the "#".
+ prefix = substr(line, 1, index(line, defundef) - 1)
print prefix "define", macro P[macro] D[macro]
next
} else {
@@ -26479,7 +26423,7 @@
# in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
if (defundef == "undef") {
- print "/*", prefix defundef, macro, "*/"
+ print "/*", line, "*/"
next
}
}
@@ -26503,8 +26447,8 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -26892,8 +26836,8 @@
$ac_cs_success || { (exit 1); exit 1; }
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no;
then
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options:
$ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options:
$ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
fi
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/ChangeLog,v
retrieving revision 1.845
retrieving revision 1.846
diff -u -b -r1.845 -r1.846
--- ChangeLog 22 Aug 2009 08:49:36 -0000 1.845
+++ ChangeLog 23 Aug 2009 02:15:02 -0000 1.846
@@ -1,3 +1,9 @@
+2009-08-23 Ken Raeburn <address@hidden>
+
+ * configure.in: Warn if package version specified here doesn't
+ match the version in version.el.
+ * configure: Regenerate.
+
2009-08-22 Michael Albinus <address@hidden>
* configure.in: AC_CHECK_FUNCS dbus_watch_get_unix_fd.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs configure.in configure ChangeLog,
Ken Raeburn <=