XEmacs-Patches March 2005

xemacs-patches@xemacs.org

28 participants
113 discussions

[PATCH] Alias grep-find to find-grep 19 years, 1 month

Aidan Kehoe

David Kastrup mentions on a thread on emacs-devel(a)gnu.org that > I have quite often used `find-grep-dired' and it has been a nuisance > that the more often needed `find-grep' is not available. I only > discovered by accident that it _does_ exist, but only under the name > `grep-find'. My reaction was similar; I was used to find . -type f -exec grep -nH whatever {} \; in the shell and the word order of M-x grep-find RET seemed totally alien. So, yeah, the alias is worth adding. xemacs-packages/xemacs-base/ChangeLog addition: 2005-02-26 Aidan Kehoe <kehoea(a)parhasard.net> * compile.el (find-grep): Alias it to grep-find--if you're used to the shell, find and _then_ grep is the word order that springs to mind. XEmacs Packages source patch: Diff command: cvs -q diff -u Files affected: xemacs-packages/xemacs-base/compile.el Index: xemacs-packages/xemacs-base/compile.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xemacs-base/compile.el,v retrieving revision 1.32 diff -u -u -r1.32 compile.el --- xemacs-packages/xemacs-base/compile.el 2004/06/28 20:19:43 1.32 +++ xemacs-packages/xemacs-base/compile.el 2005/02/26 15:57:26 ＠＠ -768,6 +768,9 ＠＠ (let ((grep-null-device nil)) ; see grep (grep command-args))) +;; XEmacs addition +(defalias find-grep grep-find) + ;; XEmacs addition: all grep-all-files stuff (defun construct-grep-all-files-command (find-segment grep-segment) -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

2 participants
1 comments

[AC sft-xft ] Various autoconf.ac updates. 19 years, 1 month

Malcolm Purvis

APPROVE COMMIT This fixes a number of problems that I came across while preparing the mainline for autoconf 2.59. It does not include Aidan's most recent recent change because his patch is not on this branch. I should have the main patch ready by the end of the weekend. Malcolm ChangeLog addition: 2005-03-05 Malcolm Purvis <malcolmp(a)xemacs.org> * config.guess: * config.sub: Sync with the latest upstream versions. * configure.ac: Use --verbose for --extra-verbose. Better quoting of arguments. Internal shell vars statr with '_' to avoid name clashes. Pick up the latest changes to configure.in. Improve the testing of Athena 3d widgets. tests/ChangeLog addition: 2005-03-05 Malcolm Purvis <malcolmp(a)xemacs.org> * autoconf/regressiontest.pl: Added explict test for '--with-athena=3d' xemacs-xft-bugfixes source patch: Diff command: cvs -q diff -u Files affected: tests/autoconf/regressiontest.pl configure.ac config.sub config.guess Index: config.guess =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/config.guess,v retrieving revision 1.6.2.1 diff -u -r1.6.2.1 config.guess --- config.guess 2005/02/01 15:46:05 1.6.2.1 +++ config.guess 2005/03/04 13:09:07 ＠＠ -1,9 +1,9 ＠＠ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-11-12' +timestamp='2005-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by ＠＠ -53,7 +53,7 ＠＠ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO ＠＠ -804,6 +804,9 ＠＠ i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit 0 ;; + amd64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit 0 ;; ＠＠ -1196,6 +1199,9 ＠＠ exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx + exit 0 ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} exit 0 ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} Index: config.sub =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/config.sub,v retrieving revision 1.5.20.1 diff -u -r1.5.20.1 config.sub --- config.sub 2005/02/01 15:46:05 1.5.20.1 +++ config.sub 2005/03/04 13:09:09 ＠＠ -1,9 +1,9 ＠＠ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-11-30' +timestamp='2005-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software ＠＠ -70,7 +70,7 ＠＠ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO ＠＠ -237,7 +237,7 ＠＠ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ ＠＠ -310,7 +310,7 ＠＠ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.1.14.7 diff -u -r1.1.14.7 configure.ac --- configure.ac 2005/02/22 10:17:07 1.1.14.7 +++ configure.ac 2005/03/04 13:10:49 ＠＠ -98,32 +98,32 ＠＠ define([PRINT_VAR],[for var in patsubst([$1],[[ ]+],[ ]); do eval "echo \"$var = '\$$var'\""; done]) -dnl XE_ADD_OBJS(foo.o ...) +dnl XE_ADD_OBJS(foo.o) define([XE_ADD_OBJS], [extra_objs="$extra_objs [$1]" && dnl - if test "$extra_verbose" = "yes"; then + if test "$verbose" = "yes"; then echo " xemacs will be linked with \"[$1]\"" fi])dnl XE_ADD_OBJS dnl XE_APPEND(value, varname) define([XE_APPEND], [[$2]="$[$2] [$1]" && dnl - if test "$extra_verbose" = "yes"; then echo " Appending \"[$1]\" to \$[$2]"; fi]) + if test "$verbose" = "yes"; then echo " Appending \"[$1]\" to \$[$2]"; fi]) dnl XE_PREPEND(value, varname) define([XE_PREPEND], [[$2]="[$1] $[$2]" && dnl - if test "$extra_verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi]) + if test "$verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi]) dnl XE_DIE(message) define([XE_DIE], [{ echo "Error:" $1 >&2; exit 1; }]) dnl XE_CHECK_FEATURE_DEPENDENCY(feature1, feature2) define([XE_CHECK_FEATURE_DEPENDENCY], -[if test "$with_$1 $with_$2" = "yes no"; then - USAGE_ERROR("--with-$1 requires --with-$2") -elif test "$with_$2" = "no" ; then with_$1=no -elif test "$with_$1" = "yes"; then with_$2=yes +[if test "$with_[$1] $with_[$2]" = "yes no"; then + USAGE_ERROR("--with-[$1] requires --with-[$2]") +elif test "$with_[$2]" = "no" ; then with_[$1]=no +elif test "$with_[$1]" = "yes"; then with_[$2]=yes fi ]) ＠＠ -213,7 +213,7 ＠＠ if test -n "$runpath"; then ld_switch_run="${dash_r}${runpath}" XE_PROTECT_LINKER_FLAGS(ld_switch_run) - test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath" + test "$verbose" = "yes" && echo "Setting runpath to $runpath" fi fi ])dnl ＠＠ -247,16 +247,16 ＠＠ dnl found then an error is generated. dnl define([XE_PARSE_KEYWORD_OPTION], -[[$1]_bogus=yes +[_[$1]_bogus=yes for x in XE_KEYWORD_LIST ; do if test $x = $[$1] ; then - [$1]_bogus=no + _[$1]_bogus=no fi done - if test "$[$1]_bogus" = "yes" ; then + if test "$_[$1]_bogus" = "yes" ; then USAGE_ERROR(["The [$2] option must have one of these values: m4_translit(XE_KEYWORD_VALUES,[:],[,])."]) fi -unset [$1]_bogus +unset _[$1]_bogus undefine([XE_KEYWORD_LIST])dnl undefine([XE_KEYWORD_VALUES])]) dnl ＠＠ -316,18 +316,16 ＠＠ dnl XE_EXPAND_COMPLEX_OPTION(prefix, component, yesno) dnl --------------------------------------------------- dnl -dnl #### documented as XE_COMPLEX_OPTION_DEFAULT(prefix, component, yesno) -dnl #### in Malcolm's version? dnl Internal macro create the option's shell variable containing the default dnl value and to note the values in an option list. dnl define([XE_EXPAND_COMPLEX_OPTION], [[$1]_[$2]=[$3] -m4_append([XE_COMPONENT_LIST],[$2],[ ]) +m4_append([XE_COMPONENT_LIST],[$2],[ ])dnl dnl Separate with a ':' instead of a ',' (see <prefix>_default below) to avoid dnl confusion with marco parameter lists. -m4_append([XE_COMPONENT_DEFAULT],[m4_if([$3],no,no)[$2]],[:]) -]) +m4_append([XE_COMPONENT_DEFAULT],[m4_if([$3],no,no)[$2]],[:])dnl +])dnl dnl dnl XE_EXPAND_COMPLEX_OPTIONS(prefix, option_list) dnl ---------------------------------------------- ＠＠ -338,7 +336,7 ＠＠ [m4_if([$2], [[]], [], [XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl XE_EXPAND_COMPLEX_OPTIONS([$1], m4_cdr($2))])]) - +dnl dnl XE_INIT_COMPLEX_OPTION(prefix, option_list) dnl ------------------------------------------- dnl ＠＠ -352,8 +350,8 ＠＠ [[$1]_notfirst="" dnl XE_EXPAND_COMPLEX_OPTIONS($＠) -[$1]_types="XE_COMPONENT_LIST" -[$1]_default="m4_translit(XE_COMPONENT_DEFAULT,[:],[,])" +_[$1]_types="XE_COMPONENT_LIST" +_[$1]_default="m4_translit(XE_COMPONENT_DEFAULT,[:],[,])" dnl Undefine these macros so that they can be reused by later complex dnl options. undefine([XE_COMPONENT_LIST]) ＠＠ -368,45 +366,45 ＠＠ dnl define([XE_PARSE_COMPLEX_OPTION], [for x in `echo "$[$1]" | sed -e 's/,/ /g'` ; do - [$1]_all_default="" - [$1]_found="" + _[$1]_all_default="" + _[$1]_found="" case "$x" in - n | no | non | none ) [$1]_all_default=no ;; - a | al | all | both ) [$1]_all_default=yes ;; + n | no | non | none ) _[$1]_all_default=no ;; + a | al | all | both ) _[$1]_all_default=yes ;; esac - if test -z "$[$1]_all_default"; then - for y in $[$1]_types; do + if test -z "$_[$1]_all_default"; then + for y in $_[$1]_types; do dnl echo "testing x='$x' against y='$y'" if test "$x" = "$y"; then dnl echo "$x" = "$y" - [$1]_found=yes + _[$1]_found=yes dnl echo eval `echo "[$1]_$y=yes"` eval "[$1]_$y=yes" elif test "$x" = "no$y"; then dnl echo "$x" = "no$y" - [$1]_found=yes + _[$1]_found=yes dnl echo eval `echo "[$1]_$y=no"` eval "[$1]_$y=no" fi done - test -z "$[$1]_found" && [$1]_bogus=yes + test -z "$_[$1]_found" && _[$1]_bogus=yes fi - if test "$[$1]_bogus" = "yes" -o \ - $ -n "$[$1]_all_default" -a -n "$[$1]_notfirst" $ ; then + if test "$_[$1]_bogus" = "yes" -o \ + $ -n "$_[$1]_all_default" -a -n "$_[$1]_notfirst" $ ; then USAGE_ERROR(["Valid values for the [$2] option are: -$[$1]_types. With prefix \"no\", switch it off. +$_[$1]_types. With prefix \"no\", switch it off. Defaults may be overridden with \`all' or \`none' first in the list. -Hardcoded default is: $[$1]_default."]) - elif test -n "$[$1]_all_default" ; then - for y in $[$1]_types; do - eval "[$1]_$y=$[$1]_all_default" +Hardcoded default is: $_[$1]_default."]) + elif test -n "$_[$1]_all_default" ; then + for y in $_[$1]_types; do + eval "[$1]_$y=$_[$1]_all_default" done fi - [$1]_notfirst=yes + _[$1]_notfirst=yes done -unset [$1]_bogus [$1]_found [$1]_notfirst [$1]_types -unset [$1]_default [$1]_all_default x y +unset _[$1]_bogus _[$1]_found _[$1]_notfirst _[$1]_types +unset _[$1]_default _[$1]_all_default x y ]) dnl XE_COMPLEX_OPTION(option, yesno) ＠＠ -416,7 +414,7 ＠＠ dnl yes or no or "" (which means maybe). dnl define([XE_COMPLEX_OPTION],[[$1,$2]]) - +dnl dnl XE_COMPLEX_OPTION_HELP_STRING(flag, long, short, components, libraries) dnl ----------------------------------------------------------------------- dnl Boilerplate help string for complex options. ＠＠ -426,7 +424,7 ＠＠ [AC_HELP_STRING([$1],[Compile with support for $2. Components that can use $3 are $4. Prefix component with `no' to disable its use of $3. Requires $5 support. Default is $6.])]) - +dnl dnl XE_COMPLEX_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, dnl [XE_COMPLEX_OPTION(a,yes), ....]) dnl -------------------------------------------------------------------------- ＠＠ -440,7 +438,7 ＠＠ [XE_PARSE_COMPLEX_OPTION([with_]patsubst([$1], -, _), [--with-$1]) $3 ],[$4])]) - +dnl dnl XE_COMPLEX_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, dnl [XE_COMPLEX_OPTION, ....]) dnl -------------------------------------------------------------------------- ＠＠ -463,7 +461,7 ＠＠ dnl Command line argument processing. dnl Note that AC_HELP_STRING compresses whitespace, wraps, and indents the dnl string to fit the --help display; there's no need to preformat. - +dnl dnl Error-checking on old-style flags AC_ARG_WITH([mule],[],[XE_DIE([--enable-mule, NOT --with-mule])],[]) AC_ARG_WITH([menubars],[],[XE_DIE([--enable-menubars, NOT --with-menubars])],[]) ＠＠ -1047,7 +1045,7 ＠＠ . "$srcdir/version.sh" || exit 1; dnl Must do the following first to determine verbosity for AC_DEFINE if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi -: "${extra_verbose=$beta}" +: "${verbose=$beta}" version="${emacs_major_version}.${emacs_minor_version}" AC_DEFINE_UNQUOTED(EMACS_MAJOR_VERSION, $emacs_major_version) AC_DEFINE_UNQUOTED(EMACS_MINOR_VERSION, $emacs_minor_version) ＠＠ -1097,15 +1095,15 ＠＠ dnl Error checking default to "yes" in beta versions, to "no" in releases. dnl Same goes for --enable-debug and --extra-verbosity. if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi -test "${enable_error_checking_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS) -test "${enable_error_checking_types=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPES) -test "${enable_error_checking_text=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TEXT) -test "${enable_error_checking_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC) -test "${enable_error_checking_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC) -test "${enable_error_checking_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE) -test "${enable_error_checking_glyphs=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS) -test "${enable_error_checking_display=$beta}" = yes && AC_DEFINE(ERROR_CHECK_DISPLAY) -test "${enable_error_checking_structures=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES) +test "${enable_error_checking_extents:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS) +test "${enable_error_checking_types:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPES) +test "${enable_error_checking_text:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TEXT) +test "${enable_error_checking_gc:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC) +test "${enable_error_checking_malloc:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC) +test "${enable_error_checking_byte_code:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE) +test "${enable_error_checking_glyphs:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS) +test "${enable_error_checking_display:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_DISPLAY) +test "${enable_error_checking_structures:=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES) dnl enable_debug=yes must be set when error checking is present. This should be dnl fixed up. dnl enable_debug implies other options ＠＠ -2014,7 +2012,7 ＠＠ fi dnl For debugging... -dnl test "$extra_verbose" = "yes" && \ +test "$verbose" = "yes" && \ PRINT_VAR(libs_machine libs_system libs_termcap libs_standard objects_machine objects_system c_switch_machine c_switch_system ld_switch_machine ld_switch_system unexec ld_switch_shared ＠＠ -2441,6 +2439,7 ＠＠ if test -z "$compiler_version"; then compiler_version="detection failed (please report this)" fi +AC_MSG_RESULT([$compiler_version]) AC_MSG_CHECKING(for standard C library version information) ＠＠ -2487,6 +2486,7 ＠＠ if test -z "libc_version"; then libc_version="detection failed (please report this)" fi +AC_MSG_RESULT([$libc_version]) dnl --------------------------------------------------------------- dnl Add site and system specific flags to compile and link commands ＠＠ -2841,7 +2841,7 ＠＠ AC_CHECK_FUNCS(mkstemp) dnl Determine type of mail locking from configure args and s&m headers -AC_CHECKING(type of mail spool file locking) +AC_CHECKING([type of mail spool file locking]) AC_CHECK_FUNCS(lockf flock) dnl The mail_use_xxx variables are set according to the s&m headers. test -z "$with_mail_locking" -a "$mail_use_flock" = "yes" && with_mail_locking=flock ＠＠ -2904,7 +2904,7 ＠＠ dnl Choose a window system dnl ---------------------- -AC_CHECKING("for specified window system") +AC_CHECKING([for specified window system]) dnl Autodetection of Gdk libraries and includes dnl ------------------------------------------- ＠＠ -3138,7 +3138,7 ＠＠ XE_COMPUTE_RUNPATH() - if test "$extra_verbose" = "yes"; then + if test "$verbose" = "yes"; then echo; echo "X11 compilation variables:" PRINT_VAR(x_libraries x_includes X_CFLAGS X_LIBS X_PRE_LIBS X_EXTRA_LIBS) echo ＠＠ -3164,7 +3164,7 ＠＠ test ! -z "$bitmapdirs" && AC_DEFINE_UNQUOTED(BITMAPDIR, "$bitmapdirs") dnl Autodetect defines extracted from X config by xmkmf, e.g. NARROWPROTO - AC_CHECKING(for X defines extracted by xmkmf) + AC_CHECKING([for X defines extracted by xmkmf]) rm -fr conftestdir if mkdir conftestdir; then cd conftestdir ＠＠ -3212,7 +3212,7 ＠＠ -b i486-linuxaout) fi libs_x="-lX11" - test "$extra_verbose" = "yes" && echo " Setting libs_x to \"-lX11\"" + test "$verbose" = "yes" && echo " Setting libs_x to \"-lX11\"" dnl Autodetect -lXext AC_CHECK_LIB(Xext, XShapeSelectInput, XE_PREPEND(-lXext, libs_x)) ＠＠ -3237,7 +3237,7 ＠＠ AC_CHECK_FUNCS(XConvertCase) - AC_CHECK_HEADERS(X11/Xlocale.h) + AC_CHECK_HEADERS(X11/Xlocale.h X11/Xfuncproto.h) dnl XFree86 has a non-standard prototype for this X11R6 function AC_CHECK_FUNCS(XRegisterIMInstantiateCallback) ＠＠ -3328,7 +3328,7 ＠＠ fi dnl $with_x11 = yes if test "$with_msw" != "no"; then - AC_CHECKING(for MS-Windows) + AC_CHECKING([for MS-Windows]) AC_CHECK_LIB(gdi32,main,with_msw=yes) if test "$with_msw" = "yes"; then AC_DEFINE(HAVE_MS_WINDOWS) ＠＠ -3402,7 +3402,7 ＠＠ dnl fi for feature in with_tooltalk with_cde with_offix with_wmcommand with_xim with_xmu enable_sound_nas do - if eval "test -n \"\${feature}\" -a \"\${feature}\" != no" ; then + if eval "test -n \"\$${feature}\" -a \"\$${feature}\" != \"no\"" ; then AC_MSG_WARN([--$feature ignored: Not valid without X support]) fi eval "${feature}=no" ＠＠ -3437,7 +3437,7 ＠＠ esac dnl Enable or disable proper handling of WM_COMMAND -AC_CHECKING(for WM_COMMAND option); +AC_CHECKING([for WM_COMMAND option]) dnl if test "$with_wmcommand" = "yes"; then if test "$with_wmcommand" != "no"; then AC_DEFINE(HAVE_WMCOMMAND) ＠＠ -3473,7 +3473,7 ＠＠ dnl This must come before the detection code for anything that is in a module if test "$enable_modules" != "no"; then - AC_CHECKING(for module support) + AC_CHECKING([for module support]) case "$opsys" in mingw* | cygwin* ) have_dl=yes ;; ＠＠ -3677,7 +3677,7 ＠＠ fi dnl Autodetect LDAP -AC_CHECKING(for LDAP) +AC_CHECKING([for LDAP]) ldap_libs= test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) } test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) } ＠＠ -3727,7 +3727,7 ＠＠ dnl that prefix must be specified using the --with-site-prefixes flag. postgresql_libs= if test "$with_postgresql" != "no"; then - AC_CHECKING(for PostgreSQL) + AC_CHECKING([for PostgreSQL]) dnl Look for these standard header file locations, known to be used on Linux for header_dir in "" "pgsql/" "postgresql/"; do ＠＠ -3948,7 +3948,7 ＠＠ dnl ---------------------- if test "$with_x11" = "yes"; then - AC_CHECKING(for X11 graphics libraries) + AC_CHECKING([for X11 graphics libraries]) fi dnl We don't automatically trigger widgets if athena is present ＠＠ -3960,7 +3960,7 ＠＠ esac if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then - AC_CHECKING(for the Athena widgets) + AC_CHECKING([for the Athena widgets]) dnl What in heck did the user actually want? case "$with_athena" in ＠＠ -4008,13 +4008,23 ＠＠ dnl Curse this `Lets replace standard libraries' thing that they did. :/ AC_CHECK_HEADER(X11/$athena_variant/XawInit.h, [AC_CHECK_HEADER(X11/$athena_variant/ThreeD.h, - [athena_h_path=X11/$athena_variant])]) + [athena_h_path=X11/$athena_variant])],[], +[ +#if HAVE_X11_XFUNCPROTO_H +#include <X11/Xfuncproto.h> +#endif +]) dnl Is the variant specific header directory directly under include? if test -z "$athena_h_path"; then AC_CHECK_HEADER($athena_variant/XawInit.h, [AC_CHECK_HEADER($athena_variant/ThreeD.h, - athena_h_path=$athena_variant)]) + athena_h_path=$athena_variant)],[], +[ +#if HAVE_X11_XFUNCPROTO_H +#include <X11/Xfuncproto.h> +#endif +]) fi dnl If we couldn't find the specific variant, try the generic Athena 3d headers ＠＠ -4024,7 +4034,12 ＠＠ [ AC_MSG_WARN([Assuming that X11/Xaw3d headers are suitable for $athena_variant.]) athena_h_path=X11/Xaw3d - ])]) + ])],[], +[ +#if HAVE_X11_XFUNCPROTO_H +#include <X11/Xfuncproto.h> +#endif +]) fi dnl Also generic 3d headers directly under include dir ＠＠ -4034,7 +4049,12 ＠＠ [ AC_MSG_WARN([Assuming that Xaw3d headers are suitable for $athena_variant.]) athena_h_path=Xaw3d - ])]) + ])],[], +[ +#if HAVE_X11_XFUNCPROTO_H +#include <X11/Xfuncproto.h> +#endif +]) fi dnl If nothing yet found, see if Xaw is a 3d header set... ＠＠ -4242,19 +4262,19 ＠＠ fi if test "$enable_mule" = "yes" ; then - AC_CHECKING(for Mule-related features) + AC_CHECKING([for Mule-related features]) AC_DEFINE(MULE) dnl Use -lintl to get internationalized strerror for Mule AC_CHECK_HEADERS(libintl.h) AC_CHECK_LIB(intl, strerror) - AC_CHECKING(for Mule input methods) + AC_CHECKING([for Mule input methods]) dnl Do we have the XmIm* routines? And if so, do we want to use them? dnl XIM seems to be flaky except on Solaris... dnl test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no case "$with_xim" in "" | "yes" ) - AC_CHECKING(for XIM) + AC_CHECKING([for XIM]) AC_CHECK_LIB(X11, XOpenIM, with_xim=xlib, with_xim=no) dnl XIM + Lesstif is not (yet?) usable if test "$have_motif $have_lesstif" = "yes no"; then ＠＠ -4279,7 +4299,7 ＠＠ dnl "with_xfs" = "yes" if test "$with_xfs" = "yes" ; then - AC_CHECKING(for XFontSet) + AC_CHECKING([for XFontSet]) AC_CHECK_LIB(X11, XmbDrawString, [:], with_xfs=no) if test "$with_xfs" = "yes" && test "$enable_menubars" = "lucid"; then AC_DEFINE(USE_XFONTSET) ＠＠ -4737,7 +4757,7 ＠＠ dnl Check for sound of various sorts. dnl Autodetect native sound -AC_CHECKING("for sound support") +AC_CHECKING([for sound support]) test -n "$with_native_sound_lib" && enable_sound_native=yes if test "$enable_sound_native" != "no"; then ＠＠ -4901,7 +4921,7 ＠＠ test -z "$with_tty" && with_tty=yes if test "$with_tty" = "yes" ; then - AC_CHECKING(for TTY-related features) + AC_CHECKING([for TTY-related features]) AC_DEFINE(HAVE_TTY) dnl Autodetect ncurses. ＠＠ -4986,7 +5006,7 ＠＠ dnl By default, we check for DBM support in libgdbm, then libc, then libdbm. test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \ - != "no no no" && AC_CHECKING(for database support) + != "no no no" && AC_CHECKING([for database support]) dnl Check for ndbm.h, required for either kind of DBM support. if test "$enable_database_gdbm $enable_database_dbm" != "no no"; then ＠＠ -5241,7 +5261,7 ＠＠ done fi -if test "$extra_verbose" = "yes"; then +if test "$verbose" = "yes"; then echo "" PRINT_VAR(extra_objs c_switch_general c_switch_window_system c_switch_all ＠＠ -5256,26 +5276,26 ＠＠ dnl Create a .gdbinit useful for debugging XEmacs if test -f "$srcdir/src/.gdbinit" -a ! -f "src/.gdbinit"; then - test "$extra_verbose" = "yes" && echo "creating src/.gdbinit" + test "$verbose" = "yes" && echo "creating src/.gdbinit" echo "source $srcdir/src/.gdbinit" > "src/.gdbinit" fi dnl Create a .dbxrc useful for debugging XEmacs if test -f "$srcdir/src/.dbxrc" -a ! -f "src/.dbxrc"; then - test "$extra_verbose" = "yes" && echo "creating src/.dbxrc" + test "$verbose" = "yes" && echo "creating src/.dbxrc" echo ". $srcdir/src/.dbxrc" > "src/.dbxrc" fi dnl Create a useful TAGS file if test -f "$srcdir/TAGS" -a ! -f "TAGS"; then - test "$extra_verbose" = "yes" && echo "creating TAGS" + test "$verbose" = "yes" && echo "creating TAGS" echo " $srcdir/TAGS,include" > "TAGS" fi dnl Create top level .sbinit for Sun compilers if test "$__SUNPRO_C" = "yes"; then - test "$extra_verbose" = "yes" && echo "creating .sbinit" + test "$verbose" = "yes" && echo "creating .sbinit" ( echo "# For use with Sun WorkShop's Source browser." echo "# See sbquery(1) and sbinit(4) for more information" for dir in $MAKE_SUBDIR; do echo "import $dir"; done ＠＠ -5567,6 +5587,12 ＠＠ XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" $xemacs_extra_name configured for \`$ac_cv_build'. " +echo " WARNING: --------------------------------------------------------------" +echo " WARNING: This was produced from a new autoconf-2.5 based configuration." +echo " WARNING: If this configuration seems buggy then copy etc/configure-21.3" +echo " WARNING: to configure and try again. Also please report the bug." +echo " WARNING: --------------------------------------------------------------" + echo " Compilation Environment and Installation Defaults:" echo " Source code location: $srcdir" Index: tests/autoconf/regressiontest.pl =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/autoconf/Attic/regressiontest.pl,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 regressiontest.pl --- tests/autoconf/regressiontest.pl 2005/02/01 15:47:15 1.1.2.1 +++ tests/autoconf/regressiontest.pl 2005/03/04 13:10:56 ＠＠ -82,6 +82,7 ＠＠ "--infodir=/tmp/foo" => undef, "--libdir=/tmp/foo" => undef, "--exec-prefix=/tmp/foo" => undef, + "--with-athena=3d" => undef, "--with-mule --with-xft=emacs --debug --error-checking=all --with-xim=xlib --with-widgets=athena --with-athena=3d --with-dialogs=athena --memory-usage-stats --use-number-lib=gmp --site-prefixes=/opt/local:/sw --with-ldap=no --use-union-type" => "--enable-mule --with-xft=emacs --enable-debug --enable-error-checking=all --with-xim=xlib --enable-widgets=athena --with-athena=3d --enable-dialogs=athena --enable-memory-usage-stats --enable-bignum=gmp --with-site-prefixes=/opt/local:/sw --with-ldap=no --enable-union-type" ); -- Malcolm Purvis <malcolmp(a)xemacs.org>

1 participants
0 comments

Re: Patch my ego 19 years, 1 month

Simon Josefsson

Hrvoje Niksic <hniksic(a)xemacs.org> writes: > Simon Josefsson <jas(a)extundo.com> writes: > >> Hi all! Would it be very presumptuous of me to propose a blurb for >> lisp/about.el about myself? > > Not at all! Go ahead. Thanks. How about this? Feel free to fix my abuse of the English language. (My CVS karma didn't seem strong enough to install this.) 2005-02-28 Simon Josefsson <jas(a)extundo.com> * about.el (xemacs-hackers): Add jas. (about-other-current-hackers): Likewise. (about-url-alist): Add URL for jas. (about-personal-info): Document jas. (about-hacker-contribution): Describe jas contributions. Index: about.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/about.el,v retrieving revision 1.45.2.10 diff -u -p -r1.45.2.10 about.el --- about.el 2003/11/08 02:35:01 1.45.2.10 +++ about.el 2005/02/28 15:53:09 ＠＠ -1,6 +1,6 ＠＠ ;;; about.el --- the About The Authors page (shameless self promotion). -;; Copyright (c) 1997 Free Software Foundation, Inc. +;; Copyright (c) 1997, 2005 Free Software Foundation, Inc. ;; Copyright (C) 2001 Ben Wing. ;; Keywords: extensions ＠＠ -123,6 +123,7 ＠＠ (hobley "David hobley" "hobley(a)xemacs.org") (jan "Jan Vroonhof" "jan(a)xemacs.org") (jareth "Jareth Hein" "jareth(a)xemacs.org") + (jas "Simon Josefsson" "simon(a)xemacs.org") (jason "Jason R. Mastaler" "jason(a)xemacs.org") (jens "Jens Lautenbacher" "jens(a)xemacs.org") (jmiller "Jeff Miller" "jmiller(a)xemacs.org") ＠＠ -173,8 +174,9 ＠＠ ;; to sort this list or the one below, use: ;; M-x sort-regexp-fields RET [a-z]+ RET $.*$ RET '(aj alastair cgw craig daiki dan dv fabrice golubev gunnar hisashi hniksic - jan jareth jmiller jason jonathan kazz kirill larsi morioka mta ograf - olivier oscar pittman tomonori tuck wmperry yoshiki)) + jan jareth jas jason jmiller jonathan kazz kirill larsi + morioka mta ograf olivier oscar pittman tomonori tuck + wmperry yoshiki)) (defvar about-once-and-future-hackers '(ajc baw bw chr cthomp darrylo devin dkindred dmoore eb hbs hmuller ＠＠ -201,6 +203,7 ＠＠ (dv . "http://www.lrde.epita.fr/~didier/") (fabrice . "http://www.ese-metz.fr/~popineau/") (fptex . "http://www.fptex.org/") + (jas . "http://josefsson.org/") (jason . "http://www.mastaler.com/") (juhp . "http://www.01.246.ne.jp/~juhp/") (jwz . "http://www.jwz.org/") ＠＠ -1067,6 +1070,25 ＠＠ become a cel-animator, and a more succes computer-game programmer. As he happens to be bilingual (guess which two?) he's been doing quite a bit of MULE hacking. He's also getting his hands dirty in the graphics areas as well.\n")) + (jas + (widget-insert "\ + +Simon lives in Stockholm where he has discovered that computers +can be a powerful procrastinating tool. Combined with a +frustrating desire to see computers simply work, he spends most +of his time complaining. Occasionally he rises up to the task +and produces something that others may complain about, which +brings him increased satisfaction with every bug report. Today +he is pretending to be a network security guy, with a preference +for standardization issues, while secretly longing to start a +cafe or becoming a theoretical computer scientist. His personal +interest is literature, and to some extent traveling, but will +try anything for fun, such as juggling, skiing, wine, and +long-distance biking. + +See: ") + (about-url-link 'jas nil "Visit Simon's homepage") + (widget-insert ".\n")) (jason (widget-insert "\ Jason resides in Northern New Mexico where he works as a Systems ＠＠ -1609,6 +1631,13 ＠＠ of the XEmacs custom subsystem and gnuse (widget-insert "\ Owner of cvs.xemacs.org, the machine that holds the XEmacs CVS repository, and author of some of the graphics code in XEmacs.\n")) + (jas + (widget-insert "\ +Wrote and/or integrated several packages for Gnus, such as +support for IMAP, Sieve, format=flowed, GnuTLS, S/MIME, and PGP. +Irregularly synchronize lisp code between Emacs and XEmacs. He +maintain the mail-lib, sieve, sasl, pgg and ecrypto XEmacs +packages. Operate the secondary MX for xemacs.org.\n")) (jason (widget-insert "\ Beta tester, manager of the various XEmacs mailing lists and binary

2 participants
3 comments

[COMMIT] Wrap call to XtRegisterDrawable with check that XtWindowToWidget gives NULL 19 years, 1 month

Aidan Kehoe

APPROVE COMMIT NOTE: This patch has been committed. src/ChangeLog addition: 2005-03-02 Aidan Kehoe <kehoea(a)parhasard.net> * select-x.c (x_reply_selection_request): Check that XtWindowToWidget returns NULL before calling XtRegisterDrawable, document why. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/select-x.c Index: src/select-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/select-x.c,v retrieving revision 1.22 diff -u -u -r1.22 select-x.c --- src/select-x.c 2005/03/02 13:06:40 1.22 +++ src/select-x.c 2005/03/02 18:29:25 ＠＠ -545,8 +545,24 ＠＠ target window, rather, pass them to us. This would be a hack, but the Xt selection routines are broken for our purposes--we can't pass them callbacks from Lisp, for example. Let's call it a - workaround. */ - XtRegisterDrawable(display, (Drawable)window, widget); + workaround. + + The call to wait_for_property_change means we can break out of that + function, switch to another frame on the same display (which will + be another Xt widget), select a huge amount of text, and have the + same (foreign) app ask for another incremental selection + transfer. Programming like X11 made sense, would mean that, in that + case, XtRegisterDrawable is called twice with different widgets. + + Since the results of calling XtRegisterDrawable when the drawable + is already registered with another widget are undefined, we want to + avoid that--so, only call it when XtWindowToWidget returns NULL, + which it will only do with a valid Window if it's not already + registered. */ + if (NULL == XtWindowToWidget(display, window)) + { + XtRegisterDrawable(display, (Drawable)window, widget); + } prop_id = expect_property_change (display, window, reply.property, PropertyDelete); -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

1 participants
0 comments

[COMMIT] font.el cleanup xft-* -> fc-*, add :regular weight to fontconfig.el 19 years, 1 month

Aidan Kehoe

NOTE: This patch has been committed. Should fix the issue François was seeing in 87r7izr6ku.fsf(a)nerim.fr . Eric, if you have some updated Lisp from when those C core changes were made, now would be a good time to integrate it. :-) lisp/ChangeLog addition: 2005-03-01 Aidan Kehoe <kehoea(a)parhasard.net> General cleanup of references to functions Eric has deleted and renamed in the C core. * font.el (x-font-create-object): xft-xlfd-font-name-p -> xlfd-font-name-p * font.el (x-font-create-object-xft): xft-pattern-* -> fc-pattern-*, return the created font. * font.el (x-font-create-name-xft): xft* -> fc* * fontconfig.el (fc-font-name-weight-regular): New. * fontconfig.el (fc-font-name-weight-mapping): * fontconfig.el (fc-font-name-weight-mapping-string): * fontconfig.el (fc-font-name-weight-mapping-string-reverse): * fontconfig.el (fc-font-name-weight-mapping-reverse): * fontconfig.el (fc-font-weight-translate-from-symbol): Add information on the "regular" font weight, taken from fontconfig.h, which is the weight my local system returns by default. XEmacs sjt-xft source patch: Diff command: cvs -q diff -u Files affected: lisp/fontconfig.el lisp/font.el Index: lisp/font.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font.el,v retrieving revision 1.15.2.1 diff -u -u -r1.15.2.1 font.el --- lisp/font.el 2004/11/25 12:44:00 1.15.2.1 +++ lisp/font.el 2005/03/01 13:03:20 ＠＠ -548,7 +548,7 ＠＠ (defun x-font-create-object (fontname &optional device) "Return a font descriptor object for FONTNAME, appropriate for X devices." (if (featurep 'xft-fonts) - (if (xft-xlfd-font-name-p fontname) + (if (xlfd-font-name-p fontname) (x-font-create-object-core fontname device) (x-font-create-object-xft fontname device)) (x-font-create-object-core fontname device))) ＠＠ -556,25 +556,20 ＠＠ (defun x-font-create-object-xft (fontname &optional device) (let* ((name fontname) (device (or device (default-x-device))) - (pattern (xft-font-real-pattern name device)) + (pattern (fc-font-real-pattern name device)) (font-obj (make-font)) - (family (xft-pattern-get-family pattern 0)) - (size (xft-pattern-get-size pattern 0)) - (weight (xft-pattern-get-weight pattern 0)) - (enconding (xft-pattern-get-encoding pattern 0))) + (family (fc-pattern-get-family pattern 0)) + (size (fc-pattern-get-size pattern 0)) + (weight (fc-pattern-get-weight pattern 0))) (set-font-family font-obj - (and (not (equal family 'x-xft-result-no-match)) + (and (not (equal family 'fc-result-no-match)) family)) (set-font-size font-obj - (and (not (equal size 'x-xft-result-no-match)) + (and (not (equal size 'fc-result-no-match)) size)) (set-font-weight font-obj - (and (not (equal weight 'x-xft-result-no-match)) - (xft-font-weight-translate-from-constant weight))) -; does not fit into Xft2 -; (set-font-encoding font-obj -; (and (not (equal enconding 'x-xft-result-no-match)) -; enconding)) + (and (not (equal weight 'fc-result-no-match)) + (fc-font-weight-translate-from-constant weight))) font-obj)) (defun x-font-create-object-core (fontname &optional device) ＠＠ -685,14 +680,12 ＠＠ (x-font-create-name-core fontobj device))) (defun x-font-create-name-xft (fontobj &optional device) - (let* ((pattern (make-xft-pattern))) + (let* ((pattern (make-fc-pattern))) (if (font-family fontobj) - (xft-pattern-add pattern xft-font-name-property-family - (font-family fontobj))) + (fc-pattern-add-family pattern (font-family fontobj))) (if (font-size fontobj) - (xft-pattern-add pattern xft-font-name-property-size - (font-size fontobj))) - (xft-name-unparse pattern))) + (fc-pattern-add-size pattern (font-size fontobj))) + (fc-name-unparse pattern))) (defun x-font-create-name-core (fontobj &optional device) "Return a font name constructed from FONTOBJ, appropriate for X devices." Index: lisp/fontconfig.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/Attic/fontconfig.el,v retrieving revision 1.1.2.2 diff -u -u -r1.1.2.2 fontconfig.el --- lisp/fontconfig.el 2005/02/04 16:06:00 1.1.2.2 +++ lisp/fontconfig.el 2005/03/01 13:03:21 ＠＠ -207,6 +207,7 ＠＠ (if pair (cdr pair)))) (defconst fc-font-name-weight-light 0) +(defconst fc-font-name-weight-regular 80) (defconst fc-font-name-weight-medium 100) (defconst fc-font-name-weight-demibold 180) (defconst fc-font-name-weight-bold 200) ＠＠ -214,6 +215,7 ＠＠ (defconst fc-font-name-weight-mapping `((,fc-font-name-weight-light . :light) + (,fc-font-name-weight-regular . :regular) (,fc-font-name-weight-medium . :medium) (,fc-font-name-weight-demibold . :demibold) (,fc-font-name-weight-bold . :bold) ＠＠ -221,6 +223,7 ＠＠ (defconst fc-font-name-weight-mapping-string `((,fc-font-name-weight-light . "Light") + (,fc-font-name-weight-regular . "Regular") (,fc-font-name-weight-medium . "Medium") (,fc-font-name-weight-demibold . "Demibold") (,fc-font-name-weight-bold . "Bold") ＠＠ -228,6 +231,7 ＠＠ (defconst fc-font-name-weight-mapping-string-reverse `(("Light" . ,fc-font-name-weight-light) + ("Regular" . ,fc-font-name-weight-regular) ("Medium" . ,fc-font-name-weight-medium) ("Demibold" . ,fc-font-name-weight-demibold) ("Bold" . ,fc-font-name-weight-bold) ＠＠ -235,6 +239,7 ＠＠ (defconst fc-font-name-weight-mapping-reverse `((:light . ,fc-font-name-weight-light) + (:regular . ,fc-font-name-weight-regular) (:medium . ,fc-font-name-weight-medium) (:demibold . ,fc-font-name-weight-demibold) (:bold . ,fc-font-name-weight-bold) ＠＠ -246,8 +251,8 ＠＠ (if pair (cdr pair)))) (defun fc-font-weight-translate-from-symbol (symbol) - "Translate SYMBOL (`:light', `:medium', `:demibold', `:bold' or -`:black') to the corresponding Xft font weight constant." + "Translate SYMBOL (`:light', `:regular', `:medium', `:demibold', +`:bold' or `:black') to the corresponding Xft font weight constant." (let ((pair (assoc symbol fc-font-name-weight-mapping-reverse))) (if pair (cdr pair)))) -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

2 participants
1 comments

[COMMIT] Make the #ifndef HAVE_XTREGISTERDRAWABLE msg polite, have it compile 19 years, 1 month

Aidan Kehoe

APPROVE COMMIT 21.5 NOTE: This patch has been committed. Malcolm, I didn’t use exactly the error message you suggested, because of the need for a buffer to sprintf into for it, and doubts about whether function-local static buffers are portable enough. (There’s a chance an automatic buffer would be trashed by the signal handling, IIRC.) src/ChangeLog addition: 2005-03-02 Aidan Kehoe <kehoea(a)parhasard.net> * select-x.c (x_reply_selection_request): Make the error message in the absence of HAVE_XTREGISTERDRAWABLE more polite, pass a second argument to invalid_operation to have it actually compile in that case. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/select-x.c Index: src/select-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/select-x.c,v retrieving revision 1.21 diff -u -u -r1.21 select-x.c --- src/select-x.c 2005/03/01 22:43:41 1.21 +++ src/select-x.c 2005/03/02 13:04:34 ＠＠ -528,8 +528,7 ＠＠ else { #ifndef HAVE_XTREGISTERDRAWABLE - invalid_operation("your Xt library sucks too much to transfer this " - "much data!"); + invalid_operation("Copying that much data requires X11R6.", Qunbound); #else /* Send an INCR selection. */ int prop_id; -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

1 participants
0 comments

[PATCH] Bump gc-cons-threshold to 4MB. 19 years, 1 month

Aidan Kehoe

It’s been 500k since 1996. Computers ship with significantly more RAM now. As discussed about a month ago. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/alloc.c Index: src/alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v retrieving revision 1.106 diff -u -u -r1.106 alloc.c --- src/alloc.c 2005/02/03 16:14:04 1.106 +++ src/alloc.c 2005/02/27 18:49:10 ＠＠ -5340,7 +5340,7 ＠＠ funcall_alloca_count = 0; #if 1 - gc_cons_threshold = 500000; /* XEmacs change */ + gc_cons_threshold = 4194304; /* XEmacs change */ #else gc_cons_threshold = 15000; /* debugging */ #endif -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

3 participants
3 comments

[COMMIT] (Slightly Revised) Add configure check for XtRegisterDrawable 19 years, 1 month

Aidan Kehoe

NOTE: This patch has been committed. Okay, perhaps the error message is a tiny bit juvenile. Does anyone know of an alternative to XtRegisterDrawable on the platforms where that isn’t available, though? (And it is a distinct improvement on the previous infinite loop.) ChangeLog addition: 2005-03-01 Aidan Kehoe <kehoea(a)parhasard.net> * configure: * configure.in (XE_COMPUTE_RUNPATH): Check for the availability of XtRegisterDrawable. src/ChangeLog addition: 2005-03-01 Aidan Kehoe <kehoea(a)parhasard.net> * config.h.in: New macro, HAVE_XTREGISTERDRAWABLE. * select-x.c (x_reply_selection_request): Use it. XEmacs Trunk (existing ChangeLogs) source patch: Diff command: cvs -q diff -u Files affected: src/select-x.c src/config.h.in configure.in configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.240 diff -u -u -r1.240 configure --- configure 2005/02/18 06:26:58 1.240 +++ configure 2005/03/01 22:39:30 ＠＠ -987,6 +987,16 ＠＠ } fi +if test "$xemacs_release_date" != ""; then + { test "$extra_verbose" = "yes" && cat << EOF + Defining XEMACS_RELEASE_DATE = "$xemacs_release_date" +EOF +cat >> confdefs.h <<EOF +#define XEMACS_RELEASE_DATE "$xemacs_release_date" +EOF +} + +fi { test "$extra_verbose" = "yes" && cat << EOF Defining EMACS_VERSION = "$version" EOF ＠＠ -1148,7 +1158,7 ＠＠ echo $ac_n "checking "host system type"""... $ac_c" 1>&6 -echo "configure:1152: checking "host system type"" >&5 +echo "configure:1162: checking "host system type"" >&5 internal_configuration=`echo $configuration | sed 's/-$workshop$//'` canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"` configuration=`echo "$configuration" | sed 's/^$[^-][^-]*-[^-][^-]*-[^-][^-]*$-.*$/\1/'` ＠＠ -1696,7 +1706,7 ＠＠ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1700: checking for $ac_word" >&5 +echo "configure:1710: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -1723,7 +1733,7 ＠＠ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1727: checking for $ac_word" >&5 +echo "configure:1737: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -1771,7 +1781,7 ＠＠ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1775: checking for $ac_word" >&5 +echo "configure:1785: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -1800,7 +1810,7 ＠＠ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' ＠＠ -1813,12 +1823,12 ＠＠ cat > conftest.$ac_ext << EOF -#line 1817 "configure" +#line 1827 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then ＠＠ -1846,19 +1856,19 ＠＠ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1850: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1860: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1855: checking whether we are using GNU C" >&5 +echo "configure:1865: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no ＠＠ -1876,7 +1886,7 ＠＠ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1880: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1890: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ＠＠ -1909,7 +1919,7 ＠＠ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1913: checking for $ac_word" >&5 +echo "configure:1923: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -1936,7 +1946,7 ＠＠ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1940: checking for $ac_word" >&5 +echo "configure:1950: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -1984,7 +1994,7 ＠＠ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1988: checking for $ac_word" >&5 +echo "configure:1998: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -2013,7 +2023,7 ＠＠ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2017: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2027: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' ＠＠ -2026,12 +2036,12 ＠＠ cat > conftest.$ac_ext << EOF -#line 2030 "configure" +#line 2040 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then ＠＠ -2059,19 +2069,19 ＠＠ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2063: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2073: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2068: checking whether we are using GNU C" >&5 +echo "configure:2078: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no ＠＠ -2089,7 +2099,7 ＠＠ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2093: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2103: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ＠＠ -2122,7 +2132,7 ＠＠ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2126: checking for $ac_word" >&5 +echo "configure:2136: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -2149,7 +2159,7 ＠＠ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2153: checking for $ac_word" >&5 +echo "configure:2163: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -2197,7 +2207,7 ＠＠ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2201: checking for $ac_word" >&5 +echo "configure:2211: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -2226,7 +2236,7 ＠＠ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2230: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2240: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' ＠＠ -2239,12 +2249,12 ＠＠ cat > conftest.$ac_ext << EOF -#line 2243 "configure" +#line 2253 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then ＠＠ -2272,19 +2282,19 ＠＠ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2276: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2286: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2281: checking whether we are using GNU C" >&5 +echo "configure:2291: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no ＠＠ -2302,7 +2312,7 ＠＠ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2306: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2316: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ＠＠ -2335,7 +2345,7 ＠＠ if test "$GCC" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 2339 "configure" +#line 2349 "configure" #include "confdefs.h" int main () { #if __GNUC__ >= 3 ＠＠ -2345,7 +2355,7 ＠＠ #endif } EOF -if { (eval echo configure:2349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:2359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else ＠＠ -2371,7 +2381,7 ＠＠ test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2375: checking how to run the C preprocessor" >&5 +echo "configure:2385: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= ＠＠ -2384,13 +2394,13 ＠＠ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2388 "configure" +#line 2398 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : ＠＠ -2401,13 +2411,13 ＠＠ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2405 "configure" +#line 2415 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : ＠＠ -2418,13 +2428,13 ＠＠ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2422 "configure" +#line 2432 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : ＠＠ -2450,9 +2460,9 ＠＠ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2454: checking for AIX" >&5 +echo "configure:2464: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 2456 "configure" +#line 2466 "configure" #include "confdefs.h" #ifdef _AIX yes ＠＠ -2479,9 +2489,9 ＠＠ echo $ac_n "checking for GNU libc""... $ac_c" 1>&6 -echo "configure:2483: checking for GNU libc" >&5 +echo "configure:2493: checking for GNU libc" >&5 cat > conftest.$ac_ext <<EOF -#line 2485 "configure" +#line 2495 "configure" #include "confdefs.h" #include <features.h> int main() { ＠＠ -2493,7 +2503,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:2497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_glibc=yes else ＠＠ -2588,7 +2598,7 ＠＠ esac cat > conftest.$ac_ext <<EOF -#line 2592 "configure" +#line 2602 "configure" #include "confdefs.h" int main () { #if defined __SUNPRO_C ＠＠ -2604,7 +2614,7 ＠＠ #endif } EOF -if { (eval echo configure:2608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:2618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else ＠＠ -2858,17 +2868,17 ＠＠ if test "$__USLC__" = yes; then echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6 -echo "configure:2862: checking for whether the -Kalloca compiler flag is needed" >&5 +echo "configure:2872: checking for whether the -Kalloca compiler flag is needed" >&5 need_kalloca=no cat > conftest.$ac_ext <<EOF -#line 2865 "configure" +#line 2875 "configure" #include "confdefs.h" int main() { void *x = alloca(4); ; return 0; } EOF -if { (eval echo configure:2872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s cat > conftest.$ac_ext <<EOF -#line 4244 "configure" +#line 4254 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -4271,10 +4281,10 ＠＠ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4275: checking for uid_t in sys/types.h" >&5 +echo "configure:4285: checking for uid_t in sys/types.h" >&5 cat > conftest.$ac_ext <<EOF -#line 4278 "configure" +#line 4288 "configure" #include "confdefs.h" #include <sys/types.h> EOF ＠＠ -4310,10 +4320,10 ＠＠ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:4314: checking for mode_t" >&5 +echo "configure:4324: checking for mode_t" >&5 cat > conftest.$ac_ext <<EOF -#line 4317 "configure" +#line 4327 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -4344,10 +4354,10 ＠＠ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4348: checking for off_t" >&5 +echo "configure:4358: checking for off_t" >&5 cat > conftest.$ac_ext <<EOF -#line 4351 "configure" +#line 4361 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -4378,10 +4388,10 ＠＠ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:4382: checking for ssize_t" >&5 +echo "configure:4392: checking for ssize_t" >&5 cat > conftest.$ac_ext <<EOF -#line 4385 "configure" +#line 4395 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -4414,9 +4424,9 ＠＠ if test "$ac_cv_header_inttypes_h" != "yes"; then echo $ac_n "checking for intptr_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4418: checking for intptr_t in sys/types.h" >&5 +echo "configure:4428: checking for intptr_t in sys/types.h" >&5 cat > conftest.$ac_ext <<EOF -#line 4420 "configure" +#line 4430 "configure" #include "confdefs.h" #include <sys/types.h> intptr_t x; ＠＠ -4425,7 +4435,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:4429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF ＠＠ -4446,9 +4456,9 ＠＠ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:4450: checking for socklen_t" >&5 +echo "configure:4460: checking for socklen_t" >&5 cat > conftest.$ac_ext <<EOF -#line 4452 "configure" +#line 4462 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> ＠＠ -4458,7 +4468,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:4462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else ＠＠ -4467,7 +4477,7 ＠＠ rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4471 "configure" +#line 4481 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> ＠＠ -4477,7 +4487,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:4481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""size_t" 1>&6 ＠＠ -4509,9 +4519,9 ＠＠ rm -f conftest* echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:4513: checking for struct timeval" >&5 +echo "configure:4523: checking for struct timeval" >&5 cat > conftest.$ac_ext <<EOF -#line 4515 "configure" +#line 4525 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> ＠＠ -4527,7 +4537,7 ＠＠ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:4531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes ＠＠ -4549,10 +4559,10 ＠＠ rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4553: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4563: checking whether struct tm is in sys/time.h or time.h" >&5 cat > conftest.$ac_ext <<EOF -#line 4556 "configure" +#line 4566 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> ＠＠ -4560,7 +4570,7 ＠＠ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else ＠＠ -4584,10 +4594,10 ＠＠ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4588: checking for tm_zone in struct tm" >&5 +echo "configure:4598: checking for tm_zone in struct tm" >&5 cat > conftest.$ac_ext <<EOF -#line 4591 "configure" +#line 4601 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> ＠＠ -4595,7 +4605,7 ＠＠ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else ＠＠ -4618,10 +4628,10 ＠＠ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4622: checking for tzname" >&5 +echo "configure:4632: checking for tzname" >&5 cat > conftest.$ac_ext <<EOF -#line 4625 "configure" +#line 4635 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ ＠＠ -4631,7 +4641,7 ＠＠ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else ＠＠ -4657,10 +4667,10 ＠＠ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4661: checking for working const" >&5 +echo "configure:4671: checking for working const" >&5 cat > conftest.$ac_ext <<EOF -#line 4664 "configure" +#line 4674 "configure" #include "confdefs.h" int main() { ＠＠ -4709,7 +4719,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:4713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else ＠＠ -4734,7 +4744,7 ＠＠ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:4738: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:4748: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF ＠＠ -4759,12 +4769,12 ＠＠ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4763: checking whether byte ordering is bigendian" >&5 +echo "configure:4773: checking whether byte ordering is bigendian" >&5 ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 4768 "configure" +#line 4778 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> ＠＠ -4775,11 +4785,11 ＠＠ #endif ; return 0; } EOF -if { (eval echo configure:4779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 4783 "configure" +#line 4793 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> ＠＠ -4790,7 +4800,7 ＠＠ #endif ; return 0; } EOF -if { (eval echo configure:4794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else ＠＠ -4807,7 +4817,7 ＠＠ rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <<EOF -#line 4811 "configure" +#line 4821 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ ＠＠ -4820,7 +4830,7 ＠＠ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:4824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_bigendian=no else ＠＠ -4847,13 +4857,12 ＠＠ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4851: checking size of short" >&5 +echo "configure:4861: checking size of short" >&5 cat > conftest.$ac_ext <<EOF -#line 4854 "configure" +#line 4864 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -4862,7 +4871,7 ＠＠ exit(0); } EOF -if { (eval echo configure:4866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else ＠＠ -4890,13 +4899,12 ＠＠ exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4894: checking size of int" >&5 +echo "configure:4903: checking size of int" >&5 cat > conftest.$ac_ext <<EOF -#line 4897 "configure" +#line 4906 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -4905,7 +4913,7 ＠＠ exit(0); } EOF -if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else ＠＠ -4927,13 +4935,12 ＠＠ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4931: checking size of long" >&5 +echo "configure:4939: checking size of long" >&5 cat > conftest.$ac_ext <<EOF -#line 4934 "configure" +#line 4942 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -4942,7 +4949,7 ＠＠ exit(0); } EOF -if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else ＠＠ -4964,13 +4971,12 ＠＠ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4968: checking size of long long" >&5 +echo "configure:4975: checking size of long long" >&5 cat > conftest.$ac_ext <<EOF -#line 4971 "configure" +#line 4978 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -4979,7 +4985,7 ＠＠ exit(0); } EOF -if { (eval echo configure:4983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long_long=`cat conftestval` else ＠＠ -5001,13 +5007,12 ＠＠ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:5005: checking size of void *" >&5 +echo "configure:5011: checking size of void *" >&5 cat > conftest.$ac_ext <<EOF -#line 5008 "configure" +#line 5014 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -5016,7 +5021,7 ＠＠ exit(0); } EOF -if { (eval echo configure:5020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:5025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_void_p=`cat conftestval` else ＠＠ -5038,13 +5043,12 ＠＠ echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:5042: checking size of double" >&5 +echo "configure:5047: checking size of double" >&5 cat > conftest.$ac_ext <<EOF -#line 5045 "configure" +#line 5050 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -5053,7 +5057,7 ＠＠ exit(0); } EOF -if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:5061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_double=`cat conftestval` else ＠＠ -5076,7 +5080,7 ＠＠ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:5080: checking for long file names" >&5 +echo "configure:5084: checking for long file names" >&5 ac_cv_sys_long_file_names=yes # Test for long file names in all the places we know might matter: ＠＠ -5122,10 +5126,10 ＠＠ echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:5126: checking for sin" >&5 +echo "configure:5130: checking for sin" >&5 cat > conftest.$ac_ext <<EOF -#line 5129 "configure" +#line 5133 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sin(); below. */ ＠＠ -5148,7 +5152,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:5152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sin=yes" else ＠＠ -5166,12 +5170,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:5170: checking for sin in -lm" >&5 +echo "configure:5174: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` xe_check_libs=" -lm " cat > conftest.$ac_ext <<EOF -#line 5175 "configure" +#line 5179 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -5182,7 +5186,7 ＠＠ sin() ; return 0; } EOF -if { (eval echo configure:5186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5217,14 +5221,14 ＠＠ cat > conftest.$ac_ext <<EOF -#line 5221 "configure" +#line 5225 "configure" #include "confdefs.h" #include <math.h> int main() { return atanh(1.0) + asinh(1.0) + acosh(1.0); ; return 0; } EOF -if { (eval echo configure:5228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_INVERSE_HYPERBOLIC ＠＠ -5243,10 +5247,10 ＠＠ for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5247: checking for $ac_func" >&5 +echo "configure:5251: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 5250 "configure" +#line 5254 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -5269,7 +5273,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:5273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -5298,14 +5302,14 ＠＠ echo "checking type of mail spool file locking" 1>&6 -echo "configure:5302: checking type of mail spool file locking" >&5 +echo "configure:5306: checking type of mail spool file locking" >&5 for ac_func in lockf flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5306: checking for $ac_func" >&5 +echo "configure:5310: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 5309 "configure" +#line 5313 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -5328,7 +5332,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:5332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -5418,12 +5422,12 ＠＠ case "$opsys" in decosf*) echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:5422: checking for cma_open in -lpthreads" >&5 +echo "configure:5426: checking for cma_open in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lpthreads " cat > conftest.$ac_ext <<EOF -#line 5427 "configure" +#line 5431 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -5434,7 +5438,7 ＠＠ cma_open() ; return 0; } EOF -if { (eval echo configure:5438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5471,7 +5475,7 ＠＠ echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:5475: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:5479: checking whether the -xildoff compiler flag is required" >&5 if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then echo "$ac_t""no" 1>&6; ＠＠ -5483,7 +5487,7 ＠＠ if test "$opsys" = "sol2"; then if test "$os_release" -ge 506; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:5487: checking for \"-z ignore\" linker flag" >&5 +echo "configure:5491: checking for \"-z ignore\" linker flag" >&5 case "`ld -h 2>&1`" in *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6 ld_switch_site="-z ignore $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;; ＠＠ -5494,7 +5498,7 ＠＠ echo "checking "for specified window system"" 1>&6 -echo "configure:5498: checking "for specified window system"" >&5 +echo "configure:5502: checking "for specified window system"" >&5 GNOME_CONFIG=no ＠＠ -5502,7 +5506,7 ＠＠ if test "$with_gnome" != "no"; then echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6 -echo "configure:5506: checking for GNOME configuration script" >&5 +echo "configure:5510: checking for GNOME configuration script" >&5 for possible in gnome-config do possible_version=`${possible} --version 2> /dev/null` ＠＠ -5533,7 +5537,7 ＠＠ if test "$with_gtk" != "no";then echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6 -echo "configure:5537: checking for GTK configuration script" >&5 +echo "configure:5541: checking for GTK configuration script" >&5 for possible in gtk12-config gtk14-config gtk-config do possible_version=`${possible} --version 2> /dev/null` ＠＠ -5555,18 +5559,18 ＠＠ if test "${GTK_CONFIG}" != "no"; then echo $ac_n "checking gtk version""... $ac_c" 1>&6 -echo "configure:5559: checking gtk version" >&5 +echo "configure:5563: checking gtk version" >&5 GTK_VERSION=`${GTK_CONFIG} --version` echo "$ac_t""${GTK_VERSION}" 1>&6 echo $ac_n "checking gtk libs""... $ac_c" 1>&6 -echo "configure:5564: checking gtk libs" >&5 +echo "configure:5568: checking gtk libs" >&5 GTK_LIBS=`${GTK_CONFIG} --libs` libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi echo "$ac_t""${GTK_LIBS}" 1>&6 echo $ac_n "checking gtk cflags""... $ac_c" 1>&6 -echo "configure:5570: checking gtk cflags" >&5 +echo "configure:5574: checking gtk cflags" >&5 GTK_CFLAGS=`${GTK_CONFIG} --cflags` if test "$GCC" = "yes"; then GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow" ＠＠ -5576,19 +5580,19 ＠＠ echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6 -echo "configure:5580: checking for main in -lgdk_imlib" >&5 +echo "configure:5584: checking for main in -lgdk_imlib" >&5 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdk_imlib " cat > conftest.$ac_ext <<EOF -#line 5585 "configure" +#line 5589 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5610,12 +5614,12 ＠＠ echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6 -echo "configure:5614: checking for Imlib_init in -lImlib" >&5 +echo "configure:5618: checking for Imlib_init in -lImlib" >&5 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'` xe_check_libs=" -lImlib " cat > conftest.$ac_ext <<EOF -#line 5619 "configure" +#line 5623 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -5626,7 +5630,7 ＠＠ Imlib_init() ; return 0; } EOF -if { (eval echo configure:5630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5649,10 +5653,10 ＠＠ for ac_func in gdk_imlib_init do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5653: checking for $ac_func" >&5 +echo "configure:5657: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 5656 "configure" +#line 5660 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -5675,7 +5679,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:5679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -5759,15 +5763,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5763: checking for $ac_hdr" >&5 +echo "configure:5767: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 5766 "configure" +#line 5770 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -5798,19 +5802,19 ＠＠ echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6 -echo "configure:5802: checking for main in -lxml" >&5 +echo "configure:5806: checking for main in -lxml" >&5 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lxml " cat > conftest.$ac_ext <<EOF -#line 5807 "configure" +#line 5811 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5832,19 +5836,19 ＠＠ echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6 -echo "configure:5836: checking for main in -lglade" >&5 +echo "configure:5840: checking for main in -lglade" >&5 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade " cat > conftest.$ac_ext <<EOF -#line 5841 "configure" +#line 5845 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5866,19 +5870,19 ＠＠ echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6 -echo "configure:5870: checking for main in -lglade-gnome" >&5 +echo "configure:5874: checking for main in -lglade-gnome" >&5 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade-gnome " cat > conftest.$ac_ext <<EOF -#line 5875 "configure" +#line 5879 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5899,7 +5903,7 ＠＠ cat > conftest.$ac_ext <<EOF -#line 5903 "configure" +#line 5907 "configure" #include "confdefs.h" #include <glade/glade-xml.h> EOF ＠＠ -5958,7 +5962,7 ＠＠ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5962: checking for X" >&5 +echo "configure:5966: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then ＠＠ -6018,12 +6022,12 ＠＠ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 6022 "configure" +#line 6026 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -6092,14 +6096,14 ＠＠ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 6096 "configure" +#line 6100 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:6103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. ＠＠ -6208,17 +6212,17 ＠＠ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:6212: checking whether -R must be followed by a space" >&5 +echo "configure:6216: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 6215 "configure" +#line 6219 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:6222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else ＠＠ -6234,14 +6238,14 ＠＠ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 6238 "configure" +#line 6242 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:6245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else ＠＠ -6277,12 +6281,12 ＠＠ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:6281: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:6285: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet " cat > conftest.$ac_ext <<EOF -#line 6286 "configure" +#line 6290 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6293,7 +6297,7 ＠＠ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:6297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6317,12 +6321,12 ＠＠ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:6321: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:6325: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet_stub " cat > conftest.$ac_ext <<EOF -#line 6326 "configure" +#line 6330 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6333,7 +6337,7 ＠＠ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6362,10 +6366,10 ＠＠ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey(a)clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:6366: checking for gethostbyname" >&5 +echo "configure:6370: checking for gethostbyname" >&5 cat > conftest.$ac_ext <<EOF -#line 6369 "configure" +#line 6373 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ ＠＠ -6388,7 +6392,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else ＠＠ -6409,12 +6413,12 ＠＠ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6413: checking for gethostbyname in -lnsl" >&5 +echo "configure:6417: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` xe_check_libs=" -lnsl " cat > conftest.$ac_ext <<EOF -#line 6418 "configure" +#line 6422 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6425,7 +6429,7 ＠＠ gethostbyname() ; return 0; } EOF -if { (eval echo configure:6429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6455,10 +6459,10 ＠＠ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:6459: checking for connect" >&5 +echo "configure:6463: checking for connect" >&5 cat > conftest.$ac_ext <<EOF -#line 6462 "configure" +#line 6466 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ ＠＠ -6481,7 +6485,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else ＠＠ -6504,12 +6508,12 ＠＠ xe_msg_checking="for connect in -lsocket" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6508: checking "$xe_msg_checking"" >&5 +echo "configure:6512: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocket $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 6513 "configure" +#line 6517 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6520,7 +6524,7 ＠＠ connect() ; return 0; } EOF -if { (eval echo configure:6524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6544,10 +6548,10 ＠＠ # gomez(a)mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:6548: checking for remove" >&5 +echo "configure:6552: checking for remove" >&5 cat > conftest.$ac_ext <<EOF -#line 6551 "configure" +#line 6555 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ ＠＠ -6570,7 +6574,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else ＠＠ -6591,12 +6595,12 ＠＠ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:6595: checking for remove in -lposix" >&5 +echo "configure:6599: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` xe_check_libs=" -lposix " cat > conftest.$ac_ext <<EOF -#line 6600 "configure" +#line 6604 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6607,7 +6611,7 ＠＠ remove() ; return 0; } EOF -if { (eval echo configure:6611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6631,10 +6635,10 ＠＠ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:6635: checking for shmat" >&5 +echo "configure:6639: checking for shmat" >&5 cat > conftest.$ac_ext <<EOF -#line 6638 "configure" +#line 6642 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ ＠＠ -6657,7 +6661,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else ＠＠ -6678,12 +6682,12 ＠＠ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:6682: checking for shmat in -lipc" >&5 +echo "configure:6686: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` xe_check_libs=" -lipc " cat > conftest.$ac_ext <<EOF -#line 6687 "configure" +#line 6691 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6694,7 +6698,7 ＠＠ shmat() ; return 0; } EOF -if { (eval echo configure:6698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6730,12 +6734,12 ＠＠ xe_msg_checking="for IceConnectionNumber in -lICE" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6734: checking "$xe_msg_checking"" >&5 +echo "configure:6738: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` xe_check_libs=" -lICE $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 6739 "configure" +#line 6743 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6746,7 +6750,7 ＠＠ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:6750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6792,15 +6796,15 ＠＠ ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:6796: checking for Xm/Xm.h" >&5 +echo "configure:6800: checking for Xm/Xm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6799 "configure" +#line 6803 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -6817,12 +6821,12 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:6821: checking for XmStringFree in -lXm" >&5 +echo "configure:6825: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 6826 "configure" +#line 6830 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6833,7 +6837,7 ＠＠ XmStringFree() ; return 0; } EOF -if { (eval echo configure:6837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6985,7 +6989,7 ＠＠ echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:6989: checking for X defines extracted by xmkmf" >&5 +echo "configure:6993: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir ＠＠ -7034,15 +7038,15 ＠＠ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:7038: checking for X11/Intrinsic.h" >&5 +echo "configure:7042: checking for X11/Intrinsic.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7041 "configure" +#line 7045 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7066,12 +7070,12 ＠＠ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:7070: checking for XOpenDisplay in -lX11" >&5 +echo "configure:7074: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 7075 "configure" +#line 7079 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7082,7 +7086,7 ＠＠ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:7086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7107,12 +7111,12 ＠＠ xe_msg_checking="for XGetFontProperty in -lX11" test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7111: checking "$xe_msg_checking"" >&5 +echo "configure:7115: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 -b i486-linuxaout" cat > conftest.$ac_ext <<EOF -#line 7116 "configure" +#line 7120 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7123,7 +7127,7 ＠＠ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:7127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7150,12 +7154,12 ＠＠ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:7154: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:7158: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` xe_check_libs=" -lXext " cat > conftest.$ac_ext <<EOF -#line 7159 "configure" +#line 7163 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7166,7 +7170,7 ＠＠ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:7170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7189,12 +7193,12 ＠＠ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:7193: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:7197: checking for XtOpenDisplay in -lXt" >&5 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lXt " cat > conftest.$ac_ext <<EOF -#line 7198 "configure" +#line 7202 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7205,7 +7209,7 ＠＠ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:7209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7228,14 +7232,14 ＠＠ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:7232: checking the version of X11 being used" >&5 +echo "configure:7236: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 7234 "configure" +#line 7238 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:7239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest foobar; x11_release=$? else ＠＠ -7263,13 +7267,13 ＠＠ esac fi - for ac_func in XConvertCase + for ac_func in XConvertCase XtRegisterDrawable do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7270: checking for $ac_func" >&5 +echo "configure:7274: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 7273 "configure" +#line 7277 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -7292,7 +7296,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:7296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -7324,15 +7328,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7328: checking for $ac_hdr" >&5 +echo "configure:7332: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 7331 "configure" +#line 7335 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7365,10 +7369,10 ＠＠ for ac_func in XRegisterIMInstantiateCallback do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7369: checking for $ac_func" >&5 +echo "configure:7373: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 7372 "configure" +#line 7376 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -7391,7 +7395,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:7395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -7419,9 +7423,9 ＠＠ done echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6 -echo "configure:7423: checking for standard XRegisterIMInstantiateCallback prototype" >&5 +echo "configure:7427: checking for standard XRegisterIMInstantiateCallback prototype" >&5 cat > conftest.$ac_ext <<EOF -#line 7425 "configure" +#line 7429 "configure" #include "confdefs.h" #define NeedFunctionPrototypes 1 ＠＠ -7433,7 +7437,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:7437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else ＠＠ rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7558,22 +7562,22 ＠＠ fi if test "$with_msw" != "no"; then echo "checking for MS-Windows" 1>&6 -echo "configure:7562: checking for MS-Windows" >&5 +echo "configure:7566: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:7565: checking for main in -lgdi32" >&5 +echo "configure:7569: checking for main in -lgdi32" >&5 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdi32 " cat > conftest.$ac_ext <<EOF -#line 7570 "configure" +#line 7574 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7624,12 +7628,12 ＠＠ test "$with_widgets" != "no" && with_widgets=msw fi cat > conftest.$ac_ext <<EOF -#line 7628 "configure" +#line 7632 "configure" #include "confdefs.h" #include <fcntl.h> int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:7633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MSG_SELECT ＠＠ -7690,15 +7694,15 ＠＠ if test "$with_x11" = "yes"; then ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6 -echo "configure:7694: checking for X11/extensions/shape.h" >&5 +echo "configure:7698: checking for X11/extensions/shape.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7697 "configure" +#line 7701 "configure" #include "confdefs.h" #include <X11/extensions/shape.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7748,7 +7752,7 ＠＠ esac echo "checking for WM_COMMAND option" 1>&6 -echo "configure:7752: checking for WM_COMMAND option" >&5; +echo "configure:7756: checking for WM_COMMAND option" >&5; if test "$with_wmcommand" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_WMCOMMAND ＠＠ -7763,15 +7767,15 ＠＠ test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6 -echo "configure:7767: checking for X11/Xauth.h" >&5 +echo "configure:7771: checking for X11/Xauth.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7770 "configure" +#line 7774 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7794,12 +7798,12 ＠＠ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:7798: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:7802: checking for XauGetAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'` xe_check_libs=" -lXau " cat > conftest.$ac_ext <<EOF -#line 7803 "configure" +#line 7807 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7810,7 +7814,7 ＠＠ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:7814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7861,7 +7865,7 ＠＠ if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:7865: checking for module support" >&5 +echo "configure:7869: checking for module support" >&5 case "$opsys" in mingw* | cygwin* ) have_dl=yes ;; ＠＠ -7878,15 +7882,15 ＠＠ * ) ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:7882: checking for dlfcn.h" >&5 +echo "configure:7886: checking for dlfcn.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7885 "configure" +#line 7889 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7903,16 +7907,16 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:7907: checking for dlopen in -lc" >&5 +echo "configure:7911: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 7909 "configure" +#line 7913 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -7921,18 +7925,18 ＠＠ rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7925: checking for dlopen in -ldl" >&5 +echo "configure:7929: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="$LIBS -ldl" cat > conftest.$ac_ext <<EOF -#line 7929 "configure" +#line 7933 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -7941,17 +7945,17 ＠＠ rm -rf conftest* echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:7945: checking for dlopen in -lsvld" >&5 +echo "configure:7949: checking for dlopen in -lsvld" >&5 LIBS="$ac_save_LIBS -lsvld" cat > conftest.$ac_ext <<EOF -#line 7948 "configure" +#line 7952 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -7981,15 +7985,15 ＠＠ else ac_safe=`echo "dl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dl.h""... $ac_c" 1>&6 -echo "configure:7985: checking for dl.h" >&5 +echo "configure:7989: checking for dl.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7988 "configure" +#line 7992 "configure" #include "confdefs.h" #include <dl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8006,16 +8010,16 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for shl_load in -lc""... $ac_c" 1>&6 -echo "configure:8010: checking for shl_load in -lc" >&5 +echo "configure:8014: checking for shl_load in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 8012 "configure" +#line 8016 "configure" #include "confdefs.h" #include <dl.h> int main() { shl_load ("", 0, 0); ; return 0; } EOF -if { (eval echo configure:8019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -8024,18 +8028,18 ＠＠ rm -rf conftest* echo $ac_n "checking for shl_load in -ldl""... $ac_c" 1>&6 -echo "configure:8028: checking for shl_load in -ldl" >&5 +echo "configure:8032: checking for shl_load in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="$LIBS -ldld" cat > conftest.$ac_ext <<EOF -#line 8032 "configure" +#line 8036 "configure" #include "confdefs.h" #include <dl.h> int main() { shl_load ("", 0, 0); ; return 0; } EOF -if { (eval echo configure:8039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -8063,15 +8067,15 ＠＠ else ac_safe=`echo "ltdl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ltdl.h""... $ac_c" 1>&6 -echo "configure:8067: checking for ltdl.h" >&5 +echo "configure:8071: checking for ltdl.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8070 "configure" +#line 8074 "configure" #include "confdefs.h" #include <ltdl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8088,18 +8092,18 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6 -echo "configure:8092: checking for lt_dlinit in -lltdl" >&5 +echo "configure:8096: checking for lt_dlinit in -lltdl" >&5 ac_save_LIBS="$LIBS" LIBS="$LIBS -lltdl" cat > conftest.$ac_ext <<EOF -#line 8096 "configure" +#line 8100 "configure" #include "confdefs.h" #include <ltdl.h> int main() { lt_dlinit (); ; return 0; } EOF -if { (eval echo configure:8103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -8140,7 +8144,7 ＠＠ xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:8144: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:8148: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; ＠＠ -8168,9 +8172,9 ＠＠ XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:8172: checking checking whether we are using GNU C" >&5 +echo "configure:8176: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <<EOF -#line 8174 "configure" +#line 8178 "configure" #include "confdefs.h" #ifdef __GNUC__ ＠＠ -8192,7 +8196,7 ＠＠ fi echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6 -echo "configure:8196: checking how to produce PIC code" >&5 +echo "configure:8200: checking how to produce PIC code" >&5 wl= can_build_shared=yes ＠＠ -8296,18 +8300,18 ＠＠ # Check to make sure the dll_cflags actually works. echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6 -echo "configure:8300: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:8304: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <<EOF -#line 8304 "configure" +#line 8308 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:8311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also ＠＠ -8338,7 +8342,7 ＠＠ xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:8342: checking if C compiler can produce shared libraries" >&5 +echo "configure:8346: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes -o "$__ICC" = yes; then case "$xehost_os" in *darwin*) ＠＠ -8397,14 +8401,14 ＠＠ xe_libs= ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' cat > conftest.$ac_ext <<EOF -#line 8401 "configure" +#line 8405 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:8408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else ＠＠ -8429,7 +8433,7 ＠＠ if test "$XEGCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:8433: checking for ld used by GCC" >&5 +echo "configure:8437: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. ＠＠ -8455,7 +8459,7 ＠＠ esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:8459: checking for GNU ld" >&5 +echo "configure:8463: checking for GNU ld" >&5 fi if test -z "$LTLD"; then ＠＠ -8493,7 +8497,7 ＠＠ # Check to see if it really is or isn't GNU ld. echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6 -echo "configure:8497: checking if the linker is GNU ld" >&5 +echo "configure:8501: checking if the linker is GNU ld" >&5 # I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then xe_gnu_ld=yes ＠＠ -8528,7 +8532,7 ＠＠ # OK - only NOW do we futz about with ld. # See if the linker supports building shared libraries. echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6 -echo "configure:8532: checking whether the linker supports shared libraries" >&5 +echo "configure:8536: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes ＠＠ -8741,10 +8745,10 ＠＠ for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8745: checking for $ac_func" >&5 +echo "configure:8749: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 8748 "configure" +#line 8752 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -8767,7 +8771,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:8771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -8831,15 +8835,15 ＠＠ for dir in "" "Tt/" "desktop/" ; do ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6 -echo "configure:8835: checking for ${dir}tt_c.h" >&5 +echo "configure:8839: checking for ${dir}tt_c.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8838 "configure" +#line 8842 "configure" #include "confdefs.h" #include <${dir}tt_c.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8875,12 +8879,12 ＠＠ xe_msg_checking="for tt_message_create in -ltt" test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:8879: checking "$xe_msg_checking"" >&5 +echo "configure:8883: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'` xe_check_libs=" -ltt $extra_libs" cat > conftest.$ac_ext <<EOF -#line 8884 "configure" +#line 8888 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8891,7 +8895,7 ＠＠ tt_message_create() ; return 0; } EOF -if { (eval echo configure:8895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8945,15 +8949,15 ＠＠ test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6 -echo "configure:8949: checking for Dt/Dt.h" >&5 +echo "configure:8953: checking for Dt/Dt.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8952 "configure" +#line 8956 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8976,12 +8980,12 ＠＠ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:8980: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:8984: checking for DtDndDragStart in -lDtSvc" >&5 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lDtSvc " cat > conftest.$ac_ext <<EOF -#line 8985 "configure" +#line 8989 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8992,7 +8996,7 ＠＠ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:8996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9073,7 +9077,7 ＠＠ if test "$with_dragndrop" != "no" ; then echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:9077: checking if drag and drop API is needed" >&5 +echo "configure:9081: checking if drag and drop API is needed" >&5 if test -n "$dragndrop_proto" ; then with_dragndrop=yes echo "$ac_t""yes (${dragndrop_proto} )" 1>&6 ＠＠ -9093,19 +9097,19 ＠＠ fi echo "checking for LDAP" 1>&6 -echo "configure:9097: checking for LDAP" >&5 +echo "configure:9101: checking for LDAP" >&5 ldap_libs= test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ldap.h""... $ac_c" 1>&6 -echo "configure:9101: checking for ldap.h" >&5 +echo "configure:9105: checking for ldap.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9104 "configure" +#line 9108 "configure" #include "confdefs.h" #include <ldap.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9128,15 +9132,15 ＠＠ } test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for lber.h""... $ac_c" 1>&6 -echo "configure:9132: checking for lber.h" >&5 +echo "configure:9136: checking for lber.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9135 "configure" +#line 9139 "configure" #include "confdefs.h" #include <lber.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9160,12 +9164,12 ＠＠ if test "$with_ldap" != "no"; then echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:9164: checking for ldap_search in -lldap" >&5 +echo "configure:9168: checking for ldap_search in -lldap" >&5 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap " cat > conftest.$ac_ext <<EOF -#line 9169 "configure" +#line 9173 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9176,7 +9180,7 ＠＠ ldap_search() ; return 0; } EOF -if { (eval echo configure:9180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9200,12 +9204,12 ＠＠ xe_msg_checking="for ldap_open in -lldap" test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:9204: checking "$xe_msg_checking"" >&5 +echo "configure:9208: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber" cat > conftest.$ac_ext <<EOF -#line 9209 "configure" +#line 9213 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9216,7 +9220,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:9220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9240,12 +9244,12 ＠＠ xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:9244: checking "$xe_msg_checking"" >&5 +echo "configure:9248: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb" cat > conftest.$ac_ext <<EOF -#line 9249 "configure" +#line 9253 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9256,7 +9260,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:9260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9280,12 +9284,12 ＠＠ xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:9284: checking "$xe_msg_checking"" >&5 +echo "configure:9288: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb -ldes" cat > conftest.$ac_ext <<EOF -#line 9289 "configure" +#line 9293 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9296,7 +9300,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:9300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9318,12 +9322,12 ＠＠ } test "$with_ldap_lber" != "yes" && { echo $ac_n "checking for ber_pvt_opt_on in -llber""... $ac_c" 1>&6 -echo "configure:9322: checking for ber_pvt_opt_on in -llber" >&5 +echo "configure:9326: checking for ber_pvt_opt_on in -llber" >&5 ac_lib_var=`echo lber'_'ber_pvt_opt_on | sed 'y%./+-%__p_%'` xe_check_libs=" -llber " cat > conftest.$ac_ext <<EOF -#line 9327 "configure" +#line 9331 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9334,7 +9338,7 ＠＠ ber_pvt_opt_on() ; return 0; } EOF -if { (eval echo configure:9338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9378,10 +9382,10 ＠＠ for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9382: checking for $ac_func" >&5 +echo "configure:9386: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 9385 "configure" +#line 9389 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -9404,7 +9408,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:9408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -9443,20 +9447,20 ＠＠ postgresql_libs= if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:9447: checking for PostgreSQL" >&5 +echo "configure:9451: checking for PostgreSQL" >&5 for header_dir in "" "pgsql/" "postgresql/"; do ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6 -echo "configure:9452: checking for ${header_dir}libpq-fe.h" >&5 +echo "configure:9456: checking for ${header_dir}libpq-fe.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9455 "configure" +#line 9459 "configure" #include "confdefs.h" #include <${header_dir}libpq-fe.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9480,12 +9484,12 ＠＠ test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:9484: checking for PQconnectdb in -lpq" >&5 +echo "configure:9488: checking for PQconnectdb in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 9489 "configure" +#line 9493 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9496,7 +9500,7 ＠＠ PQconnectdb() ; return 0; } EOF -if { (eval echo configure:9500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9529,12 +9533,12 ＠＠ echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:9533: checking for PQconnectStart in -lpq" >&5 +echo "configure:9537: checking for PQconnectStart in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 9538 "configure" +#line 9542 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9545,7 +9549,7 ＠＠ PQconnectStart() ; return 0; } EOF -if { (eval echo configure:9549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9596,7 +9600,7 ＠＠ if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:9600: checking for graphics libraries" >&5 +echo "configure:9604: checking for graphics libraries" >&5 libpath_xpm= incpath_xpm= ＠＠ -9622,10 +9626,10 ＠＠ CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:9626: checking for Xpm - no older than 3.4f" >&5 +echo "configure:9630: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 9629 "configure" +#line 9633 "configure" #include "confdefs.h" #define XPM_NUMBERS #include <X11/xpm.h> ＠＠ -9634,7 +9638,7 ＠＠ XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:9638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; xpm_status=$?; if test "$xpm_status" = "0"; then ＠＠ -9678,17 +9682,17 ＠＠ libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6 -echo "configure:9682: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:9686: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 9685 "configure" +#line 9689 "configure" #include "confdefs.h" int main() { XpmCreatePixmapFromData() ; return 0; } EOF -if { (eval echo configure:9692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else ＠＠ -9714,15 +9718,15 ＠＠ test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:9718: checking for compface.h" >&5 +echo "configure:9722: checking for compface.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9721 "configure" +#line 9725 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9745,12 +9749,12 ＠＠ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9749: checking for UnGenFace in -lcompface" >&5 +echo "configure:9753: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 9754 "configure" +#line 9758 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9761,7 +9765,7 ＠＠ UnGenFace() ; return 0; } EOF -if { (eval echo configure:9765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9810,12 +9814,12 ＠＠ if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:9814: checking for inflate in -lc" >&5 +echo "configure:9818: checking for inflate in -lc" >&5 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <<EOF -#line 9819 "configure" +#line 9823 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9826,7 +9830,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:9830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9845,12 +9849,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:9849: checking for inflate in -lz" >&5 +echo "configure:9853: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lz " cat > conftest.$ac_ext <<EOF -#line 9854 "configure" +#line 9858 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9861,7 +9865,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:9865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9880,12 +9884,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:9884: checking for inflate in -lgz" >&5 +echo "configure:9888: checking for inflate in -lgz" >&5 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lgz " cat > conftest.$ac_ext <<EOF -#line 9889 "configure" +#line 9893 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9896,7 +9900,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:9900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9926,15 +9930,15 ＠＠ test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:9930: checking for jpeglib.h" >&5 +echo "configure:9934: checking for jpeglib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9933 "configure" +#line 9937 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9957,12 +9961,12 ＠＠ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:9961: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:9965: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` xe_check_libs=" -ljpeg " cat > conftest.$ac_ext <<EOF -#line 9966 "configure" +#line 9970 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9973,7 +9977,7 ＠＠ jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:9977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10009,10 +10013,10 ＠＠ png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:10013: checking for pow" >&5 +echo "configure:10017: checking for pow" >&5 cat > conftest.$ac_ext <<EOF -#line 10016 "configure" +#line 10020 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ ＠＠ -10035,7 +10039,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:10039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pow=yes" else ＠＠ -10056,15 +10060,15 ＠＠ } test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:10060: checking for png.h" >&5 +echo "configure:10064: checking for png.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10063 "configure" +#line 10067 "configure" #include "confdefs.h" #include <png.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10087,12 +10091,12 ＠＠ } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:10091: checking for png_read_image in -lpng" >&5 +echo "configure:10095: checking for png_read_image in -lpng" >&5 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'` xe_check_libs=" -lpng " cat > conftest.$ac_ext <<EOF -#line 10096 "configure" +#line 10100 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10103,7 +10107,7 ＠＠ png_read_image() ; return 0; } EOF -if { (eval echo configure:10107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10126,10 +10130,10 ＠＠ } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:10130: checking for workable png version information" >&5 +echo "configure:10134: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext <<EOF -#line 10133 "configure" +#line 10137 "configure" #include "confdefs.h" #include <png.h> int main(int c, char **v) { ＠＠ -10137,7 +10141,7 ＠＠ if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;} EOF -if { (eval echo configure:10141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:10145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; png_status=$?; if test "$png_status" = "0"; then ＠＠ -10180,15 +10184,15 ＠＠ test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:10184: checking for tiffio.h" >&5 +echo "configure:10188: checking for tiffio.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10187 "configure" +#line 10191 "configure" #include "confdefs.h" #include <tiffio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10211,12 +10215,12 ＠＠ } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:10215: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:10219: checking for TIFFClientOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'` xe_check_libs=" -ltiff " cat > conftest.$ac_ext <<EOF -#line 10220 "configure" +#line 10224 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10227,7 +10231,7 ＠＠ TIFFClientOpen() ; return 0; } EOF -if { (eval echo configure:10231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10266,15 +10270,15 ＠＠ if test "$with_gtk" = "yes"; then test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:10270: checking for compface.h" >&5 +echo "configure:10274: checking for compface.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10273 "configure" +#line 10277 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10297,12 +10301,12 ＠＠ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:10301: checking for UnGenFace in -lcompface" >&5 +echo "configure:10305: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 10306 "configure" +#line 10310 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10313,7 +10317,7 ＠＠ UnGenFace() ; return 0; } EOF -if { (eval echo configure:10317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10352,7 +10356,7 ＠＠ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:10356: checking for X11 graphics libraries" >&5 +echo "configure:10360: checking for X11 graphics libraries" >&5 fi case "$with_widgets" in ＠＠ -10362,7 +10366,7 ＠＠ if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then echo "checking for the Athena widgets" 1>&6 -echo "configure:10366: checking for the Athena widgets" >&5 +echo "configure:10370: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; ＠＠ -10376,12 +10380,12 ＠＠ if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10380: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:10384: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 10385 "configure" +#line 10389 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10392,7 +10396,7 ＠＠ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:10396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10408,12 +10412,12 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10412: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:10416: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 10417 "configure" +#line 10421 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10424,7 +10428,7 ＠＠ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:10428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10455,12 +10459,12 ＠＠ else echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10459: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:10463: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 10464 "configure" +#line 10468 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10471,7 +10475,7 ＠＠ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:10475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10489,12 +10493,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6 -echo "configure:10493: checking for threeDClassRec in -lXaw" >&5 +echo "configure:10497: checking for threeDClassRec in -lXaw" >&5 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <<EOF -#line 10498 "configure" +#line 10502 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10505,7 +10509,7 ＠＠ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:10509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10536,15 +10540,15 ＠＠ if test "$athena_3d" = "no"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10540: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:10544: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10543 "configure" +#line 10547 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10564,15 +10568,15 ＠＠ echo "$ac_t""no" 1>&6 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6 -echo "configure:10568: checking for X11/Xaw/XawInit.h" >&5 +echo "configure:10572: checking for X11/Xaw/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10571 "configure" +#line 10575 "configure" #include "confdefs.h" #include <X11/Xaw/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10598,15 +10602,15 ＠＠ else ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:10602: checking for X11/$athena_variant/XawInit.h" >&5 +echo "configure:10606: checking for X11/$athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10605 "configure" +#line 10609 "configure" #include "confdefs.h" #include <X11/$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10623,15 +10627,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10627: checking for X11/$athena_variant/ThreeD.h" >&5 +echo "configure:10631: checking for X11/$athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10630 "configure" +#line 10634 "configure" #include "confdefs.h" #include <X11/$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10659,15 +10663,15 ＠＠ if test -z "$athena_h_path"; then ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:10663: checking for $athena_variant/XawInit.h" >&5 +echo "configure:10667: checking for $athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10666 "configure" +#line 10670 "configure" #include "confdefs.h" #include <$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10684,15 +10688,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10688: checking for $athena_variant/ThreeD.h" >&5 +echo "configure:10692: checking for $athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10691 "configure" +#line 10695 "configure" #include "confdefs.h" #include <$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10721,15 +10725,15 ＠＠ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:10725: checking for X11/Xaw3d/XawInit.h" >&5 +echo "configure:10729: checking for X11/Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10728 "configure" +#line 10732 "configure" #include "confdefs.h" #include <X11/Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10746,15 +10750,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10750: checking for X11/Xaw3d/ThreeD.h" >&5 +echo "configure:10754: checking for X11/Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10753 "configure" +#line 10757 "configure" #include "confdefs.h" #include <X11/Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10786,15 +10790,15 ＠＠ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:10790: checking for Xaw3d/XawInit.h" >&5 +echo "configure:10794: checking for Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10793 "configure" +#line 10797 "configure" #include "confdefs.h" #include <Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10811,15 +10815,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10815: checking for Xaw3d/ThreeD.h" >&5 +echo "configure:10819: checking for Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10818 "configure" +#line 10822 "configure" #include "confdefs.h" #include <Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10851,15 +10855,15 ＠＠ if test -z "$athena_h_path"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10855: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:10859: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10858 "configure" +#line 10862 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10898,15 +10902,15 ＠＠ if test "$with_x11" = "yes"; then ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:10902: checking for Xm/Xm.h" >&5 +echo "configure:10906: checking for Xm/Xm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10905 "configure" +#line 10909 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10923,12 +10927,12 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:10927: checking for XmStringFree in -lXm" >&5 +echo "configure:10931: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 10932 "configure" +#line 10936 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10939,7 +10943,7 ＠＠ XmStringFree() ; return 0; } EOF -if { (eval echo configure:10943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10968,9 +10972,9 ＠＠ if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:10972: checking for Lesstif" >&5 +echo "configure:10976: checking for Lesstif" >&5 cat > conftest.$ac_ext <<EOF -#line 10974 "configure" +#line 10978 "configure" #include "confdefs.h" #include <Xm/Xm.h> #ifdef LESSTIF_VERSION ＠＠ -11343,7 +11347,7 ＠＠ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:11347: checking for Mule-related features" >&5 +echo "configure:11351: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF ＠＠ -11357,15 +11361,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11361: checking for $ac_hdr" >&5 +echo "configure:11365: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 11364 "configure" +#line 11368 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11396,12 +11400,12 ＠＠ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:11400: checking for strerror in -lintl" >&5 +echo "configure:11404: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <<EOF -#line 11405 "configure" +#line 11409 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11412,7 +11416,7 ＠＠ strerror() ; return 0; } EOF -if { (eval echo configure:11416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11445,18 +11449,18 ＠＠ echo "checking for Mule input methods" 1>&6 -echo "configure:11449: checking for Mule input methods" >&5 +echo "configure:11453: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:11452: checking for XIM" >&5 +echo "configure:11456: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:11455: checking for XOpenIM in -lX11" >&5 +echo "configure:11459: checking for XOpenIM in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 11460 "configure" +#line 11464 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11467,7 +11471,7 ＠＠ XOpenIM() ; return 0; } EOF -if { (eval echo configure:11471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11491,12 +11495,12 ＠＠ if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:11495: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:11499: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 11500 "configure" +#line 11504 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11507,7 +11511,7 ＠＠ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:11511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11572,15 +11576,15 ＠＠ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:11576: checking for XFontSet" >&5 +echo "configure:11580: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:11579: checking for XmbDrawString in -lX11" >&5 +echo "configure:11583: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 11584 "configure" +#line 11588 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11591,7 +11595,7 ＠＠ XmbDrawString() ; return 0; } EOF -if { (eval echo configure:11595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11631,15 +11635,15 ＠＠ test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 -echo "configure:11635: checking for wnn/jllib.h" >&5 +echo "configure:11639: checking for wnn/jllib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 11638 "configure" +#line 11642 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11662,15 +11666,15 ＠＠ } test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6 -echo "configure:11666: checking for wnn/commonhd.h" >&5 +echo "configure:11670: checking for wnn/commonhd.h" >&5 cat > conftest.$ac_ext <<EOF -#line 11669 "configure" +#line 11673 "configure" #include "confdefs.h" #include <wnn/commonhd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11695,10 +11699,10 ＠＠ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11699: checking for $ac_func" >&5 +echo "configure:11703: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 11702 "configure" +#line 11706 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11721,7 +11725,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:11725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -11750,12 +11754,12 ＠＠ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:11754: checking for crypt in -lcrypt" >&5 +echo "configure:11758: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <<EOF -#line 11759 "configure" +#line 11763 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11766,7 +11770,7 ＠＠ crypt() ; return 0; } EOF -if { (eval echo configure:11770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11801,12 +11805,12 ＠＠ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:11805: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:11809: checking for jl_dic_list_e in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <<EOF -#line 11810 "configure" +#line 11814 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11817,7 +11821,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11835,12 +11839,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:11839: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:11843: checking for jl_dic_list_e in -lwnn4" >&5 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn4 " cat > conftest.$ac_ext <<EOF -#line 11844 "configure" +#line 11848 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11851,7 +11855,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11869,12 +11873,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:11873: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:11877: checking for jl_dic_list_e in -lwnn6" >&5 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6 " cat > conftest.$ac_ext <<EOF -#line 11878 "configure" +#line 11882 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11885,7 +11889,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11903,12 +11907,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:11907: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:11911: checking for dic_list_e in -lwnn6_fromsrc" >&5 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6_fromsrc " cat > conftest.$ac_ext <<EOF -#line 11912 "configure" +#line 11916 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11919,7 +11923,7 ＠＠ dic_list_e() ; return 0; } EOF -if { (eval echo configure:11923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11964,12 +11968,12 ＠＠ if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:11968: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:11972: checking for jl_fi_dic_list in -l$libwnn" >&5 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -l$libwnn " cat > conftest.$ac_ext <<EOF -#line 11973 "configure" +#line 11977 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11980,7 +11984,7 ＠＠ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:11984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -12015,15 +12019,15 ＠＠ if test "$with_canna" != "no"; then ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:12019: checking for canna/jrkanji.h" >&5 +echo "configure:12023: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12022 "configure" +#line 12026 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12050,15 +12054,15 ＠＠ c_switch_site="$c_switch_site -I/usr/local/canna/include" ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:12054: checking for canna/jrkanji.h" >&5 +echo "configure:12058: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12057 "configure" +#line 12061 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12086,15 +12090,15 ＠＠ test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:12090: checking for canna/RK.h" >&5 +echo "configure:12094: checking for canna/RK.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12093 "configure" +#line 12097 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12117,12 +12121,12 ＠＠ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:12121: checking for RkBgnBun in -lRKC" >&5 +echo "configure:12125: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <<EOF -#line 12126 "configure" +#line 12130 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -12133,7 +12137,7 ＠＠ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:12137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -12156,12 +12160,12 ＠＠ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:12160: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:12164: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <<EOF -#line 12165 "configure" +#line 12169 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -12172,7 +12176,7 ＠＠ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:12176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -12218,12 +12222,12 ＠＠ libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:12222: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:12226: checking for layout_object_getvalue in -li18n" >&5 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'` xe_check_libs=" -li18n " cat > conftest.$ac_ext <<EOF -#line 12227 "configure" +#line 12231 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -12234,7 +12238,7 ＠＠ layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:12238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -12321,10 +12325,10 ＠＠ for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12325: checking for $ac_func" >&5 +echo "configure:12329: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12328 "configure" +#line 12332 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12347,7 +12351,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -12388,10 +12392,10 ＠＠ for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12392: checking for $ac_func" >&5 +echo "configure:12396: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12395 "configure" +#line 12399 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12414,7 +12418,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -12443,10 +12447,10 ＠＠ echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:12447: checking for openpty" >&5 +echo "configure:12451: checking for openpty" >&5 cat > conftest.$ac_ext <<EOF -#line 12450 "configure" +#line 12454 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char openpty(); below. */ ＠＠ -12469,7 +12473,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_openpty=yes" else ＠＠ -12488,12 +12492,12 ＠＠ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:12492: checking for openpty in -lutil" >&5 +echo "configure:12496: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` xe_check_libs=" -lutil " cat > conftest.$ac_ext <<EOF -#line 12497 "configure" +#line 12501 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -12504,7 +12508,7 ＠＠ openpty() ; return 0; } EOF -if { (eval echo configure:12508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -12539,15 +12543,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12543: checking for $ac_hdr" >&5 +echo "configure:12547: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12546 "configure" +#line 12550 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12584,15 +12588,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12588: checking for $ac_hdr" >&5 +echo "configure:12592: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12591 "configure" +#line 12595 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12625,15 +12629,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12629: checking for $ac_hdr" >&5 +echo "configure:12633: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12632 "configure" +#line 12636 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12666,15 +12670,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12670: checking for $ac_hdr" >&5 +echo "configure:12674: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12673 "configure" +#line 12677 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12710,15 +12714,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12714: checking for $ac_hdr" >&5 +echo "configure:12718: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12717 "configure" +#line 12721 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12751,10 +12755,10 ＠＠ for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12755: checking for $ac_func" >&5 +echo "configure:12759: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12758 "configure" +#line 12762 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12777,7 +12781,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -12808,15 +12812,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12812: checking for $ac_hdr" >&5 +echo "configure:12816: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12815 "configure" +#line 12819 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12849,10 +12853,10 ＠＠ for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12853: checking for $ac_func" >&5 +echo "configure:12857: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12856 "configure" +#line 12860 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12875,7 +12879,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -12908,15 +12912,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12912: checking for $ac_hdr" >&5 +echo "configure:12916: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12915 "configure" +#line 12919 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12952,12 +12956,12 ＠＠ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:12956: checking for kstat_open in -lkstat" >&5 +echo "configure:12960: checking for kstat_open in -lkstat" >&5 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lkstat " cat > conftest.$ac_ext <<EOF -#line 12961 "configure" +#line 12965 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -12968,7 +12972,7 ＠＠ kstat_open() ; return 0; } EOF -if { (eval echo configure:12972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -13003,15 +13007,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13007: checking for $ac_hdr" >&5 +echo "configure:13011: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 13010 "configure" +#line 13014 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13043,12 +13047,12 ＠＠ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:13047: checking for kvm_read in -lkvm" >&5 +echo "configure:13051: checking for kvm_read in -lkvm" >&5 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` xe_check_libs=" -lkvm " cat > conftest.$ac_ext <<EOF -#line 13052 "configure" +#line 13056 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -13059,7 +13063,7 ＠＠ kvm_read() ; return 0; } EOF -if { (eval echo configure:13063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -13093,16 +13097,16 ＠＠ fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:13097: checking whether netdb declares h_errno" >&5 +echo "configure:13101: checking whether netdb declares h_errno" >&5 cat > conftest.$ac_ext <<EOF -#line 13099 "configure" +#line 13103 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:13106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF ＠＠ -13122,16 +13126,16 ＠＠ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:13126: checking for sigsetjmp" >&5 +echo "configure:13130: checking for sigsetjmp" >&5 cat > conftest.$ac_ext <<EOF -#line 13128 "configure" +#line 13132 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:13135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF ＠＠ -13151,11 +13155,11 ＠＠ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:13155: checking whether localtime caches TZ" >&5 +echo "configure:13159: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 13159 "configure" +#line 13163 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS ＠＠ -13190,7 +13194,7 ＠＠ exit (0); } EOF -if { (eval echo configure:13194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else ＠＠ -13220,9 +13224,9 ＠＠ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:13224: checking whether gettimeofday accepts one or two arguments" >&5 +echo "configure:13228: checking whether gettimeofday accepts one or two arguments" >&5 cat > conftest.$ac_ext <<EOF -#line 13226 "configure" +#line 13230 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME ＠＠ -13243,7 +13247,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""two" 1>&6 else ＠＠ -13265,19 +13269,19 ＠＠ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:13269: checking for inline" >&5 +echo "configure:13273: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 13274 "configure" +#line 13278 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:13281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else ＠＠ -13314,16 +13318,16 ＠＠ fi echo $ac_n "checking for typeof""... $ac_c" 1>&6 -echo "configure:13318: checking for typeof" >&5 +echo "configure:13322: checking for typeof" >&5 cat > conftest.$ac_ext <<EOF -#line 13320 "configure" +#line 13324 "configure" #include "confdefs.h" int main() { int i; __typeof__(i) j; ; return 0; } EOF -if { (eval echo configure:13327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* typeofname="__typeof__" else ＠＠ -13331,14 +13335,14 ＠＠ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 13335 "configure" +#line 13339 "configure" #include "confdefs.h" int main() { int i; typeof(i) j; ; return 0; } EOF -if { (eval echo configure:13342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* typeofname="typeof" else ＠＠ -13367,17 +13371,17 ＠＠ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:13371: checking for working alloca.h" >&5 +echo "configure:13375: checking for working alloca.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13374 "configure" +#line 13378 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:13381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else ＠＠ -13401,10 +13405,10 ＠＠ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:13405: checking for alloca" >&5 +echo "configure:13409: checking for alloca" >&5 cat > conftest.$ac_ext <<EOF -#line 13408 "configure" +#line 13412 "configure" #include "confdefs.h" #ifdef __GNUC__ ＠＠ -13432,7 +13436,7 ＠＠ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:13436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else ＠＠ -13471,10 +13475,10 ＠＠ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:13475: checking whether alloca needs Cray hooks" >&5 +echo "configure:13479: checking whether alloca needs Cray hooks" >&5 cat > conftest.$ac_ext <<EOF -#line 13478 "configure" +#line 13482 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray ＠＠ -13498,10 +13502,10 ＠＠ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13502: checking for $ac_func" >&5 +echo "configure:13506: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 13505 "configure" +#line 13509 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -13524,7 +13528,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -13554,10 +13558,10 ＠＠ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:13558: checking stack direction for C alloca" >&5 +echo "configure:13562: checking stack direction for C alloca" >&5 cat > conftest.$ac_ext <<EOF -#line 13561 "configure" +#line 13565 "configure" #include "confdefs.h" find_stack_direction () { ＠＠ -13576,7 +13580,7 ＠＠ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:13580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else ＠＠ -13605,9 +13609,9 ＠＠ fi echo $ac_n "checking for working alloca in function calls""... $ac_c" 1>&6 -echo "configure:13609: checking for working alloca in function calls" >&5 +echo "configure:13613: checking for working alloca in function calls" >&5 cat > conftest.$ac_ext <<EOF -#line 13611 "configure" +#line 13615 "configure" #include "confdefs.h" #if defined (__CYGWIN__) ＠＠ -13660,7 +13664,7 ＠＠ } EOF -if { (eval echo configure:13664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then working_alloca_in_function_calls=yes else ＠＠ -13683,9 +13687,9 ＠＠ echo $ac_n "checking for working scanf""... $ac_c" 1>&6 -echo "configure:13687: checking for working scanf" >&5 +echo "configure:13691: checking for working scanf" >&5 cat > conftest.$ac_ext <<EOF -#line 13689 "configure" +#line 13693 "configure" #include "confdefs.h" int ＠＠ -13700,7 +13704,7 ＠＠ } EOF -if { (eval echo configure:13704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then working_scanf=yes else ＠＠ -13723,10 +13727,10 ＠＠ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:13727: checking for working strcoll" >&5 +echo "configure:13731: checking for working strcoll" >&5 cat > conftest.$ac_ext <<EOF -#line 13730 "configure" +#line 13734 "configure" #include "confdefs.h" #include <string.h> main () ＠＠ -13736,7 +13740,7 ＠＠ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:13740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else ＠＠ -13764,10 +13768,10 ＠＠ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13768: checking for $ac_func" >&5 +echo "configure:13772: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 13771 "configure" +#line 13775 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -13790,7 +13794,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -13818,10 +13822,10 ＠＠ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:13822: checking whether getpgrp takes no argument" >&5 +echo "configure:13826: checking whether getpgrp takes no argument" >&5 cat > conftest.$ac_ext <<EOF -#line 13825 "configure" +#line 13829 "configure" #include "confdefs.h" /* ＠＠ -13876,7 +13880,7 ＠＠ } EOF -if { (eval echo configure:13880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else ＠＠ -13903,10 +13907,10 ＠＠ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:13907: checking for working mmap" >&5 +echo "configure:13911: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 13910 "configure" +#line 13914 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> ＠＠ -13939,7 +13943,7 ＠＠ return 1; } EOF -if { (eval echo configure:13943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else ＠＠ -13968,9 +13972,9 ＠＠ if test "$rel_alloc $have_mmap" = "default yes"; then if test "$doug_lea_malloc" = "yes"; then echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6 -echo "configure:13972: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:13976: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext <<EOF -#line 13974 "configure" +#line 13978 "configure" #include "confdefs.h" #include <malloc.h> int main() { ＠＠ -13982,7 +13986,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else ＠＠ -14007,15 +14011,15 ＠＠ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:14011: checking for termios.h" >&5 +echo "configure:14015: checking for termios.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14014 "configure" +#line 14018 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14058,15 +14062,15 ＠＠ echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:14062: checking for termio.h" >&5 +echo "configure:14066: checking for termio.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14065 "configure" +#line 14069 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14098,10 +14102,10 ＠＠ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:14102: checking for socket" >&5 +echo "configure:14106: checking for socket" >&5 cat > conftest.$ac_ext <<EOF -#line 14105 "configure" +#line 14109 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ ＠＠ -14124,7 +14128,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else ＠＠ -14139,15 +14143,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:14143: checking for netinet/in.h" >&5 +echo "configure:14147: checking for netinet/in.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14146 "configure" +#line 14150 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14164,15 +14168,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:14168: checking for arpa/inet.h" >&5 +echo "configure:14172: checking for arpa/inet.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14171 "configure" +#line 14175 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14197,9 +14201,9 ＠＠ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:14201: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:14205: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 14203 "configure" +#line 14207 "configure" #include "confdefs.h" #include <sys/types.h> ＠＠ -14210,7 +14214,7 ＠＠ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:14214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN ＠＠ -14228,9 +14232,9 ＠＠ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:14232: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:14236: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext <<EOF -#line 14234 "configure" +#line 14238 "configure" #include "confdefs.h" #include <sys/types.h> ＠＠ -14240,7 +14244,7 ＠＠ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:14244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MULTICAST ＠＠ -14271,10 +14275,10 ＠＠ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:14275: checking for msgget" >&5 +echo "configure:14279: checking for msgget" >&5 cat > conftest.$ac_ext <<EOF -#line 14278 "configure" +#line 14282 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ ＠＠ -14297,7 +14301,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else ＠＠ -14312,15 +14316,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:14316: checking for sys/ipc.h" >&5 +echo "configure:14320: checking for sys/ipc.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14319 "configure" +#line 14323 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14337,15 +14341,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:14341: checking for sys/msg.h" >&5 +echo "configure:14345: checking for sys/msg.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14344 "configure" +#line 14348 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14383,15 +14387,15 ＠＠ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:14387: checking for dirent.h" >&5 +echo "configure:14391: checking for dirent.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14390 "configure" +#line 14394 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14418,15 +14422,15 ＠＠ echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:14422: checking for sys/dir.h" >&5 +echo "configure:14426: checking for sys/dir.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14425 "configure" +#line 14429 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14459,15 +14463,15 ＠＠ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:14463: checking for nlist.h" >&5 +echo "configure:14467: checking for nlist.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14466 "configure" +#line 14470 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14497,22 +14501,22 ＠＠ echo "checking "for sound support"" 1>&6 -echo "configure:14501: checking "for sound support"" >&5 +echo "configure:14505: checking "for sound support"" >&5 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes if test "$with_native_sound" != "no"; then if test -n "$native_sound_lib"; then ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6 -echo "configure:14508: checking for multimedia/audio_device.h" >&5 +echo "configure:14512: checking for multimedia/audio_device.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14511 "configure" +#line 14515 "configure" #include "confdefs.h" #include <multimedia/audio_device.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14568,12 +14572,12 ＠＠ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:14572: checking for ALopenport in -laudio" >&5 +echo "configure:14576: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 14577 "configure" +#line 14581 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14584,7 +14588,7 ＠＠ ALopenport() ; return 0; } EOF -if { (eval echo configure:14588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14615,12 +14619,12 ＠＠ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:14619: checking for AOpenAudio in -lAlib" >&5 +echo "configure:14623: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <<EOF -#line 14624 "configure" +#line 14628 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14631,7 +14635,7 ＠＠ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:14635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14679,15 +14683,15 ＠＠ for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:14683: checking for ${dir}/soundcard.h" >&5 +echo "configure:14687: checking for ${dir}/soundcard.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14686 "configure" +#line 14690 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14729,12 +14733,12 ＠＠ if test "$opsys" = "netbsd" ; then echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6 -echo "configure:14733: checking for _oss_ioctl in -lossaudio" >&5 +echo "configure:14737: checking for _oss_ioctl in -lossaudio" >&5 ac_lib_var=`echo ossaudio'_'_oss_ioctl | sed 'y%./+-%__p_%'` xe_check_libs=" -lossaudio " cat > conftest.$ac_ext <<EOF -#line 14738 "configure" +#line 14742 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14745,7 +14749,7 ＠＠ _oss_ioctl() ; return 0; } EOF -if { (eval echo configure:14749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14784,15 +14788,15 ＠＠ if test "$with_nas_sound" != "no"; then ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6 -echo "configure:14788: checking for audio/audiolib.h" >&5 +echo "configure:14792: checking for audio/audiolib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14791 "configure" +#line 14795 "configure" #include "confdefs.h" #include <audio/audiolib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14810,12 +14814,12 ＠＠ echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:14814: checking for AuOpenServer in -laudio" >&5 +echo "configure:14818: checking for AuOpenServer in -laudio" >&5 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 14819 "configure" +#line 14823 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14826,7 +14830,7 ＠＠ AuOpenServer() ; return 0; } EOF -if { (eval echo configure:14830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14865,7 +14869,7 ＠＠ fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext <<EOF -#line 14869 "configure" +#line 14873 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF ＠＠ -14896,7 +14900,7 ＠＠ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14900: checking for $ac_word" >&5 +echo "configure:14904: checking for $ac_word" >&5 if test -n "$have_esd_config"; then ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test. ＠＠ -14925,10 +14929,10 ＠＠ c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6 -echo "configure:14929: checking for esd_play_stream" >&5 +echo "configure:14933: checking for esd_play_stream" >&5 cat > conftest.$ac_ext <<EOF -#line 14932 "configure" +#line 14936 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char esd_play_stream(); below. */ ＠＠ -14951,7 +14955,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_esd_play_stream=yes" else ＠＠ -15002,7 +15006,7 ＠＠ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:15006: checking for TTY-related features" >&5 +echo "configure:15010: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF ＠＠ -15015,12 +15019,12 ＠＠ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:15019: checking for tgetent in -lncurses" >&5 +echo "configure:15023: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <<EOF -#line 15024 "configure" +#line 15028 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15031,7 +15035,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:15035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15064,15 +15068,15 ＠＠ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:15068: checking for ncurses/curses.h" >&5 +echo "configure:15072: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15071 "configure" +#line 15075 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15094,15 +15098,15 ＠＠ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:15098: checking for ncurses/term.h" >&5 +echo "configure:15102: checking for ncurses/term.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15101 "configure" +#line 15105 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15132,15 +15136,15 ＠＠ c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:15136: checking for ncurses/curses.h" >&5 +echo "configure:15140: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15139 "configure" +#line 15143 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15175,12 +15179,12 ＠＠ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:15179: checking for tgetent in -l$lib" >&5 +echo "configure:15183: checking for tgetent in -l$lib" >&5 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -l$lib " cat > conftest.$ac_ext <<EOF -#line 15184 "configure" +#line 15188 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15191,7 +15195,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:15195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15222,12 +15226,12 ＠＠ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:15226: checking for tgetent in -lcurses" >&5 +echo "configure:15230: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lcurses " cat > conftest.$ac_ext <<EOF -#line 15231 "configure" +#line 15235 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15238,7 +15242,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:15242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15256,12 +15260,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:15260: checking for tgetent in -ltermcap" >&5 +echo "configure:15264: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <<EOF -#line 15265 "configure" +#line 15269 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15272,7 +15276,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:15276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15321,15 +15325,15 ＠＠ if test "$with_gpm" != "no"; then ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:15325: checking for gpm.h" >&5 +echo "configure:15329: checking for gpm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15328 "configure" +#line 15332 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15347,12 +15351,12 ＠＠ echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:15351: checking for Gpm_Open in -lgpm" >&5 +echo "configure:15355: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgpm " cat > conftest.$ac_ext <<EOF -#line 15356 "configure" +#line 15360 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15363,7 +15367,7 ＠＠ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:15367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15415,20 +15419,20 ＠＠ test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:15419: checking for database support" >&5 +echo "configure:15423: checking for database support" >&5 if test "$with_database_gdbm $with_database_dbm" != "no no"; then ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6 -echo "configure:15424: checking for ndbm.h" >&5 +echo "configure:15428: checking for ndbm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15427 "configure" +#line 15431 "configure" #include "confdefs.h" #include <ndbm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15458,12 +15462,12 ＠＠ if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:15462: checking for dbm_open in -lgdbm" >&5 +echo "configure:15466: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdbm " cat > conftest.$ac_ext <<EOF -#line 15467 "configure" +#line 15471 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15474,7 +15478,7 ＠＠ dbm_open() ; return 0; } EOF -if { (eval echo configure:15478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15502,10 +15506,10 ＠＠ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:15506: checking for dbm_open" >&5 +echo "configure:15510: checking for dbm_open" >&5 cat > conftest.$ac_ext <<EOF -#line 15509 "configure" +#line 15513 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ ＠＠ -15528,7 +15532,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:15532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else ＠＠ -15547,12 +15551,12 ＠＠ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:15551: checking for dbm_open in -ldbm" >&5 +echo "configure:15555: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -ldbm " cat > conftest.$ac_ext <<EOF -#line 15556 "configure" +#line 15560 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15563,7 +15567,7 ＠＠ dbm_open() ; return 0; } EOF -if { (eval echo configure:15567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15604,10 +15608,10 ＠＠ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:15608: checking for Berkeley db.h" >&5 +echo "configure:15612: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 15611 "configure" +#line 15615 "configure" #include "confdefs.h" #include <stdlib.h> ＠＠ -15629,7 +15633,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:15633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else ＠＠ -15645,9 +15649,9 ＠＠ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:15649: checking for Berkeley DB version" >&5 +echo "configure:15653: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext <<EOF -#line 15651 "configure" +#line 15655 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 1 ＠＠ -15659,7 +15663,7 ＠＠ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 15663 "configure" +#line 15667 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 2 ＠＠ -15671,7 +15675,7 ＠＠ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 15675 "configure" +#line 15679 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 3 ＠＠ -15705,10 +15709,10 ＠＠ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:15709: checking for $dbfunc" >&5 +echo "configure:15713: checking for $dbfunc" >&5 cat > conftest.$ac_ext <<EOF -#line 15712 "configure" +#line 15716 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $dbfunc(); below. */ ＠＠ -15731,7 +15735,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:15735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$dbfunc=yes" else ＠＠ -15750,12 +15754,12 ＠＠ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:15754: checking for $dbfunc in -ldb" >&5 +echo "configure:15758: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <<EOF -#line 15759 "configure" +#line 15763 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15766,7 +15770,7 ＠＠ $dbfunc() ; return 0; } EOF -if { (eval echo configure:15770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15800,12 +15804,12 ＠＠ echo "configure: warning: "db_create is really $dbfunc"" 1>&2 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:15804: checking for $dbfunc in -ldb" >&5 +echo "configure:15808: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <<EOF -#line 15809 "configure" +#line 15813 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15816,7 +15820,7 ＠＠ $dbfunc() ; return 0; } EOF -if { (eval echo configure:15820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15875,12 +15879,12 ＠＠ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:15879: checking for SOCKSinit in -lsocks" >&5 +echo "configure:15883: checking for SOCKSinit in -lsocks" >&5 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocks " cat > conftest.$ac_ext <<EOF -#line 15884 "configure" +#line 15888 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15891,7 +15895,7 ＠＠ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:15895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15947,15 +15951,15 ＠＠ if test "$use_number_lib" = "gmp"; then ac_safe=`echo "gmp.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:15951: checking for gmp.h" >&5 +echo "configure:15955: checking for gmp.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15954 "configure" +#line 15958 "configure" #include "confdefs.h" #include <gmp.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15973,12 +15977,12 ＠＠ echo $ac_n "checking for __gmpz_init in -lgmp""... $ac_c" 1>&6 -echo "configure:15977: checking for __gmpz_init in -lgmp" >&5 +echo "configure:15981: checking for __gmpz_init in -lgmp" >&5 ac_lib_var=`echo gmp'_'__gmpz_init | sed 'y%./+-%__p_%'` xe_check_libs=" -lgmp " cat > conftest.$ac_ext <<EOF -#line 15982 "configure" +#line 15986 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15989,7 +15993,7 ＠＠ __gmpz_init() ; return 0; } EOF -if { (eval echo configure:15993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -16038,15 +16042,15 ＠＠ for library in "" "-lcrypto"; do ac_safe=`echo "mp.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for mp.h""... $ac_c" 1>&6 -echo "configure:16042: checking for mp.h" >&5 +echo "configure:16046: checking for mp.h" >&5 cat > conftest.$ac_ext <<EOF -#line 16045 "configure" +#line 16049 "configure" #include "confdefs.h" #include <mp.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -16066,12 +16070,12 ＠＠ xe_msg_checking="for mp_mfree in -lmp" test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:16070: checking "$xe_msg_checking"" >&5 +echo "configure:16074: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo mp'_'mp_mfree | sed 'y%./+-%__p_%'` xe_check_libs=" -lmp $library" cat > conftest.$ac_ext <<EOF -#line 16075 "configure" +#line 16079 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -16082,7 +16086,7 ＠＠ mp_mfree() ; return 0; } EOF -if { (eval echo configure:16086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -16103,12 +16107,12 ＠＠ xe_msg_checking="for mfree in -lmp" test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:16107: checking "$xe_msg_checking"" >&5 +echo "configure:16111: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo mp'_'mfree | sed 'y%./+-%__p_%'` xe_check_libs=" -lmp $library" cat > conftest.$ac_ext <<EOF -#line 16112 "configure" +#line 16116 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -16119,7 +16123,7 ＠＠ mfree() ; return 0; } EOF -if { (eval echo configure:16123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -16161,10 +16165,10 ＠＠ LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi fi echo $ac_n "checking for mp_move""... $ac_c" 1>&6 -echo "configure:16165: checking for mp_move" >&5 +echo "configure:16169: checking for mp_move" >&5 cat > conftest.$ac_ext <<EOF -#line 16168 "configure" +#line 16172 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mp_move(); below. */ ＠＠ -16187,7 +16191,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:16191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_mp_move=yes" else ＠＠ -16218,10 +16222,10 ＠＠ LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi fi echo $ac_n "checking for move""... $ac_c" 1>&6 -echo "configure:16222: checking for move" >&5 +echo "configure:16226: checking for move" >&5 cat > conftest.$ac_ext <<EOF -#line 16225 "configure" +#line 16229 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char move(); below. */ ＠＠ -16244,7 +16248,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:16248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_move=yes" else ＠＠ -16291,11 +16295,11 ＠＠ fi cat > conftest.$ac_ext <<EOF -#line 16295 "configure" +#line 16299 "configure" #include "confdefs.h" int main(int c,char *v[]){return 0;} EOF -if { (eval echo configure:16299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:16303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else Index: configure.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v retrieving revision 1.239 diff -u -u -r1.239 configure.in --- configure.in 2005/02/22 07:15:59 1.239 +++ configure.in 2005/03/01 22:39:34 ＠＠ -3257,7 +3257,7 ＠＠ esac fi - AC_CHECK_FUNCS(XConvertCase) + AC_CHECK_FUNCS(XConvertCase XtRegisterDrawable) AC_CHECK_HEADERS(X11/Xlocale.h) ＠＠ -4306,7 +4306,7 ＠＠ fi dnl ---------------------------------------------------------------- -dnl Check for POSIX functions. +dnl Check for POSIX functions dnl ---------------------------------------------------------------- AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) Index: src/config.h.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v retrieving revision 1.97 diff -u -u -r1.97 config.h.in --- src/config.h.in 2005/02/22 07:16:16 1.97 +++ src/config.h.in 2005/03/01 22:40:04 ＠＠ -236,6 +236,7 ＠＠ #undef THIS_IS_X11R6 #undef HAVE_XCONVERTCASE +#undef HAVE_XTREGISTERDRAWABLE #undef HAVE_BALLOON_HELP Index: src/select-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/select-x.c,v retrieving revision 1.20 diff -u -u -r1.20 select-x.c --- src/select-x.c 2005/02/28 23:46:52 1.20 +++ src/select-x.c 2005/03/01 22:40:05 ＠＠ -527,6 +527,10 ＠＠ } else { +#ifndef HAVE_XTREGISTERDRAWABLE + invalid_operation("your Xt library sucks too much to transfer this " + "much data!"); +#else /* Send an INCR selection. */ int prop_id; Widget widget = FRAME_X_TEXT_WIDGET (XFRAME(DEVICE_SELECTED_FRAME(d))); ＠＠ -594,6 +598,7 ＠＠ } XChangeProperty (display, window, reply.property, type, format, PropModeReplace, data, 0); +#endif /* HAVE_XTREGISTERDRAWABLE */ } } -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

2 participants
1 comments

RE: [COMMIT] select.el changes lost? 19 years, 1 month

Ben Wing

i've never seen such a thing, and patcher shows the command it's about to execute, so you should be able to check in the future whether anything strange is going on. however, i use the `cvs-commit' script (in xemacs-builds/ben), which works around a commit bug in CVS that at least used to exist, and maybe still does; maybe you got bitten by this. ------- Original Message ------- On Tue, 1 Mar 2005 01:22:51 +0000 Aidan Kehoe wrote: Were I not a total newbie at using Patcher, I would suspect a bug in it. The change described in 16931.35825.340535.36815(a)parhasard.net to xemacs-patches＠ includes an update to lisp/select.el; the corresponding CVS commit, done, AFAIR, from Patcher, doesn?t. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: lisp/select.el Index: lisp/select.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/select.el,v retrieving revision 1.13 diff -u -u -r1.13 select.el --- lisp/select.el2002/05/23 11:46:10 1.13 +++ lisp/select.el 2005/03/01 00:17:04 ＠＠ -33,13 +33,25 ＠＠ ;;; Code: -(defvar selected-text-type - (if (featurep 'mule) '(COMPOUND_TEXT STRING) 'STRING) - "The type atom used to obtain selections from the X server. -Can be either a valid X selection data type, or a list of such types. -COMPOUND_TEXT and STRING are the most commonly used data types. -If a list is provided, the types are tried in sequence until -there is a successful conversion.") +;; We prefer UTF8_STRING to COMPOUND_TEXT because, even though the latter +;; gives us more information when taking data from other XEmacs invocations, +;; Mozilla will happily give us broken COMPOUND_TEXT where a non-broken +;; UTF8_STRING is available. +(defvar selection-preferred-types + (let ((res '(UTF8_STRING COMPOUND_TEXT STRING image/png image/gif + image/jpeg image/tiff image/xpm image/xbm))) + (unless (featurep 'mule) (delq 'COMPOUND_TEXT res)) + res) + "An ordered list of X11 type atoms for selections we want to receive. +We prefer UTF8_STRING over COMPOUND_TEXT, for compatibility with a certain +widely-used browser suite, and COMPOUND_TEXT over STRING. (COMPOUND_TEXT +isn't available on non-Mule.) We also accept several image types. + +For compatibility, this can be a single atom. ") + +;; Renamed because it was just ridiculous for it to be mostly image formats +;; and named selected-text-type. +(define-obsolete-variable-alias 'selected-text-type 'selection-preferred-types) (defvar selection-sets-clipboard nil "Controls the selection's relationship to the clipboard. ＠＠ -56,7 +68,7 ＠＠ (cut-copy-clear-internal 'copy))) (defun kill-primary-selection () - "Copy the selection to the Clipboard and the kill ring, then deleted it. + "Copy the selection to the Clipboard and the kill ring, then delete it. This is similar to the command \\[kill-region] except that it will save to the Clipboard even if that command doesn't, and it handles rectangles properly." ＠＠ -97,34 +109,56 ＠＠ (defun get-selection-no-error (&optional type data-type) "Return the value of a window-system selection. -The argument TYPE (default `PRIMARY') says which selection, -and the argument DATA-TYPE (default `STRING', or `COMPOUND_TEXT' under Mule) -says how to convert the data. Returns NIL if there is no selection." +The argument TYPE (default `PRIMARY') says which selection, and the argument +DATA-TYPE (defaulting to the value of `selection-preferred-types'), says how +to convert the data. Returns NIL if there is no selection." (condition-case nil (get-selection type data-type) (t nil))) (defun get-selection (&optional type data-type) "Return the value of a window-system selection. -The argument TYPE (default `PRIMARY') says which selection, -and the argument DATA-TYPE (default `STRING', or `COMPOUND_TEXT' under Mule) -says how to convert the data. If there is no selection an error is signalled. -Not suitable in a `interprogram-paste-function', q.v." +The argument TYPE (default `PRIMARY') says which selection, and the argument +DATA-TYPE (defaulting to the value of, and compatible with, +`selection-preferred-types') says how to convert the data. If +there is no selection an error is signalled. Not suitable in a +`interprogram-paste-function', q.v." (or type (setq type 'PRIMARY)) - (or data-type (setq data-type selected-text-type)) + (or data-type (setq data-type selection-preferred-types)) (if (consp data-type) - (condition-case err - (get-selection-internal type (car data-type)) - (selection-conversion-error - (if (cdr data-type) - (get-selection type (cdr data-type)) - (signal (car err) (cdr err))))) + ;; TARGETS is a vector; we want a list so we can memq --> append it to + ;; nil. + (let ((targets (append (get-selection-internal type 'TARGETS) nil)) + res) + (catch 'converted + (if targets + (dolist (current-preference data-type) + (condition-case err + (if (and (memq current-preference targets) + (setq res (get-selection-internal + type current-preference))) + (throw 'converted res)) + (selection-conversion-error + nil)))) + ;; The source app didn't offer us anything compatible in TARGETS, + ;; or they're not negotiating at all. (That is, we're probably not + ;; on X11.) Try to convert to the types specified by our caller, + ;; and throw an error if the last one of those fails. + (while data-type + (condition-case err + (progn + (setq res (get-selection-internal type (car data-type))) + (throw 'converted res)) + (selection-conversion-error + (if (cdr data-type) + (setq data-type (pop data-type)) + (signal (car err) (cdr err)))))))) (get-selection-internal type data-type))) (defun get-selection-foreign (&optional type data-type) "Return the value of a window-system selection, or nil if XEmacs owns it. -The argument TYPE (default `PRIMARY') says which selection, -and the argument DATA-TYPE (default `STRING', or `COMPOUND_TEXT' under Mule) -says how to convert the data. If there is no selection an error is signalled. -See `interprogram-paste-function' for more information." +The argument TYPE (default `PRIMARY') says which selection, and the argument +DATA-TYPE (defaulting to the value of `selection-preferred-types' which see) +says how to convert the data. If there is no selection an error is +signalled. See `interprogram-paste-function' for more information." (unless (selection-owner-p type) (get-selection type data-type))) ＠＠ -255,6 +289,8 ＠＠ ;; Given a selection, this makes an extent in the buffer which holds that ;; selection, for highlighting purposes. If the selection isn't associated ;; with a buffer, this does nothing. + ;; + ;; Something similar needs to be hooked into the rectangle functions. (let ((buffer nil) (valid (and (extentp previous-extent) (extent-object previous-extent) ＠＠ -391,8 +427,9 ＠＠ suitable internal representation otherwise." (when value (let ((handler-fn (cdr (assq type selection-converter-in-alist)))) - (when handler-fn - (apply handler-fn (list selection type value)))))) + (if handler-fn + (apply handler-fn (list selection type value)) + value)))) (defun select-convert-out (selection type value) "Attempt to convert the specified internal VALUE for the specified DATA-TYPE ＠＠ -439,13 +476,42 ＠＠ (buffer-substring (car value) (cdr value))))) (t nil))) +(defun select-convert-to-timestamp (selection type value) + (let ((ts (get-xemacs-selection-timestamp selection))) + (if ts (cons 'TIMESTAMP ts)))) + +(defun select-convert-to-utf-8-text (selection type value) + (cond ((stringp value) + (cons 'UTF8_STRING (encode-coding-string value 'utf-8))) + ((extentp value) + (save-excursion + (set-buffer (extent-object value)) + (save-restriction + (widen) + (cons 'UTF8_STRING + (encode-coding-string + (buffer-substring (extent-start-position value) + (extent-end-position value)) 'utf-8))))) + ((and (consp value) + (markerp (car value)) + (markerp (cdr value))) + (or (eq (marker-buffer (car value)) (marker-buffer (cdr value))) + (signal 'error + (list "markers must be in the same buffer" + (car value) (cdr value)))) + (save-excursion + (set-buffer (or (marker-buffer (car value)) + (error "selection is in a killed buffer"))) + (save-restriction + (widen) + (cons 'UTF8_STRING (encode-coding-string + (buffer-substring (car value) (cdr value)) + 'utf-8))))) + (t nil))) + (defun select-coerce-to-text (selection type value) (select-convert-to-text selection type value)) -(defun select-convert-from-text (selection type value) - (when (stringp value) - value)) - (defun select-convert-to-string (selection type value) (let ((outval (select-convert-to-text selection type value))) ;; force the string to be not in Compound Text format. This grubby ＠＠ -477,9 +543,6 ＠＠ (cons (ash value -16) (logand value 65535)) nil))) -(defun select-convert-from-length (selection type value) - (select-convert-to-length selection type value)) - (defun select-convert-to-targets (selection type value) ;; return a vector of atoms, but remove duplicates first. (let* ((all (cons 'TIMESTAMP (mapcar 'car selection-converter-alist))) ＠＠ -509,10 +572,6 ＠＠ (error "selection is in a killed buffer")))) (t nil))) -(defun select-convert-from-filename (selection type value) - (when (stringp value) - value)) - (defun select-convert-to-charpos (selection type value) (let (a b tmp) (cond ((cond ((extentp value) ＠＠ -682,35 +741,89 ＠＠ (t nil) )) +(defun select-convert-from-ip-address (selection type value) + (if (and (stringp value) + (= (length value) 4)) + (format "%d.%d.%d.%d" + (aref value 0) (aref value 1) (aref value 2) (aref value 3)))) + (defun select-convert-to-atom (selection type value) (and (symbolp value) value)) +(defun select-convert-from-utf-8-text (selection type value) + (decode-coding-string value 'utf-8)) + +(defun select-convert-from-utf-16-le-text (selection type value) + (decode-coding-string value 'utf-16-le)) + +;; Image conversion. +(defun select-convert-from-image-data (image-type value) + "Take an image type specification--one of the image types this XEmacs +supports--and some data in that format, return a space, with a glyph +corresponding to that data as an end-glyph extent property of that space. " + (let* ((str (make-string 1 ?\ )) + (extent (make-extent 0 1 str)) + (glyph (make-glyph (vector image-type ':data value)))) + (when glyph + (set-extent-property extent 'invisible t) + (set-extent-property extent 'start-open t) + (set-extent-property extent 'end-open t) + (set-extent-property extent 'duplicable t) + (set-extent-property extent 'atomic t) + (set-extent-end-glyph extent glyph) + str))) + +;; Could automate defining these functions these with a macro, but damned if +;; I can get that to work. Anyway, this is more readable. + +(defun select-convert-from-image/gif (selection type value) + (if (featurep 'gif) (select-convert-from-image-data 'gif value))) + +(defun select-convert-from-image/jpeg (selection type value) + (if (featurep 'jpeg) (select-convert-from-image-data 'jpeg value))) + +(defun select-convert-from-image/png (selection type value) + (if (featurep 'png) (select-convert-from-image-data 'png value))) + +(defun select-convert-from-image/tiff (selection type value) + (if (featurep 'tiff) (select-convert-from-image-data 'tiff value))) + +(defun select-convert-from-image/xpm (selection type value) + (if (featurep 'xpm) (select-convert-from-image-data 'xpm value))) + +(defun select-convert-from-image/xbm (selection type value) + (if (featurep 'xbm) (select-convert-from-image-data 'xbm value))) + ;;; CF_xxx conversions (defun select-convert-from-cf-text (selection type value) - (let ((value (decode-coding-string value 'mswindows-multibyte))) - (replace-in-string (if (string-match "\0" value) - (substring value 0 (match-beginning 0)) - value) - "\$\r\n\\|\n\r\$" "\n" t))) + (if (find-coding-system 'mswindows-multibyte) + (let ((value (decode-coding-string value 'mswindows-multibyte))) + (replace-in-string (if (string-match "\0" value) + (substring value 0 (match-beginning 0)) + value) + "\$\r\n\\|\n\r\$" "\n" t)))) (defun select-convert-from-cf-unicodetext (selection type value) - (let ((value (decode-coding-string value 'mswindows-unicode))) - (replace-in-string (if (string-match "\0" value) - (substring value 0 (match-beginning 0)) - value) - "\$\r\n\\|\n\r\$" "\n" t))) + (if (find-coding-system 'mswindows-unicode) + (let ((value (decode-coding-string value 'mswindows-unicode))) + (replace-in-string (if (string-match "\0" value) + (substring value 0 (match-beginning 0)) + value) + "\$\r\n\\|\n\r\$" "\n" t)))) (defun select-convert-to-cf-text (selection type value) - (let ((text (select-convert-to-text selection type value))) - (encode-coding-string - (concat (replace-in-string text "\n" "\r\n" t) "\0") - 'mswindows-multibyte))) + (if (find-coding-system 'mswindows-multibyte) + (let ((text (select-convert-to-text selection type value))) + (encode-coding-string + (concat (replace-in-string text "\n" "\r\n" t) "\0") + 'mswindows-multibyte)))) (defun select-convert-to-cf-unicodetext (selection type value) - (let ((text (select-convert-to-text selection type value))) - (encode-coding-string - (concat (replace-in-string text "\n" "\r\n" t) "\0") - 'mswindows-unicode))) + (if (find-coding-system 'mswindows-unicode) + (let ((text (select-convert-to-text selection type value))) + (encode-coding-string + (concat (replace-in-string text "\n" "\r\n" t) "\0") + 'mswindows-unicode)))) ;;; Appenders (defun select-append-to-text (selection type value1 value2) ＠＠ -788,7 +901,9 ＠＠ ;; Types listed in here can be selections of XEmacs (setq selection-converter-out-alist - '((TEXT . select-convert-to-text) + '((TIMESTAMP . select-convert-to-timestamp) + (UTF8_STRING . select-convert-to-utf-8-text) + (TEXT . select-convert-to-text) (STRING . select-convert-to-string) (COMPOUND_TEXT . select-convert-to-compound-text) (TARGETS . select-convert-to-targets) ＠＠ -813,21 +928,28 ＠＠ ;; Types listed here can be selections foreign to XEmacs (setq selection-converter-in-alist '(; Specific types that get handled by generic converters - (COMPOUND_TEXT . select-convert-from-text) - (SOURCE_LOC . select-convert-from-text) - (OWNER_OS . select-convert-from-text) - (HOST_NAME . select-convert-from-text) - (USER . select-convert-from-text) - (CLASS . select-convert-from-text) - (NAME . select-convert-from-text) - ; Generic types (INTEGER . select-convert-from-integer) - (TEXT . select-convert-from-text) - (STRING . select-convert-from-text) - (LENGTH . select-convert-from-length) - (FILE_NAME . select-convert-from-filename) + (TIMESTAMP . select-convert-from-integer) + (LENGTH . select-convert-from-integer) + (LIST_LENGTH . select-convert-from-integer) + (CLIENT_WINDOW . select-convert-from-integer) + (PROCESS . select-convert-from-integer) + (IP_ADDRESS . select-convert-from-ip-address) + ;; We go after UTF8_STRING in preference to STRING because Mozilla, + ;; at least, does bad things with non-Latin-1 Unicode characters in + ;; STRING. + (UTF8_STRING . select-convert-from-utf-8-text) (CF_TEXT . select-convert-from-cf-text) (CF_UNICODETEXT . select-convert-from-cf-unicodetext) + (text/html . select-convert-from-utf-16-le-text) ; Mozilla + (text/_moz_htmlcontext . select-convert-from-utf-16-le-text) + (text/_moz_htmlinfo . select-convert-from-utf-16-le-text) + (image/png . select-convert-from-image/png) + (image/gif . select-convert-from-image/gif) + (image/jpeg . select-convert-from-image/jpeg ) + (image/tiff . select-convert-from-image/tiff ) + (image/xpm . select-convert-from-image/xpm) + (image/xbm . select-convert-from-image/xbm) )) ;; Types listed here have special coercion functions that can munge -- ?I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda?s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!? -- Danny O?Brien

1 participants
0 comments

[PATCH] Add configure check for XtRegisterDrawable 19 years, 1 month

Aidan Kehoe

My copy to my Solaris machine is taking stupidly long--Vin, can I get you to check if this works for you? ChangeLog addition: 2005-03-01 Aidan Kehoe <kehoea(a)parhasard.net> * configure: * configure.in (XE_COMPUTE_RUNPATH): Check for the availability of XtRegisterDrawable. src/ChangeLog addition: 2005-03-01 Aidan Kehoe <kehoea(a)parhasard.net> * config.h.in: New macro, HAVE_XTREGISTERDRAWABLE. * select-x.c (x_reply_selection_request): Use it. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/select-x.c src/config.h.in configure.in configure Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.240 diff -u -u -r1.240 configure --- configure 2005/02/18 06:26:58 1.240 +++ configure 2005/03/01 22:00:20 ＠＠ -987,6 +987,16 ＠＠ } fi +if test "$xemacs_release_date" != ""; then + { test "$extra_verbose" = "yes" && cat << EOF + Defining XEMACS_RELEASE_DATE = "$xemacs_release_date" +EOF +cat >> confdefs.h <<EOF +#define XEMACS_RELEASE_DATE "$xemacs_release_date" +EOF +} + +fi { test "$extra_verbose" = "yes" && cat << EOF Defining EMACS_VERSION = "$version" EOF ＠＠ -1148,7 +1158,7 ＠＠ echo $ac_n "checking "host system type"""... $ac_c" 1>&6 -echo "configure:1152: checking "host system type"" >&5 +echo "configure:1162: checking "host system type"" >&5 internal_configuration=`echo $configuration | sed 's/-$workshop$//'` canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"` configuration=`echo "$configuration" | sed 's/^$[^-][^-]*-[^-][^-]*-[^-][^-]*$-.*$/\1/'` ＠＠ -1696,7 +1706,7 ＠＠ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1700: checking for $ac_word" >&5 +echo "configure:1710: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -1723,7 +1733,7 ＠＠ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1727: checking for $ac_word" >&5 +echo "configure:1737: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -1771,7 +1781,7 ＠＠ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1775: checking for $ac_word" >&5 +echo "configure:1785: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -1800,7 +1810,7 ＠＠ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' ＠＠ -1813,12 +1823,12 ＠＠ cat > conftest.$ac_ext << EOF -#line 1817 "configure" +#line 1827 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then ＠＠ -1846,19 +1856,19 ＠＠ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1850: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1860: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1855: checking whether we are using GNU C" >&5 +echo "configure:1865: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no ＠＠ -1876,7 +1886,7 ＠＠ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1880: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1890: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ＠＠ -1909,7 +1919,7 ＠＠ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1913: checking for $ac_word" >&5 +echo "configure:1923: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -1936,7 +1946,7 ＠＠ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1940: checking for $ac_word" >&5 +echo "configure:1950: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -1984,7 +1994,7 ＠＠ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1988: checking for $ac_word" >&5 +echo "configure:1998: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -2013,7 +2023,7 ＠＠ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2017: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2027: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' ＠＠ -2026,12 +2036,12 ＠＠ cat > conftest.$ac_ext << EOF -#line 2030 "configure" +#line 2040 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then ＠＠ -2059,19 +2069,19 ＠＠ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2063: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2073: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2068: checking whether we are using GNU C" >&5 +echo "configure:2078: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no ＠＠ -2089,7 +2099,7 ＠＠ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2093: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2103: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ＠＠ -2122,7 +2132,7 ＠＠ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2126: checking for $ac_word" >&5 +echo "configure:2136: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -2149,7 +2159,7 ＠＠ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2153: checking for $ac_word" >&5 +echo "configure:2163: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -2197,7 +2207,7 ＠＠ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2201: checking for $ac_word" >&5 +echo "configure:2211: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. ＠＠ -2226,7 +2236,7 ＠＠ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2230: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2240: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' ＠＠ -2239,12 +2249,12 ＠＠ cat > conftest.$ac_ext << EOF -#line 2243 "configure" +#line 2253 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then ＠＠ -2272,19 +2282,19 ＠＠ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2276: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2286: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2281: checking whether we are using GNU C" >&5 +echo "configure:2291: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no ＠＠ -2302,7 +2312,7 ＠＠ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2306: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2316: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ＠＠ -2335,7 +2345,7 ＠＠ if test "$GCC" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 2339 "configure" +#line 2349 "configure" #include "confdefs.h" int main () { #if __GNUC__ >= 3 ＠＠ -2345,7 +2355,7 ＠＠ #endif } EOF -if { (eval echo configure:2349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:2359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else ＠＠ -2371,7 +2381,7 ＠＠ test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2375: checking how to run the C preprocessor" >&5 +echo "configure:2385: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= ＠＠ -2384,13 +2394,13 ＠＠ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2388 "configure" +#line 2398 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : ＠＠ -2401,13 +2411,13 ＠＠ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2405 "configure" +#line 2415 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : ＠＠ -2418,13 +2428,13 ＠＠ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2422 "configure" +#line 2432 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : ＠＠ -2450,9 +2460,9 ＠＠ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2454: checking for AIX" >&5 +echo "configure:2464: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 2456 "configure" +#line 2466 "configure" #include "confdefs.h" #ifdef _AIX yes ＠＠ -2479,9 +2489,9 ＠＠ echo $ac_n "checking for GNU libc""... $ac_c" 1>&6 -echo "configure:2483: checking for GNU libc" >&5 +echo "configure:2493: checking for GNU libc" >&5 cat > conftest.$ac_ext <<EOF -#line 2485 "configure" +#line 2495 "configure" #include "confdefs.h" #include <features.h> int main() { ＠＠ -2493,7 +2503,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:2497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_glibc=yes else ＠＠ -2588,7 +2598,7 ＠＠ esac cat > conftest.$ac_ext <<EOF -#line 2592 "configure" +#line 2602 "configure" #include "confdefs.h" int main () { #if defined __SUNPRO_C ＠＠ -2604,7 +2614,7 ＠＠ #endif } EOF -if { (eval echo configure:2608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:2618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else ＠＠ -2858,17 +2868,17 ＠＠ if test "$__USLC__" = yes; then echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6 -echo "configure:2862: checking for whether the -Kalloca compiler flag is needed" >&5 +echo "configure:2872: checking for whether the -Kalloca compiler flag is needed" >&5 need_kalloca=no cat > conftest.$ac_ext <<EOF -#line 2865 "configure" +#line 2875 "configure" #include "confdefs.h" int main() { void *x = alloca(4); ; return 0; } EOF -if { (eval echo configure:2872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* : else ＠＠ -2879,14 +2889,14 ＠＠ xe_save_c_switch_system="$c_switch_system" c_switch_system="$c_switch_system -Kalloca" cat > conftest.$ac_ext <<EOF -#line 2883 "configure" +#line 2893 "configure" #include "confdefs.h" int main() { void *x = alloca(4); ; return 0; } EOF -if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* need_kalloca=yes else ＠＠ -2924,7 +2934,7 ＠＠ echo $ac_n "checking for preferred optimization flags""... $ac_c" 1>&6 -echo "configure:2928: checking for preferred optimization flags" >&5 +echo "configure:2938: checking for preferred optimization flags" >&5 if test "$with_optimization" = "yes" ; then if test "$cflags_optimization_specified" = "no"; then if test "$GCC" = "yes"; then ＠＠ -2951,7 +2961,7 ＠＠ echo $ac_n "checking for preferred debugging flags""... $ac_c" 1>&6 -echo "configure:2955: checking for preferred debugging flags" >&5 +echo "configure:2965: checking for preferred debugging flags" >&5 if test "$cflags_debugging_specified" = "no"; then cflags_debugging="-g" ＠＠ -2968,7 +2978,7 ＠＠ echo $ac_n "checking for preferred warning flags for XEMACS_CC""... $ac_c" 1>&6 -echo "configure:2972: checking for preferred warning flags for XEMACS_CC" >&5 +echo "configure:2982: checking for preferred warning flags for XEMACS_CC" >&5 xe_cflags_warning="" ＠＠ -3001,12 +3011,12 ＠＠ echo "$ac_t""${xe_cflags_warning}" 1>&6 echo $ac_n "checking for preferred warning flags for CC""... $ac_c" 1>&6 -echo "configure:3005: checking for preferred warning flags for CC" >&5 +echo "configure:3015: checking for preferred warning flags for CC" >&5 echo "$ac_t""${cflags_warning}" 1>&6 echo $ac_n "checking for remaining CFLAGS""... $ac_c" 1>&6 -echo "configure:3010: checking for remaining CFLAGS" >&5 +echo "configure:3020: checking for remaining CFLAGS" >&5 if test "$cflags_specified" = "no"; then if test "$CC" = "xlc"; then ＠＠ -3020,15 +3030,15 ＠＠ CFLAGS="$cflags_warning $cflags_debugging $cflags_optimization $CFLAGS" echo $ac_n "checking total value of XE_CFLAGS""... $ac_c" 1>&6 -echo "configure:3024: checking total value of XE_CFLAGS" >&5 +echo "configure:3034: checking total value of XE_CFLAGS" >&5 echo "$ac_t""${XE_CFLAGS}" 1>&6 echo $ac_n "checking total value of CFLAGS""... $ac_c" 1>&6 -echo "configure:3027: checking total value of CFLAGS" >&5 +echo "configure:3037: checking total value of CFLAGS" >&5 echo "$ac_t""${CFLAGS}" 1>&6 if test "$GCC" = "yes"; then echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6 -echo "configure:3032: checking for buggy gcc versions" >&5 +echo "configure:3042: checking for buggy gcc versions" >&5 GCC_VERSION=`$CC --version` case `uname -s`:`uname -m`:$GCC_VERSION in *:sun4*:2.8.1|*:sun4*:egcs-2.90.*) ＠＠ -3086,7 +3096,7 ＠＠ if test "$pdump" != "yes"; then echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6 -echo "configure:3090: checking for \"-z nocombreloc\" linker flag" >&5 +echo "configure:3100: checking for \"-z nocombreloc\" linker flag" >&5 case "`ld --help 2>&1`" in *-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6 ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;; ＠＠ -3175,7 +3185,7 ＠＠ fi echo $ac_n "checking for dynodump""... $ac_c" 1>&6 -echo "configure:3179: checking for dynodump" >&5 +echo "configure:3189: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else ＠＠ -3212,12 +3222,12 ＠＠ done echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6 -echo "configure:3216: checking for terminateAndUnload in -lC" >&5 +echo "configure:3226: checking for terminateAndUnload in -lC" >&5 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'` xe_check_libs=" -lC " cat > conftest.$ac_ext <<EOF -#line 3221 "configure" +#line 3231 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -3228,7 +3238,7 ＠＠ terminateAndUnload() ; return 0; } EOF -if { (eval echo configure:3232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -3270,7 +3280,7 ＠＠ libc_version="" echo $ac_n "checking for compiler version information""... $ac_c" 1>&6 -echo "configure:3274: checking for compiler version information" >&5 +echo "configure:3284: checking for compiler version information" >&5 if test "$GCC" = "yes"; then compiler_version=`$XEMACS_CC --version | head -1` ＠＠ -3321,7 +3331,7 ＠＠ fi echo $ac_n "checking for standard C library version information""... $ac_c" 1>&6 -echo "configure:3325: checking for standard C library version information" >&5 +echo "configure:3335: checking for standard C library version information" >&5 case "$canonical" in *-*-linux*) ＠＠ -3433,7 +3443,7 ＠＠ if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:3437: checking "for runtime libraries flag"" >&5 +echo "configure:3447: checking "for runtime libraries flag"" >&5 case "$opsys" in sol2 ) dash_r="-R" ;; decosf* | linux* | irix*) dash_r="-rpath " ;; ＠＠ -3455,14 +3465,14 ＠＠ done fi cat > conftest.$ac_ext <<EOF -#line 3459 "configure" +#line 3469 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* dash_r="$try_dash_r" else ＠＠ -3563,10 +3573,10 ＠＠ fi after_morecore_hook_exists=yes echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6 -echo "configure:3567: checking for malloc_set_state" >&5 +echo "configure:3577: checking for malloc_set_state" >&5 cat > conftest.$ac_ext <<EOF -#line 3570 "configure" +#line 3580 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char malloc_set_state(); below. */ ＠＠ -3589,7 +3599,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_malloc_set_state=yes" else ＠＠ -3609,16 +3619,16 ＠＠ fi echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6 -echo "configure:3613: checking whether __after_morecore_hook exists" >&5 +echo "configure:3623: checking whether __after_morecore_hook exists" >&5 cat > conftest.$ac_ext <<EOF -#line 3615 "configure" +#line 3625 "configure" #include "confdefs.h" extern void (* __after_morecore_hook)(); int main() { __after_morecore_hook = 0 ; return 0; } EOF -if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else ＠＠ -3674,7 +3684,7 ＠＠ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3678: checking for $ac_word" >&5 +echo "configure:3688: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. ＠＠ -3729,7 +3739,7 ＠＠ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3733: checking for a BSD compatible install" >&5 +echo "configure:3743: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" ＠＠ -3783,7 +3793,7 ＠＠ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3787: checking for $ac_word" >&5 +echo "configure:3797: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. ＠＠ -3815,15 +3825,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3819: checking for $ac_hdr" >&5 +echo "configure:3829: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 3822 "configure" +#line 3832 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -3853,10 +3863,10 ＠＠ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3857: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3867: checking for sys/wait.h that is POSIX.1 compatible" >&5 cat > conftest.$ac_ext <<EOF -#line 3860 "configure" +#line 3870 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> ＠＠ -3872,7 +3882,7 ＠＠ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else ＠＠ -3896,10 +3906,10 ＠＠ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3900: checking for ANSI C header files" >&5 +echo "configure:3910: checking for ANSI C header files" >&5 cat > conftest.$ac_ext <<EOF -#line 3903 "configure" +#line 3913 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> ＠＠ -3907,7 +3917,7 ＠＠ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -3924,7 +3934,7 ＠＠ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 3928 "configure" +#line 3938 "configure" #include "confdefs.h" #include <string.h> EOF ＠＠ -3942,7 +3952,7 ＠＠ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 3946 "configure" +#line 3956 "configure" #include "confdefs.h" #include <stdlib.h> EOF ＠＠ -3960,7 +3970,7 ＠＠ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. cat > conftest.$ac_ext <<EOF -#line 3964 "configure" +#line 3974 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ＠＠ -3971,7 +3981,7 ＠＠ exit (0); } EOF -if { (eval echo configure:3975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:3985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else ＠＠ -3997,10 +4007,10 ＠＠ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4001: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4011: checking whether time.h and sys/time.h may both be included" >&5 cat > conftest.$ac_ext <<EOF -#line 4004 "configure" +#line 4014 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> ＠＠ -4009,7 +4019,7 ＠＠ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else ＠＠ -4033,10 +4043,10 ＠＠ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:4037: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:4047: checking for sys_siglist declaration in signal.h or unistd.h" >&5 cat > conftest.$ac_ext <<EOF -#line 4040 "configure" +#line 4050 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> ＠＠ -4048,7 +4058,7 ＠＠ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:4052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else ＠＠ -4074,9 +4084,9 ＠＠ echo $ac_n "checking for utime""... $ac_c" 1>&6 -echo "configure:4078: checking for utime" >&5 +echo "configure:4088: checking for utime" >&5 cat > conftest.$ac_ext <<EOF -#line 4080 "configure" +#line 4090 "configure" #include "confdefs.h" #include <sys/types.h> #include <utime.h> ＠＠ -4084,7 +4094,7 ＠＠ struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x); ; return 0; } EOF -if { (eval echo configure:4088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF ＠＠ -4103,10 +4113,10 ＠＠ for ac_func in utimes do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4107: checking for $ac_func" >&5 +echo "configure:4117: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 4110 "configure" +#line 4120 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -4129,7 +4139,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:4133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -4161,10 +4171,10 ＠＠ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4165: checking return type of signal handlers" >&5 +echo "configure:4175: checking return type of signal handlers" >&5 cat > conftest.$ac_ext <<EOF -#line 4168 "configure" +#line 4178 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> ＠＠ -4181,7 +4191,7 ＠＠ int i; ; return 0; } EOF -if { (eval echo configure:4185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else ＠＠ -4203,10 +4213,10 ＠＠ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4207: checking for size_t" >&5 +echo "configure:4217: checking for size_t" >&5 cat > conftest.$ac_ext <<EOF -#line 4210 "configure" +#line 4220 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -4237,10 +4247,10 ＠＠ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:4241: checking for pid_t" >&5 +echo "configure:4251: checking for pid_t" >&5 cat > conftest.$ac_ext <<EOF -#line 4244 "configure" +#line 4254 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -4271,10 +4281,10 ＠＠ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4275: checking for uid_t in sys/types.h" >&5 +echo "configure:4285: checking for uid_t in sys/types.h" >&5 cat > conftest.$ac_ext <<EOF -#line 4278 "configure" +#line 4288 "configure" #include "confdefs.h" #include <sys/types.h> EOF ＠＠ -4310,10 +4320,10 ＠＠ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:4314: checking for mode_t" >&5 +echo "configure:4324: checking for mode_t" >&5 cat > conftest.$ac_ext <<EOF -#line 4317 "configure" +#line 4327 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -4344,10 +4354,10 ＠＠ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4348: checking for off_t" >&5 +echo "configure:4358: checking for off_t" >&5 cat > conftest.$ac_ext <<EOF -#line 4351 "configure" +#line 4361 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -4378,10 +4388,10 ＠＠ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:4382: checking for ssize_t" >&5 +echo "configure:4392: checking for ssize_t" >&5 cat > conftest.$ac_ext <<EOF -#line 4385 "configure" +#line 4395 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS ＠＠ -4414,9 +4424,9 ＠＠ if test "$ac_cv_header_inttypes_h" != "yes"; then echo $ac_n "checking for intptr_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4418: checking for intptr_t in sys/types.h" >&5 +echo "configure:4428: checking for intptr_t in sys/types.h" >&5 cat > conftest.$ac_ext <<EOF -#line 4420 "configure" +#line 4430 "configure" #include "confdefs.h" #include <sys/types.h> intptr_t x; ＠＠ -4425,7 +4435,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:4429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF ＠＠ -4446,9 +4456,9 ＠＠ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:4450: checking for socklen_t" >&5 +echo "configure:4460: checking for socklen_t" >&5 cat > conftest.$ac_ext <<EOF -#line 4452 "configure" +#line 4462 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> ＠＠ -4458,7 +4468,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:4462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else ＠＠ -4467,7 +4477,7 ＠＠ rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4471 "configure" +#line 4481 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> ＠＠ -4477,7 +4487,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:4481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""size_t" 1>&6 ＠＠ -4509,9 +4519,9 ＠＠ rm -f conftest* echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:4513: checking for struct timeval" >&5 +echo "configure:4523: checking for struct timeval" >&5 cat > conftest.$ac_ext <<EOF -#line 4515 "configure" +#line 4525 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> ＠＠ -4527,7 +4537,7 ＠＠ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:4531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes ＠＠ -4549,10 +4559,10 ＠＠ rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4553: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4563: checking whether struct tm is in sys/time.h or time.h" >&5 cat > conftest.$ac_ext <<EOF -#line 4556 "configure" +#line 4566 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> ＠＠ -4560,7 +4570,7 ＠＠ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else ＠＠ -4584,10 +4594,10 ＠＠ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4588: checking for tm_zone in struct tm" >&5 +echo "configure:4598: checking for tm_zone in struct tm" >&5 cat > conftest.$ac_ext <<EOF -#line 4591 "configure" +#line 4601 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> ＠＠ -4595,7 +4605,7 ＠＠ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else ＠＠ -4618,10 +4628,10 ＠＠ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4622: checking for tzname" >&5 +echo "configure:4632: checking for tzname" >&5 cat > conftest.$ac_ext <<EOF -#line 4625 "configure" +#line 4635 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ ＠＠ -4631,7 +4641,7 ＠＠ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else ＠＠ -4657,10 +4667,10 ＠＠ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4661: checking for working const" >&5 +echo "configure:4671: checking for working const" >&5 cat > conftest.$ac_ext <<EOF -#line 4664 "configure" +#line 4674 "configure" #include "confdefs.h" int main() { ＠＠ -4709,7 +4719,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:4713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else ＠＠ -4734,7 +4744,7 ＠＠ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:4738: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:4748: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF ＠＠ -4759,12 +4769,12 ＠＠ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4763: checking whether byte ordering is bigendian" >&5 +echo "configure:4773: checking whether byte ordering is bigendian" >&5 ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 4768 "configure" +#line 4778 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> ＠＠ -4775,11 +4785,11 ＠＠ #endif ; return 0; } EOF -if { (eval echo configure:4779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 4783 "configure" +#line 4793 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> ＠＠ -4790,7 +4800,7 ＠＠ #endif ; return 0; } EOF -if { (eval echo configure:4794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else ＠＠ -4807,7 +4817,7 ＠＠ rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <<EOF -#line 4811 "configure" +#line 4821 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ ＠＠ -4820,7 +4830,7 ＠＠ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:4824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_bigendian=no else ＠＠ -4847,13 +4857,12 ＠＠ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4851: checking size of short" >&5 +echo "configure:4861: checking size of short" >&5 cat > conftest.$ac_ext <<EOF -#line 4854 "configure" +#line 4864 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -4862,7 +4871,7 ＠＠ exit(0); } EOF -if { (eval echo configure:4866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else ＠＠ -4890,13 +4899,12 ＠＠ exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4894: checking size of int" >&5 +echo "configure:4903: checking size of int" >&5 cat > conftest.$ac_ext <<EOF -#line 4897 "configure" +#line 4906 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -4905,7 +4913,7 ＠＠ exit(0); } EOF -if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else ＠＠ -4927,13 +4935,12 ＠＠ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4931: checking size of long" >&5 +echo "configure:4939: checking size of long" >&5 cat > conftest.$ac_ext <<EOF -#line 4934 "configure" +#line 4942 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -4942,7 +4949,7 ＠＠ exit(0); } EOF -if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else ＠＠ -4964,13 +4971,12 ＠＠ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4968: checking size of long long" >&5 +echo "configure:4975: checking size of long long" >&5 cat > conftest.$ac_ext <<EOF -#line 4971 "configure" +#line 4978 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -4979,7 +4985,7 ＠＠ exit(0); } EOF -if { (eval echo configure:4983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long_long=`cat conftestval` else ＠＠ -5001,13 +5007,12 ＠＠ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:5005: checking size of void *" >&5 +echo "configure:5011: checking size of void *" >&5 cat > conftest.$ac_ext <<EOF -#line 5008 "configure" +#line 5014 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -5016,7 +5021,7 ＠＠ exit(0); } EOF -if { (eval echo configure:5020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:5025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_void_p=`cat conftestval` else ＠＠ -5038,13 +5043,12 ＠＠ echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:5042: checking size of double" >&5 +echo "configure:5047: checking size of double" >&5 cat > conftest.$ac_ext <<EOF -#line 5045 "configure" +#line 5050 "configure" #include "confdefs.h" #include <stdio.h> -#include <sys/types.h> main() { FILE *f=fopen("conftestval", "w"); ＠＠ -5053,7 +5057,7 ＠＠ exit(0); } EOF -if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:5061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_double=`cat conftestval` else ＠＠ -5076,7 +5080,7 ＠＠ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:5080: checking for long file names" >&5 +echo "configure:5084: checking for long file names" >&5 ac_cv_sys_long_file_names=yes # Test for long file names in all the places we know might matter: ＠＠ -5122,10 +5126,10 ＠＠ echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:5126: checking for sin" >&5 +echo "configure:5130: checking for sin" >&5 cat > conftest.$ac_ext <<EOF -#line 5129 "configure" +#line 5133 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sin(); below. */ ＠＠ -5148,7 +5152,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:5152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sin=yes" else ＠＠ -5166,12 +5170,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:5170: checking for sin in -lm" >&5 +echo "configure:5174: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` xe_check_libs=" -lm " cat > conftest.$ac_ext <<EOF -#line 5175 "configure" +#line 5179 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -5182,7 +5186,7 ＠＠ sin() ; return 0; } EOF -if { (eval echo configure:5186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5217,14 +5221,14 ＠＠ cat > conftest.$ac_ext <<EOF -#line 5221 "configure" +#line 5225 "configure" #include "confdefs.h" #include <math.h> int main() { return atanh(1.0) + asinh(1.0) + acosh(1.0); ; return 0; } EOF -if { (eval echo configure:5228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_INVERSE_HYPERBOLIC ＠＠ -5243,10 +5247,10 ＠＠ for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5247: checking for $ac_func" >&5 +echo "configure:5251: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 5250 "configure" +#line 5254 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -5269,7 +5273,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:5273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -5298,14 +5302,14 ＠＠ echo "checking type of mail spool file locking" 1>&6 -echo "configure:5302: checking type of mail spool file locking" >&5 +echo "configure:5306: checking type of mail spool file locking" >&5 for ac_func in lockf flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5306: checking for $ac_func" >&5 +echo "configure:5310: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 5309 "configure" +#line 5313 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -5328,7 +5332,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:5332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -5418,12 +5422,12 ＠＠ case "$opsys" in decosf*) echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:5422: checking for cma_open in -lpthreads" >&5 +echo "configure:5426: checking for cma_open in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lpthreads " cat > conftest.$ac_ext <<EOF -#line 5427 "configure" +#line 5431 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -5434,7 +5438,7 ＠＠ cma_open() ; return 0; } EOF -if { (eval echo configure:5438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5471,7 +5475,7 ＠＠ echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:5475: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:5479: checking whether the -xildoff compiler flag is required" >&5 if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then echo "$ac_t""no" 1>&6; ＠＠ -5483,7 +5487,7 ＠＠ if test "$opsys" = "sol2"; then if test "$os_release" -ge 506; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:5487: checking for \"-z ignore\" linker flag" >&5 +echo "configure:5491: checking for \"-z ignore\" linker flag" >&5 case "`ld -h 2>&1`" in *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6 ld_switch_site="-z ignore $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;; ＠＠ -5494,7 +5498,7 ＠＠ echo "checking "for specified window system"" 1>&6 -echo "configure:5498: checking "for specified window system"" >&5 +echo "configure:5502: checking "for specified window system"" >&5 GNOME_CONFIG=no ＠＠ -5502,7 +5506,7 ＠＠ if test "$with_gnome" != "no"; then echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6 -echo "configure:5506: checking for GNOME configuration script" >&5 +echo "configure:5510: checking for GNOME configuration script" >&5 for possible in gnome-config do possible_version=`${possible} --version 2> /dev/null` ＠＠ -5533,7 +5537,7 ＠＠ if test "$with_gtk" != "no";then echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6 -echo "configure:5537: checking for GTK configuration script" >&5 +echo "configure:5541: checking for GTK configuration script" >&5 for possible in gtk12-config gtk14-config gtk-config do possible_version=`${possible} --version 2> /dev/null` ＠＠ -5555,18 +5559,18 ＠＠ if test "${GTK_CONFIG}" != "no"; then echo $ac_n "checking gtk version""... $ac_c" 1>&6 -echo "configure:5559: checking gtk version" >&5 +echo "configure:5563: checking gtk version" >&5 GTK_VERSION=`${GTK_CONFIG} --version` echo "$ac_t""${GTK_VERSION}" 1>&6 echo $ac_n "checking gtk libs""... $ac_c" 1>&6 -echo "configure:5564: checking gtk libs" >&5 +echo "configure:5568: checking gtk libs" >&5 GTK_LIBS=`${GTK_CONFIG} --libs` libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi echo "$ac_t""${GTK_LIBS}" 1>&6 echo $ac_n "checking gtk cflags""... $ac_c" 1>&6 -echo "configure:5570: checking gtk cflags" >&5 +echo "configure:5574: checking gtk cflags" >&5 GTK_CFLAGS=`${GTK_CONFIG} --cflags` if test "$GCC" = "yes"; then GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow" ＠＠ -5576,19 +5580,19 ＠＠ echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6 -echo "configure:5580: checking for main in -lgdk_imlib" >&5 +echo "configure:5584: checking for main in -lgdk_imlib" >&5 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdk_imlib " cat > conftest.$ac_ext <<EOF -#line 5585 "configure" +#line 5589 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5610,12 +5614,12 ＠＠ echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6 -echo "configure:5614: checking for Imlib_init in -lImlib" >&5 +echo "configure:5618: checking for Imlib_init in -lImlib" >&5 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'` xe_check_libs=" -lImlib " cat > conftest.$ac_ext <<EOF -#line 5619 "configure" +#line 5623 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -5626,7 +5630,7 ＠＠ Imlib_init() ; return 0; } EOF -if { (eval echo configure:5630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5649,10 +5653,10 ＠＠ for ac_func in gdk_imlib_init do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5653: checking for $ac_func" >&5 +echo "configure:5657: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 5656 "configure" +#line 5660 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -5675,7 +5679,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:5679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -5759,15 +5763,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5763: checking for $ac_hdr" >&5 +echo "configure:5767: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 5766 "configure" +#line 5770 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -5798,19 +5802,19 ＠＠ echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6 -echo "configure:5802: checking for main in -lxml" >&5 +echo "configure:5806: checking for main in -lxml" >&5 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lxml " cat > conftest.$ac_ext <<EOF -#line 5807 "configure" +#line 5811 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5832,19 +5836,19 ＠＠ echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6 -echo "configure:5836: checking for main in -lglade" >&5 +echo "configure:5840: checking for main in -lglade" >&5 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade " cat > conftest.$ac_ext <<EOF -#line 5841 "configure" +#line 5845 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5866,19 +5870,19 ＠＠ echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6 -echo "configure:5870: checking for main in -lglade-gnome" >&5 +echo "configure:5874: checking for main in -lglade-gnome" >&5 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade-gnome " cat > conftest.$ac_ext <<EOF -#line 5875 "configure" +#line 5879 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -5899,7 +5903,7 ＠＠ cat > conftest.$ac_ext <<EOF -#line 5903 "configure" +#line 5907 "configure" #include "confdefs.h" #include <glade/glade-xml.h> EOF ＠＠ -5958,7 +5962,7 ＠＠ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5962: checking for X" >&5 +echo "configure:5966: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then ＠＠ -6018,12 +6022,12 ＠＠ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 6022 "configure" +#line 6026 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -6092,14 +6096,14 ＠＠ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 6096 "configure" +#line 6100 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:6103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. ＠＠ -6208,17 +6212,17 ＠＠ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:6212: checking whether -R must be followed by a space" >&5 +echo "configure:6216: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 6215 "configure" +#line 6219 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:6222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else ＠＠ -6234,14 +6238,14 ＠＠ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 6238 "configure" +#line 6242 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:6245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else ＠＠ -6277,12 +6281,12 ＠＠ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:6281: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:6285: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet " cat > conftest.$ac_ext <<EOF -#line 6286 "configure" +#line 6290 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6293,7 +6297,7 ＠＠ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:6297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6317,12 +6321,12 ＠＠ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:6321: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:6325: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet_stub " cat > conftest.$ac_ext <<EOF -#line 6326 "configure" +#line 6330 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6333,7 +6337,7 ＠＠ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6362,10 +6366,10 ＠＠ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey(a)clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:6366: checking for gethostbyname" >&5 +echo "configure:6370: checking for gethostbyname" >&5 cat > conftest.$ac_ext <<EOF -#line 6369 "configure" +#line 6373 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ ＠＠ -6388,7 +6392,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else ＠＠ -6409,12 +6413,12 ＠＠ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6413: checking for gethostbyname in -lnsl" >&5 +echo "configure:6417: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` xe_check_libs=" -lnsl " cat > conftest.$ac_ext <<EOF -#line 6418 "configure" +#line 6422 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6425,7 +6429,7 ＠＠ gethostbyname() ; return 0; } EOF -if { (eval echo configure:6429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6455,10 +6459,10 ＠＠ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:6459: checking for connect" >&5 +echo "configure:6463: checking for connect" >&5 cat > conftest.$ac_ext <<EOF -#line 6462 "configure" +#line 6466 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ ＠＠ -6481,7 +6485,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else ＠＠ -6504,12 +6508,12 ＠＠ xe_msg_checking="for connect in -lsocket" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6508: checking "$xe_msg_checking"" >&5 +echo "configure:6512: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocket $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 6513 "configure" +#line 6517 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6520,7 +6524,7 ＠＠ connect() ; return 0; } EOF -if { (eval echo configure:6524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6544,10 +6548,10 ＠＠ # gomez(a)mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:6548: checking for remove" >&5 +echo "configure:6552: checking for remove" >&5 cat > conftest.$ac_ext <<EOF -#line 6551 "configure" +#line 6555 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ ＠＠ -6570,7 +6574,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else ＠＠ -6591,12 +6595,12 ＠＠ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:6595: checking for remove in -lposix" >&5 +echo "configure:6599: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` xe_check_libs=" -lposix " cat > conftest.$ac_ext <<EOF -#line 6600 "configure" +#line 6604 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6607,7 +6611,7 ＠＠ remove() ; return 0; } EOF -if { (eval echo configure:6611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6631,10 +6635,10 ＠＠ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:6635: checking for shmat" >&5 +echo "configure:6639: checking for shmat" >&5 cat > conftest.$ac_ext <<EOF -#line 6638 "configure" +#line 6642 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ ＠＠ -6657,7 +6661,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:6661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else ＠＠ -6678,12 +6682,12 ＠＠ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:6682: checking for shmat in -lipc" >&5 +echo "configure:6686: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` xe_check_libs=" -lipc " cat > conftest.$ac_ext <<EOF -#line 6687 "configure" +#line 6691 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6694,7 +6698,7 ＠＠ shmat() ; return 0; } EOF -if { (eval echo configure:6698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6730,12 +6734,12 ＠＠ xe_msg_checking="for IceConnectionNumber in -lICE" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6734: checking "$xe_msg_checking"" >&5 +echo "configure:6738: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` xe_check_libs=" -lICE $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 6739 "configure" +#line 6743 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6746,7 +6750,7 ＠＠ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:6750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6792,15 +6796,15 ＠＠ ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:6796: checking for Xm/Xm.h" >&5 +echo "configure:6800: checking for Xm/Xm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6799 "configure" +#line 6803 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -6817,12 +6821,12 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:6821: checking for XmStringFree in -lXm" >&5 +echo "configure:6825: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 6826 "configure" +#line 6830 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -6833,7 +6837,7 ＠＠ XmStringFree() ; return 0; } EOF -if { (eval echo configure:6837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -6985,7 +6989,7 ＠＠ echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:6989: checking for X defines extracted by xmkmf" >&5 +echo "configure:6993: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir ＠＠ -7034,15 +7038,15 ＠＠ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:7038: checking for X11/Intrinsic.h" >&5 +echo "configure:7042: checking for X11/Intrinsic.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7041 "configure" +#line 7045 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7066,12 +7070,12 ＠＠ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:7070: checking for XOpenDisplay in -lX11" >&5 +echo "configure:7074: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 7075 "configure" +#line 7079 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7082,7 +7086,7 ＠＠ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:7086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7107,12 +7111,12 ＠＠ xe_msg_checking="for XGetFontProperty in -lX11" test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7111: checking "$xe_msg_checking"" >&5 +echo "configure:7115: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 -b i486-linuxaout" cat > conftest.$ac_ext <<EOF -#line 7116 "configure" +#line 7120 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7123,7 +7127,7 ＠＠ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:7127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7150,12 +7154,12 ＠＠ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:7154: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:7158: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` xe_check_libs=" -lXext " cat > conftest.$ac_ext <<EOF -#line 7159 "configure" +#line 7163 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7166,7 +7170,7 ＠＠ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:7170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7189,12 +7193,12 ＠＠ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:7193: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:7197: checking for XtOpenDisplay in -lXt" >&5 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lXt " cat > conftest.$ac_ext <<EOF -#line 7198 "configure" +#line 7202 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7205,7 +7209,7 ＠＠ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:7209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7228,14 +7232,14 ＠＠ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:7232: checking the version of X11 being used" >&5 +echo "configure:7236: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 7234 "configure" +#line 7238 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:7239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest foobar; x11_release=$? else ＠＠ -7266,10 +7270,10 ＠＠ for ac_func in XConvertCase do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7270: checking for $ac_func" >&5 +echo "configure:7274: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 7273 "configure" +#line 7277 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -7292,7 +7296,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:7296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -7324,15 +7328,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7328: checking for $ac_hdr" >&5 +echo "configure:7332: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 7331 "configure" +#line 7335 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7365,10 +7369,10 ＠＠ for ac_func in XRegisterIMInstantiateCallback do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7369: checking for $ac_func" >&5 +echo "configure:7373: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 7372 "configure" +#line 7376 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -7391,7 +7395,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:7395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -7419,9 +7423,9 ＠＠ done echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6 -echo "configure:7423: checking for standard XRegisterIMInstantiateCallback prototype" >&5 +echo "configure:7427: checking for standard XRegisterIMInstantiateCallback prototype" >&5 cat > conftest.$ac_ext <<EOF -#line 7425 "configure" +#line 7429 "configure" #include "confdefs.h" #define NeedFunctionPrototypes 1 ＠＠ -7433,7 +7437,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:7437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else ＠＠ -7454,12 +7458,12 ＠＠ test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:7458: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:7462: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'` xe_check_libs=" -lXmu " cat > conftest.$ac_ext <<EOF -#line 7463 "configure" +#line 7467 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7470,7 +7474,7 ＠＠ XmuReadBitmapDataFromFile() ; return 0; } EOF -if { (eval echo configure:7474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7509,19 +7513,19 ＠＠ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:7513: checking for main in -lXbsd" >&5 +echo "configure:7517: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lXbsd " cat > conftest.$ac_ext <<EOF -#line 7518 "configure" +#line 7522 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7558,22 +7562,22 ＠＠ fi if test "$with_msw" != "no"; then echo "checking for MS-Windows" 1>&6 -echo "configure:7562: checking for MS-Windows" >&5 +echo "configure:7566: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:7565: checking for main in -lgdi32" >&5 +echo "configure:7569: checking for main in -lgdi32" >&5 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdi32 " cat > conftest.$ac_ext <<EOF -#line 7570 "configure" +#line 7574 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7624,12 +7628,12 ＠＠ test "$with_widgets" != "no" && with_widgets=msw fi cat > conftest.$ac_ext <<EOF -#line 7628 "configure" +#line 7632 "configure" #include "confdefs.h" #include <fcntl.h> int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:7633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MSG_SELECT ＠＠ -7690,15 +7694,15 ＠＠ if test "$with_x11" = "yes"; then ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6 -echo "configure:7694: checking for X11/extensions/shape.h" >&5 +echo "configure:7698: checking for X11/extensions/shape.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7697 "configure" +#line 7701 "configure" #include "confdefs.h" #include <X11/extensions/shape.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7748,7 +7752,7 ＠＠ esac echo "checking for WM_COMMAND option" 1>&6 -echo "configure:7752: checking for WM_COMMAND option" >&5; +echo "configure:7756: checking for WM_COMMAND option" >&5; if test "$with_wmcommand" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_WMCOMMAND ＠＠ -7763,15 +7767,15 ＠＠ test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6 -echo "configure:7767: checking for X11/Xauth.h" >&5 +echo "configure:7771: checking for X11/Xauth.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7770 "configure" +#line 7774 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7794,12 +7798,12 ＠＠ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:7798: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:7802: checking for XauGetAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'` xe_check_libs=" -lXau " cat > conftest.$ac_ext <<EOF -#line 7803 "configure" +#line 7807 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -7810,7 +7814,7 ＠＠ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:7814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -7861,7 +7865,7 ＠＠ if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:7865: checking for module support" >&5 +echo "configure:7869: checking for module support" >&5 case "$opsys" in mingw* | cygwin* ) have_dl=yes ;; ＠＠ -7878,15 +7882,15 ＠＠ * ) ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:7882: checking for dlfcn.h" >&5 +echo "configure:7886: checking for dlfcn.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7885 "configure" +#line 7889 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -7903,16 +7907,16 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:7907: checking for dlopen in -lc" >&5 +echo "configure:7911: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 7909 "configure" +#line 7913 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -7921,18 +7925,18 ＠＠ rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7925: checking for dlopen in -ldl" >&5 +echo "configure:7929: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="$LIBS -ldl" cat > conftest.$ac_ext <<EOF -#line 7929 "configure" +#line 7933 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -7941,17 +7945,17 ＠＠ rm -rf conftest* echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:7945: checking for dlopen in -lsvld" >&5 +echo "configure:7949: checking for dlopen in -lsvld" >&5 LIBS="$ac_save_LIBS -lsvld" cat > conftest.$ac_ext <<EOF -#line 7948 "configure" +#line 7952 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -7981,15 +7985,15 ＠＠ else ac_safe=`echo "dl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dl.h""... $ac_c" 1>&6 -echo "configure:7985: checking for dl.h" >&5 +echo "configure:7989: checking for dl.h" >&5 cat > conftest.$ac_ext <<EOF -#line 7988 "configure" +#line 7992 "configure" #include "confdefs.h" #include <dl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8006,16 +8010,16 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for shl_load in -lc""... $ac_c" 1>&6 -echo "configure:8010: checking for shl_load in -lc" >&5 +echo "configure:8014: checking for shl_load in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 8012 "configure" +#line 8016 "configure" #include "confdefs.h" #include <dl.h> int main() { shl_load ("", 0, 0); ; return 0; } EOF -if { (eval echo configure:8019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -8024,18 +8028,18 ＠＠ rm -rf conftest* echo $ac_n "checking for shl_load in -ldl""... $ac_c" 1>&6 -echo "configure:8028: checking for shl_load in -ldl" >&5 +echo "configure:8032: checking for shl_load in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="$LIBS -ldld" cat > conftest.$ac_ext <<EOF -#line 8032 "configure" +#line 8036 "configure" #include "confdefs.h" #include <dl.h> int main() { shl_load ("", 0, 0); ; return 0; } EOF -if { (eval echo configure:8039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -8063,15 +8067,15 ＠＠ else ac_safe=`echo "ltdl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ltdl.h""... $ac_c" 1>&6 -echo "configure:8067: checking for ltdl.h" >&5 +echo "configure:8071: checking for ltdl.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8070 "configure" +#line 8074 "configure" #include "confdefs.h" #include <ltdl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8088,18 +8092,18 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6 -echo "configure:8092: checking for lt_dlinit in -lltdl" >&5 +echo "configure:8096: checking for lt_dlinit in -lltdl" >&5 ac_save_LIBS="$LIBS" LIBS="$LIBS -lltdl" cat > conftest.$ac_ext <<EOF -#line 8096 "configure" +#line 8100 "configure" #include "confdefs.h" #include <ltdl.h> int main() { lt_dlinit (); ; return 0; } EOF -if { (eval echo configure:8103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else ＠＠ -8140,7 +8144,7 ＠＠ xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:8144: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:8148: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; ＠＠ -8168,9 +8172,9 ＠＠ XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:8172: checking checking whether we are using GNU C" >&5 +echo "configure:8176: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <<EOF -#line 8174 "configure" +#line 8178 "configure" #include "confdefs.h" #ifdef __GNUC__ ＠＠ -8192,7 +8196,7 ＠＠ fi echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6 -echo "configure:8196: checking how to produce PIC code" >&5 +echo "configure:8200: checking how to produce PIC code" >&5 wl= can_build_shared=yes ＠＠ -8296,18 +8300,18 ＠＠ # Check to make sure the dll_cflags actually works. echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6 -echo "configure:8300: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:8304: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <<EOF -#line 8304 "configure" +#line 8308 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:8311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also ＠＠ -8338,7 +8342,7 ＠＠ xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:8342: checking if C compiler can produce shared libraries" >&5 +echo "configure:8346: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes -o "$__ICC" = yes; then case "$xehost_os" in *darwin*) ＠＠ -8397,14 +8401,14 ＠＠ xe_libs= ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' cat > conftest.$ac_ext <<EOF -#line 8401 "configure" +#line 8405 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:8408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else ＠＠ -8429,7 +8433,7 ＠＠ if test "$XEGCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:8433: checking for ld used by GCC" >&5 +echo "configure:8437: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. ＠＠ -8455,7 +8459,7 ＠＠ esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:8459: checking for GNU ld" >&5 +echo "configure:8463: checking for GNU ld" >&5 fi if test -z "$LTLD"; then ＠＠ -8493,7 +8497,7 ＠＠ # Check to see if it really is or isn't GNU ld. echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6 -echo "configure:8497: checking if the linker is GNU ld" >&5 +echo "configure:8501: checking if the linker is GNU ld" >&5 # I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then xe_gnu_ld=yes ＠＠ -8528,7 +8532,7 ＠＠ # OK - only NOW do we futz about with ld. # See if the linker supports building shared libraries. echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6 -echo "configure:8532: checking whether the linker supports shared libraries" >&5 +echo "configure:8536: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes ＠＠ -8741,10 +8745,10 ＠＠ for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8745: checking for $ac_func" >&5 +echo "configure:8749: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 8748 "configure" +#line 8752 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -8767,7 +8771,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:8771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -8831,15 +8835,15 ＠＠ for dir in "" "Tt/" "desktop/" ; do ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6 -echo "configure:8835: checking for ${dir}tt_c.h" >&5 +echo "configure:8839: checking for ${dir}tt_c.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8838 "configure" +#line 8842 "configure" #include "confdefs.h" #include <${dir}tt_c.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8875,12 +8879,12 ＠＠ xe_msg_checking="for tt_message_create in -ltt" test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:8879: checking "$xe_msg_checking"" >&5 +echo "configure:8883: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'` xe_check_libs=" -ltt $extra_libs" cat > conftest.$ac_ext <<EOF -#line 8884 "configure" +#line 8888 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8891,7 +8895,7 ＠＠ tt_message_create() ; return 0; } EOF -if { (eval echo configure:8895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -8945,15 +8949,15 ＠＠ test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6 -echo "configure:8949: checking for Dt/Dt.h" >&5 +echo "configure:8953: checking for Dt/Dt.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8952 "configure" +#line 8956 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -8976,12 +8980,12 ＠＠ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:8980: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:8984: checking for DtDndDragStart in -lDtSvc" >&5 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lDtSvc " cat > conftest.$ac_ext <<EOF -#line 8985 "configure" +#line 8989 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -8992,7 +8996,7 ＠＠ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:8996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9073,7 +9077,7 ＠＠ if test "$with_dragndrop" != "no" ; then echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:9077: checking if drag and drop API is needed" >&5 +echo "configure:9081: checking if drag and drop API is needed" >&5 if test -n "$dragndrop_proto" ; then with_dragndrop=yes echo "$ac_t""yes (${dragndrop_proto} )" 1>&6 ＠＠ -9093,19 +9097,19 ＠＠ fi echo "checking for LDAP" 1>&6 -echo "configure:9097: checking for LDAP" >&5 +echo "configure:9101: checking for LDAP" >&5 ldap_libs= test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ldap.h""... $ac_c" 1>&6 -echo "configure:9101: checking for ldap.h" >&5 +echo "configure:9105: checking for ldap.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9104 "configure" +#line 9108 "configure" #include "confdefs.h" #include <ldap.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9128,15 +9132,15 ＠＠ } test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for lber.h""... $ac_c" 1>&6 -echo "configure:9132: checking for lber.h" >&5 +echo "configure:9136: checking for lber.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9135 "configure" +#line 9139 "configure" #include "confdefs.h" #include <lber.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9160,12 +9164,12 ＠＠ if test "$with_ldap" != "no"; then echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:9164: checking for ldap_search in -lldap" >&5 +echo "configure:9168: checking for ldap_search in -lldap" >&5 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap " cat > conftest.$ac_ext <<EOF -#line 9169 "configure" +#line 9173 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9176,7 +9180,7 ＠＠ ldap_search() ; return 0; } EOF -if { (eval echo configure:9180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9200,12 +9204,12 ＠＠ xe_msg_checking="for ldap_open in -lldap" test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:9204: checking "$xe_msg_checking"" >&5 +echo "configure:9208: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber" cat > conftest.$ac_ext <<EOF -#line 9209 "configure" +#line 9213 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9216,7 +9220,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:9220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9240,12 +9244,12 ＠＠ xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:9244: checking "$xe_msg_checking"" >&5 +echo "configure:9248: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb" cat > conftest.$ac_ext <<EOF -#line 9249 "configure" +#line 9253 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9256,7 +9260,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:9260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9280,12 +9284,12 ＠＠ xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:9284: checking "$xe_msg_checking"" >&5 +echo "configure:9288: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb -ldes" cat > conftest.$ac_ext <<EOF -#line 9289 "configure" +#line 9293 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9296,7 +9300,7 ＠＠ ldap_open() ; return 0; } EOF -if { (eval echo configure:9300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9318,12 +9322,12 ＠＠ } test "$with_ldap_lber" != "yes" && { echo $ac_n "checking for ber_pvt_opt_on in -llber""... $ac_c" 1>&6 -echo "configure:9322: checking for ber_pvt_opt_on in -llber" >&5 +echo "configure:9326: checking for ber_pvt_opt_on in -llber" >&5 ac_lib_var=`echo lber'_'ber_pvt_opt_on | sed 'y%./+-%__p_%'` xe_check_libs=" -llber " cat > conftest.$ac_ext <<EOF -#line 9327 "configure" +#line 9331 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9334,7 +9338,7 ＠＠ ber_pvt_opt_on() ; return 0; } EOF -if { (eval echo configure:9338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9378,10 +9382,10 ＠＠ for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9382: checking for $ac_func" >&5 +echo "configure:9386: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 9385 "configure" +#line 9389 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -9404,7 +9408,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:9408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -9443,20 +9447,20 ＠＠ postgresql_libs= if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:9447: checking for PostgreSQL" >&5 +echo "configure:9451: checking for PostgreSQL" >&5 for header_dir in "" "pgsql/" "postgresql/"; do ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6 -echo "configure:9452: checking for ${header_dir}libpq-fe.h" >&5 +echo "configure:9456: checking for ${header_dir}libpq-fe.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9455 "configure" +#line 9459 "configure" #include "confdefs.h" #include <${header_dir}libpq-fe.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9480,12 +9484,12 ＠＠ test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:9484: checking for PQconnectdb in -lpq" >&5 +echo "configure:9488: checking for PQconnectdb in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 9489 "configure" +#line 9493 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9496,7 +9500,7 ＠＠ PQconnectdb() ; return 0; } EOF -if { (eval echo configure:9500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9529,12 +9533,12 ＠＠ echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:9533: checking for PQconnectStart in -lpq" >&5 +echo "configure:9537: checking for PQconnectStart in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 9538 "configure" +#line 9542 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9545,7 +9549,7 ＠＠ PQconnectStart() ; return 0; } EOF -if { (eval echo configure:9549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9596,7 +9600,7 ＠＠ if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:9600: checking for graphics libraries" >&5 +echo "configure:9604: checking for graphics libraries" >&5 libpath_xpm= incpath_xpm= ＠＠ -9622,10 +9626,10 ＠＠ CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:9626: checking for Xpm - no older than 3.4f" >&5 +echo "configure:9630: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 9629 "configure" +#line 9633 "configure" #include "confdefs.h" #define XPM_NUMBERS #include <X11/xpm.h> ＠＠ -9634,7 +9638,7 ＠＠ XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:9638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; xpm_status=$?; if test "$xpm_status" = "0"; then ＠＠ -9678,17 +9682,17 ＠＠ libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6 -echo "configure:9682: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:9686: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 9685 "configure" +#line 9689 "configure" #include "confdefs.h" int main() { XpmCreatePixmapFromData() ; return 0; } EOF -if { (eval echo configure:9692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else ＠＠ -9714,15 +9718,15 ＠＠ test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:9718: checking for compface.h" >&5 +echo "configure:9722: checking for compface.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9721 "configure" +#line 9725 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9745,12 +9749,12 ＠＠ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9749: checking for UnGenFace in -lcompface" >&5 +echo "configure:9753: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 9754 "configure" +#line 9758 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9761,7 +9765,7 ＠＠ UnGenFace() ; return 0; } EOF -if { (eval echo configure:9765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9810,12 +9814,12 ＠＠ if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:9814: checking for inflate in -lc" >&5 +echo "configure:9818: checking for inflate in -lc" >&5 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <<EOF -#line 9819 "configure" +#line 9823 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9826,7 +9830,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:9830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9845,12 +9849,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:9849: checking for inflate in -lz" >&5 +echo "configure:9853: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lz " cat > conftest.$ac_ext <<EOF -#line 9854 "configure" +#line 9858 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9861,7 +9865,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:9865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9880,12 +9884,12 ＠＠ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:9884: checking for inflate in -lgz" >&5 +echo "configure:9888: checking for inflate in -lgz" >&5 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lgz " cat > conftest.$ac_ext <<EOF -#line 9889 "configure" +#line 9893 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9896,7 +9900,7 ＠＠ inflate() ; return 0; } EOF -if { (eval echo configure:9900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -9926,15 +9930,15 ＠＠ test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:9930: checking for jpeglib.h" >&5 +echo "configure:9934: checking for jpeglib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 9933 "configure" +#line 9937 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -9957,12 +9961,12 ＠＠ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:9961: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:9965: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` xe_check_libs=" -ljpeg " cat > conftest.$ac_ext <<EOF -#line 9966 "configure" +#line 9970 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -9973,7 +9977,7 ＠＠ jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:9977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10009,10 +10013,10 ＠＠ png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:10013: checking for pow" >&5 +echo "configure:10017: checking for pow" >&5 cat > conftest.$ac_ext <<EOF -#line 10016 "configure" +#line 10020 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ ＠＠ -10035,7 +10039,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:10039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pow=yes" else ＠＠ -10056,15 +10060,15 ＠＠ } test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:10060: checking for png.h" >&5 +echo "configure:10064: checking for png.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10063 "configure" +#line 10067 "configure" #include "confdefs.h" #include <png.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10087,12 +10091,12 ＠＠ } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:10091: checking for png_read_image in -lpng" >&5 +echo "configure:10095: checking for png_read_image in -lpng" >&5 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'` xe_check_libs=" -lpng " cat > conftest.$ac_ext <<EOF -#line 10096 "configure" +#line 10100 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10103,7 +10107,7 ＠＠ png_read_image() ; return 0; } EOF -if { (eval echo configure:10107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10126,10 +10130,10 ＠＠ } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:10130: checking for workable png version information" >&5 +echo "configure:10134: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext <<EOF -#line 10133 "configure" +#line 10137 "configure" #include "confdefs.h" #include <png.h> int main(int c, char **v) { ＠＠ -10137,7 +10141,7 ＠＠ if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;} EOF -if { (eval echo configure:10141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:10145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; png_status=$?; if test "$png_status" = "0"; then ＠＠ -10180,15 +10184,15 ＠＠ test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:10184: checking for tiffio.h" >&5 +echo "configure:10188: checking for tiffio.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10187 "configure" +#line 10191 "configure" #include "confdefs.h" #include <tiffio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10211,12 +10215,12 ＠＠ } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:10215: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:10219: checking for TIFFClientOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'` xe_check_libs=" -ltiff " cat > conftest.$ac_ext <<EOF -#line 10220 "configure" +#line 10224 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10227,7 +10231,7 ＠＠ TIFFClientOpen() ; return 0; } EOF -if { (eval echo configure:10231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10266,15 +10270,15 ＠＠ if test "$with_gtk" = "yes"; then test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:10270: checking for compface.h" >&5 +echo "configure:10274: checking for compface.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10273 "configure" +#line 10277 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10297,12 +10301,12 ＠＠ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:10301: checking for UnGenFace in -lcompface" >&5 +echo "configure:10305: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 10306 "configure" +#line 10310 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10313,7 +10317,7 ＠＠ UnGenFace() ; return 0; } EOF -if { (eval echo configure:10317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10352,7 +10356,7 ＠＠ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:10356: checking for X11 graphics libraries" >&5 +echo "configure:10360: checking for X11 graphics libraries" >&5 fi case "$with_widgets" in ＠＠ -10362,7 +10366,7 ＠＠ if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then echo "checking for the Athena widgets" 1>&6 -echo "configure:10366: checking for the Athena widgets" >&5 +echo "configure:10370: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; ＠＠ -10376,12 +10380,12 ＠＠ if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10380: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:10384: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 10385 "configure" +#line 10389 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10392,7 +10396,7 ＠＠ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:10396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10408,12 +10412,12 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10412: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:10416: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 10417 "configure" +#line 10421 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10424,7 +10428,7 ＠＠ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:10428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10455,12 +10459,12 ＠＠ else echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10459: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:10463: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <<EOF -#line 10464 "configure" +#line 10468 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10471,7 +10475,7 ＠＠ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:10475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10489,12 +10493,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6 -echo "configure:10493: checking for threeDClassRec in -lXaw" >&5 +echo "configure:10497: checking for threeDClassRec in -lXaw" >&5 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <<EOF -#line 10498 "configure" +#line 10502 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10505,7 +10509,7 ＠＠ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:10509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10536,15 +10540,15 ＠＠ if test "$athena_3d" = "no"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10540: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:10544: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10543 "configure" +#line 10547 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10564,15 +10568,15 ＠＠ echo "$ac_t""no" 1>&6 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6 -echo "configure:10568: checking for X11/Xaw/XawInit.h" >&5 +echo "configure:10572: checking for X11/Xaw/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10571 "configure" +#line 10575 "configure" #include "confdefs.h" #include <X11/Xaw/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10598,15 +10602,15 ＠＠ else ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:10602: checking for X11/$athena_variant/XawInit.h" >&5 +echo "configure:10606: checking for X11/$athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10605 "configure" +#line 10609 "configure" #include "confdefs.h" #include <X11/$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10623,15 +10627,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10627: checking for X11/$athena_variant/ThreeD.h" >&5 +echo "configure:10631: checking for X11/$athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10630 "configure" +#line 10634 "configure" #include "confdefs.h" #include <X11/$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10659,15 +10663,15 ＠＠ if test -z "$athena_h_path"; then ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:10663: checking for $athena_variant/XawInit.h" >&5 +echo "configure:10667: checking for $athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10666 "configure" +#line 10670 "configure" #include "confdefs.h" #include <$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10684,15 +10688,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10688: checking for $athena_variant/ThreeD.h" >&5 +echo "configure:10692: checking for $athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10691 "configure" +#line 10695 "configure" #include "confdefs.h" #include <$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10721,15 +10725,15 ＠＠ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:10725: checking for X11/Xaw3d/XawInit.h" >&5 +echo "configure:10729: checking for X11/Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10728 "configure" +#line 10732 "configure" #include "confdefs.h" #include <X11/Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10746,15 +10750,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10750: checking for X11/Xaw3d/ThreeD.h" >&5 +echo "configure:10754: checking for X11/Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10753 "configure" +#line 10757 "configure" #include "confdefs.h" #include <X11/Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10786,15 +10790,15 ＠＠ if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:10790: checking for Xaw3d/XawInit.h" >&5 +echo "configure:10794: checking for Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10793 "configure" +#line 10797 "configure" #include "confdefs.h" #include <Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10811,15 +10815,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10815: checking for Xaw3d/ThreeD.h" >&5 +echo "configure:10819: checking for Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10818 "configure" +#line 10822 "configure" #include "confdefs.h" #include <Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10851,15 +10855,15 ＠＠ if test -z "$athena_h_path"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:10855: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:10859: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10858 "configure" +#line 10862 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10898,15 +10902,15 ＠＠ if test "$with_x11" = "yes"; then ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:10902: checking for Xm/Xm.h" >&5 +echo "configure:10906: checking for Xm/Xm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 10905 "configure" +#line 10909 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -10923,12 +10927,12 ＠＠ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:10927: checking for XmStringFree in -lXm" >&5 +echo "configure:10931: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 10932 "configure" +#line 10936 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -10939,7 +10943,7 ＠＠ XmStringFree() ; return 0; } EOF -if { (eval echo configure:10943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -10968,9 +10972,9 ＠＠ if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:10972: checking for Lesstif" >&5 +echo "configure:10976: checking for Lesstif" >&5 cat > conftest.$ac_ext <<EOF -#line 10974 "configure" +#line 10978 "configure" #include "confdefs.h" #include <Xm/Xm.h> #ifdef LESSTIF_VERSION ＠＠ -11343,7 +11347,7 ＠＠ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:11347: checking for Mule-related features" >&5 +echo "configure:11351: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF ＠＠ -11357,15 +11361,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11361: checking for $ac_hdr" >&5 +echo "configure:11365: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 11364 "configure" +#line 11368 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11396,12 +11400,12 ＠＠ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:11400: checking for strerror in -lintl" >&5 +echo "configure:11404: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <<EOF -#line 11405 "configure" +#line 11409 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11412,7 +11416,7 ＠＠ strerror() ; return 0; } EOF -if { (eval echo configure:11416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11445,18 +11449,18 ＠＠ echo "checking for Mule input methods" 1>&6 -echo "configure:11449: checking for Mule input methods" >&5 +echo "configure:11453: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:11452: checking for XIM" >&5 +echo "configure:11456: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:11455: checking for XOpenIM in -lX11" >&5 +echo "configure:11459: checking for XOpenIM in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 11460 "configure" +#line 11464 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11467,7 +11471,7 ＠＠ XOpenIM() ; return 0; } EOF -if { (eval echo configure:11471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11491,12 +11495,12 ＠＠ if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:11495: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:11499: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 11500 "configure" +#line 11504 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11507,7 +11511,7 ＠＠ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:11511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11572,15 +11576,15 ＠＠ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:11576: checking for XFontSet" >&5 +echo "configure:11580: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:11579: checking for XmbDrawString in -lX11" >&5 +echo "configure:11583: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 11584 "configure" +#line 11588 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11591,7 +11595,7 ＠＠ XmbDrawString() ; return 0; } EOF -if { (eval echo configure:11595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11631,15 +11635,15 ＠＠ test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 -echo "configure:11635: checking for wnn/jllib.h" >&5 +echo "configure:11639: checking for wnn/jllib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 11638 "configure" +#line 11642 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11662,15 +11666,15 ＠＠ } test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6 -echo "configure:11666: checking for wnn/commonhd.h" >&5 +echo "configure:11670: checking for wnn/commonhd.h" >&5 cat > conftest.$ac_ext <<EOF -#line 11669 "configure" +#line 11673 "configure" #include "confdefs.h" #include <wnn/commonhd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -11695,10 +11699,10 ＠＠ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11699: checking for $ac_func" >&5 +echo "configure:11703: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 11702 "configure" +#line 11706 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -11721,7 +11725,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:11725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -11750,12 +11754,12 ＠＠ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:11754: checking for crypt in -lcrypt" >&5 +echo "configure:11758: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <<EOF -#line 11759 "configure" +#line 11763 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11766,7 +11770,7 ＠＠ crypt() ; return 0; } EOF -if { (eval echo configure:11770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11801,12 +11805,12 ＠＠ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:11805: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:11809: checking for jl_dic_list_e in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <<EOF -#line 11810 "configure" +#line 11814 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11817,7 +11821,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11835,12 +11839,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:11839: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:11843: checking for jl_dic_list_e in -lwnn4" >&5 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn4 " cat > conftest.$ac_ext <<EOF -#line 11844 "configure" +#line 11848 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11851,7 +11855,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11869,12 +11873,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:11873: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:11877: checking for jl_dic_list_e in -lwnn6" >&5 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6 " cat > conftest.$ac_ext <<EOF -#line 11878 "configure" +#line 11882 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11885,7 +11889,7 ＠＠ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11903,12 +11907,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:11907: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:11911: checking for dic_list_e in -lwnn6_fromsrc" >&5 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6_fromsrc " cat > conftest.$ac_ext <<EOF -#line 11912 "configure" +#line 11916 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11919,7 +11923,7 ＠＠ dic_list_e() ; return 0; } EOF -if { (eval echo configure:11923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -11964,12 +11968,12 ＠＠ if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:11968: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:11972: checking for jl_fi_dic_list in -l$libwnn" >&5 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -l$libwnn " cat > conftest.$ac_ext <<EOF -#line 11973 "configure" +#line 11977 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -11980,7 +11984,7 ＠＠ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:11984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -12015,15 +12019,15 ＠＠ if test "$with_canna" != "no"; then ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:12019: checking for canna/jrkanji.h" >&5 +echo "configure:12023: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12022 "configure" +#line 12026 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12050,15 +12054,15 ＠＠ c_switch_site="$c_switch_site -I/usr/local/canna/include" ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:12054: checking for canna/jrkanji.h" >&5 +echo "configure:12058: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12057 "configure" +#line 12061 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12086,15 +12090,15 ＠＠ test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:12090: checking for canna/RK.h" >&5 +echo "configure:12094: checking for canna/RK.h" >&5 cat > conftest.$ac_ext <<EOF -#line 12093 "configure" +#line 12097 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12117,12 +12121,12 ＠＠ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:12121: checking for RkBgnBun in -lRKC" >&5 +echo "configure:12125: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <<EOF -#line 12126 "configure" +#line 12130 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -12133,7 +12137,7 ＠＠ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:12137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -12156,12 +12160,12 ＠＠ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:12160: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:12164: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <<EOF -#line 12165 "configure" +#line 12169 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -12172,7 +12176,7 ＠＠ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:12176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -12218,12 +12222,12 ＠＠ libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:12222: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:12226: checking for layout_object_getvalue in -li18n" >&5 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'` xe_check_libs=" -li18n " cat > conftest.$ac_ext <<EOF -#line 12227 "configure" +#line 12231 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -12234,7 +12238,7 ＠＠ layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:12238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -12318,13 +12322,13 ＠＠ fi -for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen +for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen XtRegisterDrawable do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12325: checking for $ac_func" >&5 +echo "configure:12329: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12328 "configure" +#line 12332 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12347,7 +12351,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -12388,10 +12392,10 ＠＠ for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12392: checking for $ac_func" >&5 +echo "configure:12396: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12395 "configure" +#line 12399 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12414,7 +12418,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -12443,10 +12447,10 ＠＠ echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:12447: checking for openpty" >&5 +echo "configure:12451: checking for openpty" >&5 cat > conftest.$ac_ext <<EOF -#line 12450 "configure" +#line 12454 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char openpty(); below. */ ＠＠ -12469,7 +12473,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_openpty=yes" else ＠＠ -12488,12 +12492,12 ＠＠ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:12492: checking for openpty in -lutil" >&5 +echo "configure:12496: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` xe_check_libs=" -lutil " cat > conftest.$ac_ext <<EOF -#line 12497 "configure" +#line 12501 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -12504,7 +12508,7 ＠＠ openpty() ; return 0; } EOF -if { (eval echo configure:12508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -12539,15 +12543,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12543: checking for $ac_hdr" >&5 +echo "configure:12547: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12546 "configure" +#line 12550 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12584,15 +12588,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12588: checking for $ac_hdr" >&5 +echo "configure:12592: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12591 "configure" +#line 12595 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12625,15 +12629,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12629: checking for $ac_hdr" >&5 +echo "configure:12633: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12632 "configure" +#line 12636 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12666,15 +12670,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12670: checking for $ac_hdr" >&5 +echo "configure:12674: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12673 "configure" +#line 12677 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12710,15 +12714,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12714: checking for $ac_hdr" >&5 +echo "configure:12718: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12717 "configure" +#line 12721 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12751,10 +12755,10 ＠＠ for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12755: checking for $ac_func" >&5 +echo "configure:12759: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12758 "configure" +#line 12762 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12777,7 +12781,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -12808,15 +12812,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12812: checking for $ac_hdr" >&5 +echo "configure:12816: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12815 "configure" +#line 12819 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12849,10 +12853,10 ＠＠ for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12853: checking for $ac_func" >&5 +echo "configure:12857: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 12856 "configure" +#line 12860 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -12875,7 +12879,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:12879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -12908,15 +12912,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12912: checking for $ac_hdr" >&5 +echo "configure:12916: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 12915 "configure" +#line 12919 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -12952,12 +12956,12 ＠＠ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:12956: checking for kstat_open in -lkstat" >&5 +echo "configure:12960: checking for kstat_open in -lkstat" >&5 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lkstat " cat > conftest.$ac_ext <<EOF -#line 12961 "configure" +#line 12965 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -12968,7 +12972,7 ＠＠ kstat_open() ; return 0; } EOF -if { (eval echo configure:12972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -13003,15 +13007,15 ＠＠ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13007: checking for $ac_hdr" >&5 +echo "configure:13011: checking for $ac_hdr" >&5 cat > conftest.$ac_ext <<EOF -#line 13010 "configure" +#line 13014 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -13043,12 +13047,12 ＠＠ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:13047: checking for kvm_read in -lkvm" >&5 +echo "configure:13051: checking for kvm_read in -lkvm" >&5 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` xe_check_libs=" -lkvm " cat > conftest.$ac_ext <<EOF -#line 13052 "configure" +#line 13056 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -13059,7 +13063,7 ＠＠ kvm_read() ; return 0; } EOF -if { (eval echo configure:13063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -13093,16 +13097,16 ＠＠ fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:13097: checking whether netdb declares h_errno" >&5 +echo "configure:13101: checking whether netdb declares h_errno" >&5 cat > conftest.$ac_ext <<EOF -#line 13099 "configure" +#line 13103 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:13106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF ＠＠ -13122,16 +13126,16 ＠＠ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:13126: checking for sigsetjmp" >&5 +echo "configure:13130: checking for sigsetjmp" >&5 cat > conftest.$ac_ext <<EOF -#line 13128 "configure" +#line 13132 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:13135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF ＠＠ -13151,11 +13155,11 ＠＠ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:13155: checking whether localtime caches TZ" >&5 +echo "configure:13159: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 13159 "configure" +#line 13163 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS ＠＠ -13190,7 +13194,7 ＠＠ exit (0); } EOF -if { (eval echo configure:13194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else ＠＠ -13220,9 +13224,9 ＠＠ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:13224: checking whether gettimeofday accepts one or two arguments" >&5 +echo "configure:13228: checking whether gettimeofday accepts one or two arguments" >&5 cat > conftest.$ac_ext <<EOF -#line 13226 "configure" +#line 13230 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME ＠＠ -13243,7 +13247,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""two" 1>&6 else ＠＠ -13265,19 +13269,19 ＠＠ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:13269: checking for inline" >&5 +echo "configure:13273: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 13274 "configure" +#line 13278 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:13281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else ＠＠ -13314,16 +13318,16 ＠＠ fi echo $ac_n "checking for typeof""... $ac_c" 1>&6 -echo "configure:13318: checking for typeof" >&5 +echo "configure:13322: checking for typeof" >&5 cat > conftest.$ac_ext <<EOF -#line 13320 "configure" +#line 13324 "configure" #include "confdefs.h" int main() { int i; __typeof__(i) j; ; return 0; } EOF -if { (eval echo configure:13327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* typeofname="__typeof__" else ＠＠ -13331,14 +13335,14 ＠＠ cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 13335 "configure" +#line 13339 "configure" #include "confdefs.h" int main() { int i; typeof(i) j; ; return 0; } EOF -if { (eval echo configure:13342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* typeofname="typeof" else ＠＠ -13367,17 +13371,17 ＠＠ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:13371: checking for working alloca.h" >&5 +echo "configure:13375: checking for working alloca.h" >&5 cat > conftest.$ac_ext <<EOF -#line 13374 "configure" +#line 13378 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:13381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else ＠＠ -13401,10 +13405,10 ＠＠ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:13405: checking for alloca" >&5 +echo "configure:13409: checking for alloca" >&5 cat > conftest.$ac_ext <<EOF -#line 13408 "configure" +#line 13412 "configure" #include "confdefs.h" #ifdef __GNUC__ ＠＠ -13432,7 +13436,7 ＠＠ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:13436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else ＠＠ -13471,10 +13475,10 ＠＠ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:13475: checking whether alloca needs Cray hooks" >&5 +echo "configure:13479: checking whether alloca needs Cray hooks" >&5 cat > conftest.$ac_ext <<EOF -#line 13478 "configure" +#line 13482 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray ＠＠ -13498,10 +13502,10 ＠＠ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13502: checking for $ac_func" >&5 +echo "configure:13506: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 13505 "configure" +#line 13509 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -13524,7 +13528,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -13554,10 +13558,10 ＠＠ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:13558: checking stack direction for C alloca" >&5 +echo "configure:13562: checking stack direction for C alloca" >&5 cat > conftest.$ac_ext <<EOF -#line 13561 "configure" +#line 13565 "configure" #include "confdefs.h" find_stack_direction () { ＠＠ -13576,7 +13580,7 ＠＠ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:13580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else ＠＠ -13605,9 +13609,9 ＠＠ fi echo $ac_n "checking for working alloca in function calls""... $ac_c" 1>&6 -echo "configure:13609: checking for working alloca in function calls" >&5 +echo "configure:13613: checking for working alloca in function calls" >&5 cat > conftest.$ac_ext <<EOF -#line 13611 "configure" +#line 13615 "configure" #include "confdefs.h" #if defined (__CYGWIN__) ＠＠ -13660,7 +13664,7 ＠＠ } EOF -if { (eval echo configure:13664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then working_alloca_in_function_calls=yes else ＠＠ -13683,9 +13687,9 ＠＠ echo $ac_n "checking for working scanf""... $ac_c" 1>&6 -echo "configure:13687: checking for working scanf" >&5 +echo "configure:13691: checking for working scanf" >&5 cat > conftest.$ac_ext <<EOF -#line 13689 "configure" +#line 13693 "configure" #include "confdefs.h" int ＠＠ -13700,7 +13704,7 ＠＠ } EOF -if { (eval echo configure:13704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then working_scanf=yes else ＠＠ -13723,10 +13727,10 ＠＠ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:13727: checking for working strcoll" >&5 +echo "configure:13731: checking for working strcoll" >&5 cat > conftest.$ac_ext <<EOF -#line 13730 "configure" +#line 13734 "configure" #include "confdefs.h" #include <string.h> main () ＠＠ -13736,7 +13740,7 ＠＠ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:13740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else ＠＠ -13764,10 +13768,10 ＠＠ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13768: checking for $ac_func" >&5 +echo "configure:13772: checking for $ac_func" >&5 cat > conftest.$ac_ext <<EOF -#line 13771 "configure" +#line 13775 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ ＠＠ -13790,7 +13794,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ＠＠ -13818,10 +13822,10 ＠＠ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:13822: checking whether getpgrp takes no argument" >&5 +echo "configure:13826: checking whether getpgrp takes no argument" >&5 cat > conftest.$ac_ext <<EOF -#line 13825 "configure" +#line 13829 "configure" #include "confdefs.h" /* ＠＠ -13876,7 +13880,7 ＠＠ } EOF -if { (eval echo configure:13880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else ＠＠ -13903,10 +13907,10 ＠＠ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:13907: checking for working mmap" >&5 +echo "configure:13911: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 13910 "configure" +#line 13914 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> ＠＠ -13939,7 +13943,7 ＠＠ return 1; } EOF -if { (eval echo configure:13943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else ＠＠ -13968,9 +13972,9 ＠＠ if test "$rel_alloc $have_mmap" = "default yes"; then if test "$doug_lea_malloc" = "yes"; then echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6 -echo "configure:13972: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:13976: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext <<EOF -#line 13974 "configure" +#line 13978 "configure" #include "confdefs.h" #include <malloc.h> int main() { ＠＠ -13982,7 +13986,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:13986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else ＠＠ -14007,15 +14011,15 ＠＠ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:14011: checking for termios.h" >&5 +echo "configure:14015: checking for termios.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14014 "configure" +#line 14018 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14058,15 +14062,15 ＠＠ echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:14062: checking for termio.h" >&5 +echo "configure:14066: checking for termio.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14065 "configure" +#line 14069 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14098,10 +14102,10 ＠＠ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:14102: checking for socket" >&5 +echo "configure:14106: checking for socket" >&5 cat > conftest.$ac_ext <<EOF -#line 14105 "configure" +#line 14109 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ ＠＠ -14124,7 +14128,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else ＠＠ -14139,15 +14143,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:14143: checking for netinet/in.h" >&5 +echo "configure:14147: checking for netinet/in.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14146 "configure" +#line 14150 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14164,15 +14168,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:14168: checking for arpa/inet.h" >&5 +echo "configure:14172: checking for arpa/inet.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14171 "configure" +#line 14175 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14197,9 +14201,9 ＠＠ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:14201: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:14205: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 14203 "configure" +#line 14207 "configure" #include "confdefs.h" #include <sys/types.h> ＠＠ -14210,7 +14214,7 ＠＠ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:14214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN ＠＠ -14228,9 +14232,9 ＠＠ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:14232: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:14236: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext <<EOF -#line 14234 "configure" +#line 14238 "configure" #include "confdefs.h" #include <sys/types.h> ＠＠ -14240,7 +14244,7 ＠＠ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:14244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MULTICAST ＠＠ -14271,10 +14275,10 ＠＠ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:14275: checking for msgget" >&5 +echo "configure:14279: checking for msgget" >&5 cat > conftest.$ac_ext <<EOF -#line 14278 "configure" +#line 14282 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ ＠＠ -14297,7 +14301,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else ＠＠ -14312,15 +14316,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:14316: checking for sys/ipc.h" >&5 +echo "configure:14320: checking for sys/ipc.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14319 "configure" +#line 14323 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14337,15 +14341,15 ＠＠ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:14341: checking for sys/msg.h" >&5 +echo "configure:14345: checking for sys/msg.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14344 "configure" +#line 14348 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14383,15 +14387,15 ＠＠ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:14387: checking for dirent.h" >&5 +echo "configure:14391: checking for dirent.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14390 "configure" +#line 14394 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14418,15 +14422,15 ＠＠ echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:14422: checking for sys/dir.h" >&5 +echo "configure:14426: checking for sys/dir.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14425 "configure" +#line 14429 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14459,15 +14463,15 ＠＠ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:14463: checking for nlist.h" >&5 +echo "configure:14467: checking for nlist.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14466 "configure" +#line 14470 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14497,22 +14501,22 ＠＠ echo "checking "for sound support"" 1>&6 -echo "configure:14501: checking "for sound support"" >&5 +echo "configure:14505: checking "for sound support"" >&5 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes if test "$with_native_sound" != "no"; then if test -n "$native_sound_lib"; then ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6 -echo "configure:14508: checking for multimedia/audio_device.h" >&5 +echo "configure:14512: checking for multimedia/audio_device.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14511 "configure" +#line 14515 "configure" #include "confdefs.h" #include <multimedia/audio_device.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14568,12 +14572,12 ＠＠ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:14572: checking for ALopenport in -laudio" >&5 +echo "configure:14576: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 14577 "configure" +#line 14581 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14584,7 +14588,7 ＠＠ ALopenport() ; return 0; } EOF -if { (eval echo configure:14588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14615,12 +14619,12 ＠＠ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:14619: checking for AOpenAudio in -lAlib" >&5 +echo "configure:14623: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <<EOF -#line 14624 "configure" +#line 14628 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14631,7 +14635,7 ＠＠ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:14635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14679,15 +14683,15 ＠＠ for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:14683: checking for ${dir}/soundcard.h" >&5 +echo "configure:14687: checking for ${dir}/soundcard.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14686 "configure" +#line 14690 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14729,12 +14733,12 ＠＠ if test "$opsys" = "netbsd" ; then echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6 -echo "configure:14733: checking for _oss_ioctl in -lossaudio" >&5 +echo "configure:14737: checking for _oss_ioctl in -lossaudio" >&5 ac_lib_var=`echo ossaudio'_'_oss_ioctl | sed 'y%./+-%__p_%'` xe_check_libs=" -lossaudio " cat > conftest.$ac_ext <<EOF -#line 14738 "configure" +#line 14742 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14745,7 +14749,7 ＠＠ _oss_ioctl() ; return 0; } EOF -if { (eval echo configure:14749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14784,15 +14788,15 ＠＠ if test "$with_nas_sound" != "no"; then ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6 -echo "configure:14788: checking for audio/audiolib.h" >&5 +echo "configure:14792: checking for audio/audiolib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 14791 "configure" +#line 14795 "configure" #include "confdefs.h" #include <audio/audiolib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -14810,12 +14814,12 ＠＠ echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:14814: checking for AuOpenServer in -laudio" >&5 +echo "configure:14818: checking for AuOpenServer in -laudio" >&5 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 14819 "configure" +#line 14823 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -14826,7 +14830,7 ＠＠ AuOpenServer() ; return 0; } EOF -if { (eval echo configure:14830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -14865,7 +14869,7 ＠＠ fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext <<EOF -#line 14869 "configure" +#line 14873 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF ＠＠ -14896,7 +14900,7 ＠＠ # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14900: checking for $ac_word" >&5 +echo "configure:14904: checking for $ac_word" >&5 if test -n "$have_esd_config"; then ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test. ＠＠ -14925,10 +14929,10 ＠＠ c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6 -echo "configure:14929: checking for esd_play_stream" >&5 +echo "configure:14933: checking for esd_play_stream" >&5 cat > conftest.$ac_ext <<EOF -#line 14932 "configure" +#line 14936 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char esd_play_stream(); below. */ ＠＠ -14951,7 +14955,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:14955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_esd_play_stream=yes" else ＠＠ -15002,7 +15006,7 ＠＠ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:15006: checking for TTY-related features" >&5 +echo "configure:15010: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF ＠＠ -15015,12 +15019,12 ＠＠ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:15019: checking for tgetent in -lncurses" >&5 +echo "configure:15023: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <<EOF -#line 15024 "configure" +#line 15028 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15031,7 +15035,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:15035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15064,15 +15068,15 ＠＠ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:15068: checking for ncurses/curses.h" >&5 +echo "configure:15072: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15071 "configure" +#line 15075 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15094,15 +15098,15 ＠＠ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:15098: checking for ncurses/term.h" >&5 +echo "configure:15102: checking for ncurses/term.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15101 "configure" +#line 15105 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15132,15 +15136,15 ＠＠ c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:15136: checking for ncurses/curses.h" >&5 +echo "configure:15140: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15139 "configure" +#line 15143 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15175,12 +15179,12 ＠＠ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:15179: checking for tgetent in -l$lib" >&5 +echo "configure:15183: checking for tgetent in -l$lib" >&5 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -l$lib " cat > conftest.$ac_ext <<EOF -#line 15184 "configure" +#line 15188 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15191,7 +15195,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:15195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15222,12 +15226,12 ＠＠ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:15226: checking for tgetent in -lcurses" >&5 +echo "configure:15230: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lcurses " cat > conftest.$ac_ext <<EOF -#line 15231 "configure" +#line 15235 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15238,7 +15242,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:15242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15256,12 +15260,12 ＠＠ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:15260: checking for tgetent in -ltermcap" >&5 +echo "configure:15264: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <<EOF -#line 15265 "configure" +#line 15269 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15272,7 +15276,7 ＠＠ tgetent() ; return 0; } EOF -if { (eval echo configure:15276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15321,15 +15325,15 ＠＠ if test "$with_gpm" != "no"; then ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:15325: checking for gpm.h" >&5 +echo "configure:15329: checking for gpm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15328 "configure" +#line 15332 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15347,12 +15351,12 ＠＠ echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:15351: checking for Gpm_Open in -lgpm" >&5 +echo "configure:15355: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgpm " cat > conftest.$ac_ext <<EOF -#line 15356 "configure" +#line 15360 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15363,7 +15367,7 ＠＠ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:15367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15415,20 +15419,20 ＠＠ test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:15419: checking for database support" >&5 +echo "configure:15423: checking for database support" >&5 if test "$with_database_gdbm $with_database_dbm" != "no no"; then ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6 -echo "configure:15424: checking for ndbm.h" >&5 +echo "configure:15428: checking for ndbm.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15427 "configure" +#line 15431 "configure" #include "confdefs.h" #include <ndbm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15458,12 +15462,12 ＠＠ if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:15462: checking for dbm_open in -lgdbm" >&5 +echo "configure:15466: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdbm " cat > conftest.$ac_ext <<EOF -#line 15467 "configure" +#line 15471 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15474,7 +15478,7 ＠＠ dbm_open() ; return 0; } EOF -if { (eval echo configure:15478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15502,10 +15506,10 ＠＠ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:15506: checking for dbm_open" >&5 +echo "configure:15510: checking for dbm_open" >&5 cat > conftest.$ac_ext <<EOF -#line 15509 "configure" +#line 15513 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ ＠＠ -15528,7 +15532,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:15532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else ＠＠ -15547,12 +15551,12 ＠＠ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:15551: checking for dbm_open in -ldbm" >&5 +echo "configure:15555: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -ldbm " cat > conftest.$ac_ext <<EOF -#line 15556 "configure" +#line 15560 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15563,7 +15567,7 ＠＠ dbm_open() ; return 0; } EOF -if { (eval echo configure:15567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15604,10 +15608,10 ＠＠ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:15608: checking for Berkeley db.h" >&5 +echo "configure:15612: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 15611 "configure" +#line 15615 "configure" #include "confdefs.h" #include <stdlib.h> ＠＠ -15629,7 +15633,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:15633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else ＠＠ -15645,9 +15649,9 ＠＠ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:15649: checking for Berkeley DB version" >&5 +echo "configure:15653: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext <<EOF -#line 15651 "configure" +#line 15655 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 1 ＠＠ -15659,7 +15663,7 ＠＠ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 15663 "configure" +#line 15667 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 2 ＠＠ -15671,7 +15675,7 ＠＠ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 15675 "configure" +#line 15679 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 3 ＠＠ -15705,10 +15709,10 ＠＠ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:15709: checking for $dbfunc" >&5 +echo "configure:15713: checking for $dbfunc" >&5 cat > conftest.$ac_ext <<EOF -#line 15712 "configure" +#line 15716 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $dbfunc(); below. */ ＠＠ -15731,7 +15735,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:15735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$dbfunc=yes" else ＠＠ -15750,12 +15754,12 ＠＠ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:15754: checking for $dbfunc in -ldb" >&5 +echo "configure:15758: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <<EOF -#line 15759 "configure" +#line 15763 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15766,7 +15770,7 ＠＠ $dbfunc() ; return 0; } EOF -if { (eval echo configure:15770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15800,12 +15804,12 ＠＠ echo "configure: warning: "db_create is really $dbfunc"" 1>&2 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:15804: checking for $dbfunc in -ldb" >&5 +echo "configure:15808: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <<EOF -#line 15809 "configure" +#line 15813 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15816,7 +15820,7 ＠＠ $dbfunc() ; return 0; } EOF -if { (eval echo configure:15820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15875,12 +15879,12 ＠＠ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:15879: checking for SOCKSinit in -lsocks" >&5 +echo "configure:15883: checking for SOCKSinit in -lsocks" >&5 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocks " cat > conftest.$ac_ext <<EOF -#line 15884 "configure" +#line 15888 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15891,7 +15895,7 ＠＠ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:15895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -15947,15 +15951,15 ＠＠ if test "$use_number_lib" = "gmp"; then ac_safe=`echo "gmp.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:15951: checking for gmp.h" >&5 +echo "configure:15955: checking for gmp.h" >&5 cat > conftest.$ac_ext <<EOF -#line 15954 "configure" +#line 15958 "configure" #include "confdefs.h" #include <gmp.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -15973,12 +15977,12 ＠＠ echo $ac_n "checking for __gmpz_init in -lgmp""... $ac_c" 1>&6 -echo "configure:15977: checking for __gmpz_init in -lgmp" >&5 +echo "configure:15981: checking for __gmpz_init in -lgmp" >&5 ac_lib_var=`echo gmp'_'__gmpz_init | sed 'y%./+-%__p_%'` xe_check_libs=" -lgmp " cat > conftest.$ac_ext <<EOF -#line 15982 "configure" +#line 15986 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -15989,7 +15993,7 ＠＠ __gmpz_init() ; return 0; } EOF -if { (eval echo configure:15993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -16038,15 +16042,15 ＠＠ for library in "" "-lcrypto"; do ac_safe=`echo "mp.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for mp.h""... $ac_c" 1>&6 -echo "configure:16042: checking for mp.h" >&5 +echo "configure:16046: checking for mp.h" >&5 cat > conftest.$ac_ext <<EOF -#line 16045 "configure" +#line 16049 "configure" #include "confdefs.h" #include <mp.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ＠＠ -16066,12 +16070,12 ＠＠ xe_msg_checking="for mp_mfree in -lmp" test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:16070: checking "$xe_msg_checking"" >&5 +echo "configure:16074: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo mp'_'mp_mfree | sed 'y%./+-%__p_%'` xe_check_libs=" -lmp $library" cat > conftest.$ac_ext <<EOF -#line 16075 "configure" +#line 16079 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -16082,7 +16086,7 ＠＠ mp_mfree() ; return 0; } EOF -if { (eval echo configure:16086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -16103,12 +16107,12 ＠＠ xe_msg_checking="for mfree in -lmp" test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:16107: checking "$xe_msg_checking"" >&5 +echo "configure:16111: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo mp'_'mfree | sed 'y%./+-%__p_%'` xe_check_libs=" -lmp $library" cat > conftest.$ac_ext <<EOF -#line 16112 "configure" +#line 16116 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 ＠＠ -16119,7 +16123,7 ＠＠ mfree() ; return 0; } EOF -if { (eval echo configure:16123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else ＠＠ -16161,10 +16165,10 ＠＠ LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi fi echo $ac_n "checking for mp_move""... $ac_c" 1>&6 -echo "configure:16165: checking for mp_move" >&5 +echo "configure:16169: checking for mp_move" >&5 cat > conftest.$ac_ext <<EOF -#line 16168 "configure" +#line 16172 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mp_move(); below. */ ＠＠ -16187,7 +16191,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:16191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_mp_move=yes" else ＠＠ -16218,10 +16222,10 ＠＠ LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi fi echo $ac_n "checking for move""... $ac_c" 1>&6 -echo "configure:16222: checking for move" >&5 +echo "configure:16226: checking for move" >&5 cat > conftest.$ac_ext <<EOF -#line 16225 "configure" +#line 16229 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char move(); below. */ ＠＠ -16244,7 +16248,7 ＠＠ ; return 0; } EOF -if { (eval echo configure:16248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_move=yes" else ＠＠ -16291,11 +16295,11 ＠＠ fi cat > conftest.$ac_ext <<EOF -#line 16295 "configure" +#line 16299 "configure" #include "confdefs.h" int main(int c,char *v[]){return 0;} EOF -if { (eval echo configure:16299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:16303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else Index: configure.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v retrieving revision 1.239 diff -u -u -r1.239 configure.in --- configure.in 2005/02/22 07:15:59 1.239 +++ configure.in 2005/03/01 22:00:24 ＠＠ -4306,10 +4306,10 ＠＠ fi dnl ---------------------------------------------------------------- -dnl Check for POSIX functions. +dnl Check for POSIX functions, and one Xt function. dnl ---------------------------------------------------------------- -AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) +AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen XtRegisterDrawable) dnl getaddrinfo() is borked under hpux11 if test "$ac_cv_func_getaddrinfo" != "no" ; then Index: src/config.h.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v retrieving revision 1.97 diff -u -u -r1.97 config.h.in --- src/config.h.in 2005/02/22 07:16:16 1.97 +++ src/config.h.in 2005/03/01 22:00:56 ＠＠ -412,6 +412,7 ＠＠ #undef HAVE_WAITPID #undef HAVE_WCSCMP #undef HAVE_WCSLEN +#undef HAVE_XTREGISTERDRAWABLE #undef HAVE_UTIME #undef HAVE_UTIMES Index: src/select-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/select-x.c,v retrieving revision 1.20 diff -u -u -r1.20 select-x.c --- src/select-x.c 2005/02/28 23:46:52 1.20 +++ src/select-x.c 2005/03/01 22:00:56 ＠＠ -527,6 +527,10 ＠＠ } else { +#ifndef HAVE_XTREGISTERDRAWABLE + invalid_operation("your Xt library sucks too much to transfer this " + "much data!"); +#else /* Send an INCR selection. */ int prop_id; Widget widget = FRAME_X_TEXT_WIDGET (XFRAME(DEVICE_SELECTED_FRAME(d))); ＠＠ -594,6 +598,7 ＠＠ } XChangeProperty (display, window, reply.property, type, format, PropModeReplace, data, 0); +#endif /* HAVE_XTREGISTERDRAWABLE */ } } -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches March 2005