# HG changeset patch
# User Jerry James <james@xemacs.org>
# Date 1258559354 25200
# Node ID aa5ed11f473bcff2b8cfca110547d34d36e94931
# Parent 75975fd0b7fc8043f7fc719439c225fa739134d9
Remove support for obsolete systems. See xemacs-patches message with ID
<870180fe0911101613m6b8efa4bpf083fd9013950807@mail.gmail.com>.
diff -r 75975fd0b7fc -r aa5ed11f473b ChangeLog
--- a/ChangeLog Wed Nov 18 22:44:28 2009 +0900
+++ b/ChangeLog Wed Nov 18 08:49:14 2009 -0700
@@ -1,3 +1,14 @@
+2009-11-10 Jerry James <james@xemacs.org>
+
+ * Makefile.in.in: Remove dynodump support. Delete out-of-date comment
+ about Xenix.
+ * aclocal.m4: Remove support for old operating systems.
+ * configure.ac: Remove support for old machines and operating systems.
+ Remove support for dynodump.
+ (COFF_ENCAPSULATE) Remove, unused.
+ * configure: Regenerate.
+ * dynodump: Remove.
+
2009-11-18 Stephen J. Turnbull <stephen@xemacs.org>
* PROBLEMS: Describe duplicate symbol warnings on Mac OS X.
@@ -9,7 +20,7 @@
2009-11-09 Jerry James <james@xemacs.org>
- * configure.ac: Don't defined GNU_MALLOC, as there is no longer an
+ * configure.ac: Don't define GNU_MALLOC, as there is no longer an
"old" GNU malloc.
2009-10-05 Jerry James <james@xemacs.org>
diff -r 75975fd0b7fc -r aa5ed11f473b Makefile.in.in
--- a/Makefile.in.in Wed Nov 18 22:44:28 2009 +0900
+++ b/Makefile.in.in Wed Nov 18 08:49:14 2009 -0700
@@ -310,8 +310,7 @@
pkg-src/tree-x: pkg-src/FRC.tree-x
lib-src: FRC.lib-src
lwlib: FRC.lwlib
-dynodump: FRC.dynodump
-FRC.src FRC.lib-src FRC.lwlib FRC.dynodump pkg-src/FRC.tree-x:
+FRC.src FRC.lib-src FRC.lwlib pkg-src/FRC.tree-x:
FRC.lisp.finder-inf.el:
${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERATED_HEADERS} FRC
@@ -366,7 +365,6 @@
## this Makefile as well.
## On AIX, use tar xBf.
-## On Xenix, use tar xpf.
.PHONY: install-only install install-arch-dep install-arch-indep gzip.el mkdir
.PHONY: check check-features
diff -r 75975fd0b7fc -r aa5ed11f473b aclocal.m4
--- a/aclocal.m4 Wed Nov 18 22:44:28 2009 +0900
+++ b/aclocal.m4 Wed Nov 18 08:49:14 2009 -0700
@@ -54,18 +54,6 @@
xehost_vendor=`echo $xehost | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`
xehost_os=`echo $xehost | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`
-case "$xehost_os" in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "${COLLECT_NAMES+set}" != set; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
# Now see if the compiler is really GCC.
if test "$GCC" = "yes"; then
XEGCC=yes
@@ -87,7 +75,7 @@
wl='-Wl,'
case "$xehost_os" in
- aix[[3-9]]* | irix[[5-9]]* | osf[[3-9]])
+ aix[[4-9]]* | irix[[5-9]]* | osf[[3-9]])
# PIC is the default for these OSes.
;;
@@ -113,7 +101,7 @@
else
# PORTME Check for PIC flags for the system compiler.
case "$xehost_os" in
- hpux9* | hpux1[[0-9]]*)
+ hpux1[[0-9]]*)
# Is there a better link_static_flag that works with the bundled CC?
wl='-Wl,'
dll_cflags='+Z'
@@ -133,7 +121,7 @@
wl='-Wl,'
;;
- aix[[3-9]]*)
+ aix[[4-9]]*)
# All AIX code is PIC.
wl='-Wl,'
;;
@@ -163,11 +151,6 @@
wl='-Wl,'
;;
- sunos4*)
- dll_cflags='-PIC'
- wl='-Qoption ld '
- ;;
-
uts4*)
dll_cflags='-pic'
;;
@@ -258,7 +241,7 @@
esac
else # Not using GCC
case "$xehost_os" in
- aix[[3-9]]*)
+ aix[[4-9]]*)
xldf="-bE:ELLSONAME.exp -H512 -T512 -bhalt:4 -bM:SRE -bnoentry -lc"
xcldf="${wl}-bE:ELLSONAME.exp ${wl}-H512 ${wl}-T512 ${wl}-bhalt:4 ${wl}-bM:SRE ${wl}-bnoentry ${wl}-lc"
;;
@@ -286,11 +269,6 @@
xcldf="-G"
xldf="-G"
;;
-
- sunos4*)
- xcldf="${wl}-assert ${wl}pure-text ${wl}-Bstatic"
- xldf="-assert pure-text -Bstatic"
- ;;
esac
fi # End if if we are using gcc
@@ -393,8 +371,8 @@
AC_MSG_RESULT([${xe_gnu_ld}])
case "$xehost_os" in
- amigaos* | sunos4*)
- # On these operating systems, we should treat GNU ld like the system ld.
+ amigaos*)
+ # On this operating system, we should treat GNU ld like the system ld.
gnu_ld_acts_native=yes
;;
*)
@@ -435,11 +413,6 @@
else
# PORTME fill in a description of your system's linker (not GNU ld)
case "$xehost_os" in
- aix3*)
- dll_ld=$LTLD
- dll_ldflags=$xldf
- ;;
-
aix[[4-9]]*)
dll_ldflags=$xcldf
;;
@@ -503,15 +476,6 @@
esac
;;
- sunos4*)
- if test "$XEGCC" = yes; then
- dll_ld=$CC
- else
- dll_ld=$LTLD
- fi
- dll_ldflags=$xldf
- ;;
-
uts4*)
dll_ld=$LTLD
dll_ldflags="-G"
@@ -601,22 +565,14 @@
ld_dynamic_link_flags=
;;
- sco3.2v5* | unixware* | sysv5* | sysv4*)
+ unixware* | sysv5* | sysv4*)
ld_dynamic_link_flags="${wl}-Bexport"
;;
- sunos4*)
- ld_dynamic_link_flags=
- ;;
-
uts4*)
ld_dynamic_link_flags=
;;
- bsdi*)
- ld_dynamic_link_flags=
- ;;
-
esac
fi # End of if -z ld_dynamic_link_flags
fi # End of if test "$can_build_shared" = "yes"
diff -r 75975fd0b7fc -r aa5ed11f473b configure
--- a/configure Wed Nov 18 22:44:28 2009 +0900
+++ b/configure Wed Nov 18 08:49:14 2009 -0700
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for XEmacs 21.5.
+# Generated by GNU Autoconf 2.63 for XEmacs 21.5.
#
# Report bugs to <xemacs-beta@xemacs.org>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
-#
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
@@ -56,13 +54,13 @@
# If configure fails after disturbing the status quo,
# config.status is removed.
#
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization. ##
+## --------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -70,14 +68,22 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
-esac
-fi
-
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
as_nl='
'
@@ -86,13 +92,7 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -103,7 +103,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in #(
+ case $arg in
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -126,6 +126,13 @@
}
fi
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
+fi
+
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -135,15 +142,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in #((
+case $0 in
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
IFS=$as_save_IFS
;;
@@ -155,16 +162,12 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+ { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
done
PS1='$ '
PS2='> '
@@ -176,249 +179,7 @@
LANGUAGE=C
export LANGUAGE
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '\${1+\"\$@\"}'='\"\$@\"'
- setopt NO_GLOB_SUBST
-else
- case \`(set -o) 2>/dev/null\` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
-esac
-fi
-"
- as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
- exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
- if (eval "$as_required") 2>/dev/null; then :
- as_have_required=yes
-else
- as_have_required=no
-fi
- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- as_found=:
- case $as_dir in #(
- /*)
- for as_base in sh bash ksh sh5; do
- # Try only shells that exist, to save several forks.
- as_shell=$as_dir/$as_base
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
- CONFIG_SHELL=$as_shell as_have_required=yes
- if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
- break 2
-fi
-fi
- done;;
- esac
- as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
- CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
- if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
- if test x$as_have_required = xno; then :
- $as_echo "$0: This script requires a shell more modern than all"
- $as_echo "$0: the shells that I found on your system."
- if test x${ZSH_VERSION+set} = xset ; then
- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
- else
- $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: xemacs-beta@xemacs.org about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
- fi
- exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
- fi
- $as_echo "$as_me: error: $1" >&2
- as_fn_exit $as_status
-} # as_fn_error
-
+# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -432,12 +193,8 @@
as_basename=false
fi
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
+
+# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
@@ -457,19 +214,295 @@
}
s/.*/./; q'`
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
- as_lineno_1=$LINENO as_lineno_1a=$LINENO
- as_lineno_2=$LINENO as_lineno_2a=$LINENO
- eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
- test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
- # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+# CDPATH.
+$as_unset CDPATH
+
+
+if test "x$CONFIG_SHELL" = x; then
+ if (eval ":") 2>/dev/null; then
+ as_have_required=yes
+else
+ as_have_required=no
+fi
+
+ if test $as_have_required = yes && (eval ":
+(as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+ as_lineno_1=\$LINENO
+ as_lineno_2=\$LINENO
+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+ :
+else
+ as_candidate_shells=
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ case $as_dir in
+ /*)
+ for as_base in sh bash ksh sh5; do
+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ done;;
+ esac
+done
+IFS=$as_save_IFS
+
+
+ for as_shell in $as_candidate_shells $SHELL; do
+ # Try only shells that exist, to save several forks.
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+ CONFIG_SHELL=$as_shell
+ as_have_required=yes
+ if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+ (exit $1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+ break
+fi
+
+fi
+
+ done
+
+ if test "x$CONFIG_SHELL" != x; then
+ for as_var in BASH_ENV ENV
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+ if test $as_have_required = no; then
+ echo This script requires a shell more modern than all the
+ echo shells that I found on your system. Please install a
+ echo modern shell, or manually run the script under such a
+ echo shell if you do have one.
+ { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+ (exit \$1)
+}
+as_func_success () {
+ as_func_return 0
+}
+as_func_failure () {
+ as_func_return 1
+}
+as_func_ret_success () {
+ return 0
+}
+as_func_ret_failure () {
+ return 1
+}
+
+exitcode=0
+if as_func_success; then
+ :
+else
+ exitcode=1
+ echo as_func_success failed.
+fi
+
+if as_func_failure; then
+ exitcode=1
+ echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+ :
+else
+ exitcode=1
+ echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+ exitcode=1
+ echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+ :
+else
+ exitcode=1
+ echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+ echo No shell found that supports shell functions.
+ echo Please tell bug-autoconf@gnu.org about your system,
+ echo including any error possibly output before this message.
+ echo This can help us improve future autoconf versions.
+ echo Configuration will now proceed without shell functions.
+}
+
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, and appends
+ # trailing '-' during substitution so that $LINENO is not a special
+ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -486,7 +519,8 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
@@ -496,18 +530,29 @@
exit
}
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
+
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
-n*)
- case `echo 'xy\c'` in
+ case `echo 'x\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T=' ';;
+ *) ECHO_C='\c';;
esac;;
*)
ECHO_N='-n';;
esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -537,7 +582,7 @@
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
+ as_mkdir_p=:
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -556,10 +601,10 @@
if test -d "$1"; then
test -d "$1/.";
else
- case $1 in #(
+ case $1 in
-*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -573,6 +618,7 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
exec 7<&0 </dev/null 6>&1
# Name of the host.
@@ -591,6 +637,7 @@
subdirs=
MFLAGS=
MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='XEmacs'
@@ -598,7 +645,6 @@
PACKAGE_VERSION='21.5'
PACKAGE_STRING='XEmacs 21.5'
PACKAGE_BUGREPORT='xemacs-beta@xemacs.org'
-PACKAGE_URL=''
ac_unique_file="src/lisp.h"
# Factoring default headers for most tests.
@@ -642,7 +688,6 @@
internal_makefile_list
XE_CFLAGS
XEMACS_CC
-dynodump_arch
sound_cflags
native_sound_lib
RECURSIVE_MAKE_ARGS
@@ -803,7 +848,6 @@
program_transform_name
prefix
exec_prefix
-PACKAGE_URL
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
@@ -1144,7 +1188,8 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+ { (exit 1); exit 1; }; }
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1170,7 +1215,8 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid feature name: $ac_useropt"
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+ { (exit 1); exit 1; }; }
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1374,7 +1420,8 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+ { (exit 1); exit 1; }; }
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1390,7 +1437,8 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error "invalid package name: $ac_useropt"
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+ { (exit 1); exit 1; }; }
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1420,17 +1468,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- case $ac_envvar in #(
- '' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error "invalid variable name: \`$ac_envvar'" ;;
- esac
+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1447,13 +1495,15 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error "missing argument to $ac_option"
+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+ { (exit 1); exit 1; }; }
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+ { (exit 1); exit 1; }; } ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1476,7 +1526,8 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; }
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1506,9 +1557,11 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error "working directory cannot be determined"
+ { $as_echo "$as_me: error: working directory cannot be determined" >&2
+ { (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error "pwd does not report name of working directory"
+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+ { (exit 1); exit 1; }; }
# Find the source files, if location was not specified.
@@ -1547,11 +1600,13 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { (exit 1); exit 1; }; }
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+ { (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -2074,9 +2129,10 @@
if $ac_init_version; then
cat <<\_ACEOF
XEmacs configure 21.5
-generated by GNU Autoconf 2.64
-
-Copyright (C) 2009 Free Software Foundation, Inc.
+generated by GNU Autoconf 2.63
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
@@ -2128,698 +2184,12 @@
_ACEOF
exit
fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
- if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_header_compiler=yes
-else
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- ac_header_preproc=yes
-else
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
- yes:no: )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
- no:yes:* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## ------------------------------------- ##
-## Report this to xemacs-beta@xemacs.org ##
-## ------------------------------------- ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_check_decl LINENO SYMBOL VAR
-# ------------------------------------
-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
-ac_fn_c_check_decl ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-$as_echo_n "checking whether $2 is declared... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-#ifndef $2
- (void) $2;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_decl
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=no"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-if (sizeof ($2))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_type
-
-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-# ----------------------------------------------------
-# Tries to find if the field MEMBER exists in type AGGR, after including
-# INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$4=yes"
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$4=yes"
-else
- eval "$4=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$4
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_member
-
-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-# --------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_c_compute_int ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_lo=0 ac_mid=0
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=$ac_mid; break
-else
- as_fn_arith $ac_mid + 1 && ac_lo=$as_val
- if test $ac_lo -le $ac_mid; then
- ac_lo= ac_hi=
- break
- fi
- as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=-1 ac_mid=-1
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_lo=$ac_mid; break
-else
- as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
- if test $ac_mid -le $ac_hi; then
- ac_lo= ac_hi=
- break
- fi
- as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-else
- ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
- as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_hi=$ac_mid
-else
- as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
- return 1;
- if (($2) < 0)
- {
- long int i = longval ();
- if (i != ($2))
- return 1;
- fprintf (f, "%ld", i);
- }
- else
- {
- unsigned long int i = ulongval ();
- if (i != ($2))
- return 1;
- fprintf (f, "%lu", i);
- }
- /* Do not output a trailing newline, as this causes \r\n confusion
- on some platforms. */
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
- ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
-
- fi
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
-
-} # ac_fn_c_compute_int
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by XEmacs $as_me 21.5, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2855,8 +2225,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
- done
+ $as_echo "PATH: $as_dir"
+done
IFS=$as_save_IFS
} >&5
@@ -2893,9 +2263,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
2)
- as_fn_append ac_configure_args1 " '$ac_arg'"
+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
@@ -2911,13 +2281,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
- as_fn_append ac_configure_args " '$ac_arg'"
+ ac_configure_args="$ac_configure_args '$ac_arg'"
;;
esac
done
done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
@@ -2942,13 +2312,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
+ *) $as_unset $ac_var ;;
esac ;;
esac
done
@@ -3020,41 +2390,39 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
-$as_echo "/* confdefs.h */" > confdefs.h
-
# Predefined preprocessor variables.
cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
+
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
@@ -3073,7 +2441,7 @@
do
test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
@@ -3084,7 +2452,7 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -3092,7 +2460,7 @@
esac
fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -3107,11 +2475,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
@@ -3121,17 +2489,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
ac_cache_corrupted=:
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
eval $ac_var=\$ac_old_val
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
@@ -3143,20 +2511,43 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -3517,7 +2908,9 @@
if test "${with_lispdir+set}" = set; then
enableval="$with_lispdir"
withval="$with_lispdir"
- $as_echo "#define LISPDIR_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define LISPDIR_USER_DEFINED 1
+_ACEOF
else
with_lispdir='${datadir}/${instvardir}/lisp'
@@ -3536,7 +2929,9 @@
if test "${with_archlibdir+set}" = set; then
enableval="$with_archlibdir"
withval="$with_archlibdir"
- $as_echo "#define ARCHLIBDIR_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define ARCHLIBDIR_USER_DEFINED 1
+_ACEOF
else
with_archlibdir='${libdir}/${instvardir}/${configuration}'
@@ -3555,7 +2950,9 @@
if test "${with_moduledir+set}" = set; then
enableval="$with_moduledir"
withval="$with_moduledir"
- $as_echo "#define MODULEDIR_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define MODULEDIR_USER_DEFINED 1
+_ACEOF
else
with_moduledir='${libdir}/${instvardir}/${configuration}/modules'
@@ -3574,7 +2971,9 @@
if test "${with_etcdir+set}" = set; then
enableval="$with_etcdir"
withval="$with_etcdir"
- $as_echo "#define ETCDIR_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define ETCDIR_USER_DEFINED 1
+_ACEOF
else
with_etcdir='${datadir}/${instvardir}/etc'
@@ -3593,7 +2992,9 @@
if test "${with_docdir+set}" = set; then
enableval="$with_docdir"
withval="$with_docdir"
- $as_echo "#define DOCDIR_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define DOCDIR_USER_DEFINED 1
+_ACEOF
else
with_docdir='${archlibdir}'
@@ -3647,7 +3048,9 @@
if test "${with_early_packages+set}" = set; then
enableval="$with_early_packages"
withval="$with_early_packages"
- $as_echo "#define EARLY_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define EARLY_PACKAGE_DIRECTORIES_USER_DEFINED 1
+_ACEOF
fi;
# If --with-user-packages or --without-user-packages were given then copy the value to the
@@ -3664,7 +3067,9 @@
if test "${with_user_packages+set}" = set; then
enableval="$with_user_packages"
withval="$with_user_packages"
- $as_echo "#define EARLY_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define EARLY_PACKAGE_DIRECTORIES_USER_DEFINED 1
+_ACEOF
fi;
# If --with-late-packages or --without-late-packages were given then copy the value to the
@@ -3681,7 +3086,9 @@
if test "${with_late_packages+set}" = set; then
enableval="$with_late_packages"
withval="$with_late_packages"
- $as_echo "#define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1
+_ACEOF
fi;
# If --with-system-packages or --without-system-packages were given then copy the value to the
@@ -3698,7 +3105,9 @@
if test "${with_system_packages+set}" = set; then
enableval="$with_system_packages"
withval="$with_system_packages"
- $as_echo "#define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define LATE_PACKAGE_DIRECTORIES_USER_DEFINED 1
+_ACEOF
fi;
# If --with-last-packages or --without-last-packages were given then copy the value to the
@@ -3715,7 +3124,9 @@
if test "${with_last_packages+set}" = set; then
enableval="$with_last_packages"
withval="$with_last_packages"
- $as_echo "#define LAST_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define LAST_PACKAGE_DIRECTORIES_USER_DEFINED 1
+_ACEOF
fi;
# If --with-legacy-packages or --without-legacy-packages were given then copy the value to the
@@ -3732,7 +3143,9 @@
if test "${with_legacy_packages+set}" = set; then
enableval="$with_legacy_packages"
withval="$with_legacy_packages"
- $as_echo "#define LAST_PACKAGE_DIRECTORIES_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define LAST_PACKAGE_DIRECTORIES_USER_DEFINED 1
+_ACEOF
fi;
# If --with-package-path or --without-package-path were given then copy the value to the
@@ -3749,7 +3162,9 @@
if test "${with_package_path+set}" = set; then
enableval="$with_package_path"
withval="$with_package_path"
- $as_echo "#define PACKAGE_PATH_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define PACKAGE_PATH_USER_DEFINED 1
+_ACEOF
fi;
# If --with-infopath or --without-infopath were given then copy the value to the
@@ -3766,7 +3181,9 @@
if test "${with_infopath+set}" = set; then
enableval="$with_infopath"
withval="$with_infopath"
- $as_echo "#define INFOPATH_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define INFOPATH_USER_DEFINED 1
+_ACEOF
fi;
@@ -5394,7 +4811,7 @@
if test \( "$with_xft_menubars" = "yes" -o "$with_xft_tabs" = "yes" \
-o "$with_xft_gauges" = "yes" \) -a "$with_xft_emacs" = "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Forcing --with-xft=emacs because Xft is enabled" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Forcing --with-xft=emacs because Xft is enabled" >&5
$as_echo "$as_me: WARNING: Forcing --with-xft=emacs because Xft is enabled" >&2;}
with_xft_emacs=yes
fi
@@ -5411,7 +4828,9 @@
then
exec_prefix='${prefix}'
else
- $as_echo "#define EXEC_PREFIX_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define EXEC_PREFIX_USER_DEFINED 1
+_ACEOF
fi
@@ -5454,27 +4873,41 @@
if test "x$datadir" != "x\${datarootdir}"
then
- $as_echo "#define INFODIR_USER_DEFINED 1" >>confdefs.h
-
- $as_echo "#define LISPDIR_USER_DEFINED 1" >>confdefs.h
-
- $as_echo "#define ETCDIR_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define INFODIR_USER_DEFINED 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define LISPDIR_USER_DEFINED 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define ETCDIR_USER_DEFINED 1
+_ACEOF
fi
if test "x$libdir" != "x\${exec_prefix}/lib"
then
- $as_echo "#define MODULEDIR_USER_DEFINED 1" >>confdefs.h
-
- $as_echo "#define ARCHLIBDIR_USER_DEFINED 1" >>confdefs.h
-
- $as_echo "#define DOCDIR_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define MODULEDIR_USER_DEFINED 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define ARCHLIBDIR_USER_DEFINED 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define DOCDIR_USER_DEFINED 1
+_ACEOF
fi
if test "x$infodir" != "x\${datarootdir}/info"
then
- $as_echo "#define INFODIR_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define INFODIR_USER_DEFINED 1
+_ACEOF
else
infodir='${datarootdir}/${instvardir}/info'
@@ -5490,14 +4923,14 @@
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
$as_echo "no, using $LN_S" >&6; }
fi
@@ -5549,16 +4982,24 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- for ac_t in install-sh install.sh shtool; do
- if test -f "$ac_dir/$ac_t"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/$ac_t -c"
- break 2
- fi
- done
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
done
if test -z "$ac_aux_dir"; then
- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+ { (exit 1); exit 1; }; }
fi
# These three variables are undocumented and unsupported,
@@ -5572,27 +5013,35 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if test "${ac_cv_build+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+ { (exit 1); exit 1; }; };;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -5705,33 +5154,57 @@
if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
-test "${enable_error_checking_extents:=$beta}" = yes && $as_echo "#define ERROR_CHECK_EXTENTS 1" >>confdefs.h
-
-test "${enable_error_checking_types:=$beta}" = yes && $as_echo "#define ERROR_CHECK_TYPES 1" >>confdefs.h
-
-test "${enable_error_checking_text:=$beta}" = yes && $as_echo "#define ERROR_CHECK_TEXT 1" >>confdefs.h
-
-test "${enable_error_checking_gc:=$beta}" = yes && $as_echo "#define ERROR_CHECK_GC 1" >>confdefs.h
-
-test "${enable_error_checking_malloc:=$beta}" = yes && $as_echo "#define ERROR_CHECK_MALLOC 1" >>confdefs.h
-
-test "${enable_error_checking_byte_code:=$beta}" = yes && $as_echo "#define ERROR_CHECK_BYTE_CODE 1" >>confdefs.h
-
-test "${enable_error_checking_glyphs:=$beta}" = yes && $as_echo "#define ERROR_CHECK_GLYPHS 1" >>confdefs.h
-
-test "${enable_error_checking_display:=$beta}" = yes && $as_echo "#define ERROR_CHECK_DISPLAY 1" >>confdefs.h
-
-test "${enable_error_checking_structures:=$beta}" = yes && $as_echo "#define ERROR_CHECK_STRUCTURES 1" >>confdefs.h
+test "${enable_error_checking_extents:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+#define ERROR_CHECK_EXTENTS 1
+_ACEOF
+
+test "${enable_error_checking_types:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+#define ERROR_CHECK_TYPES 1
+_ACEOF
+
+test "${enable_error_checking_text:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+#define ERROR_CHECK_TEXT 1
+_ACEOF
+
+test "${enable_error_checking_gc:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+#define ERROR_CHECK_GC 1
+_ACEOF
+
+test "${enable_error_checking_malloc:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+#define ERROR_CHECK_MALLOC 1
+_ACEOF
+
+test "${enable_error_checking_byte_code:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+#define ERROR_CHECK_BYTE_CODE 1
+_ACEOF
+
+test "${enable_error_checking_glyphs:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+#define ERROR_CHECK_GLYPHS 1
+_ACEOF
+
+test "${enable_error_checking_display:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+#define ERROR_CHECK_DISPLAY 1
+_ACEOF
+
+test "${enable_error_checking_structures:=$beta}" = yes && cat >>confdefs.h <<\_ACEOF
+#define ERROR_CHECK_STRUCTURES 1
+_ACEOF
if test "${enable_debug:=$beta}" = "yes"; then
enable_assertions=yes
enable_memory_usage_stats=yes
- $as_echo "#define DEBUG_XEMACS 1" >>confdefs.h
-
-fi
-test "$enable_assertions" = "yes" && $as_echo "#define USE_ASSERTIONS 1" >>confdefs.h
-
-test "$enable_memory_usage_stats" = "yes" && $as_echo "#define MEMORY_USAGE_STATS 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define DEBUG_XEMACS 1
+_ACEOF
+
+fi
+test "$enable_assertions" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define USE_ASSERTIONS 1
+_ACEOF
+
+test "$enable_memory_usage_stats" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define MEMORY_USAGE_STATS 1
+_ACEOF
@@ -5749,58 +5222,23 @@
case "$ac_cv_build" in
sparc-*-* ) machine=sparc ;;
alpha*-*-* ) machine=alpha ;;
- vax-*-* ) machine=vax ;;
- mips-dec-* ) machine=pmax ;;
- mips-sgi-irix6* ) machine=iris6d ;;
- mips-sgi-* ) machine=iris4d ;;
mips*-linux ) machine=mips ;;
- romp-ibm-* ) machine=ibmrt ;;
rs6000-ibm-aix* ) machine=ibmrs6000 ;;
powerpc-ibm-aix* ) machine=ibmrs6000 ;;
powerpc*-* ) machine=powerpc ;;
hppa-*-* ) machine=hp800 ;;
- m88k-dg-* ) machine=aviion ;;
- m68*-sony-* ) machine=news ;;
- mips-sony-* ) machine=news-risc ;;
- clipper-* ) machine=clipper ;;
arm* ) machine=arm ;;
- ns32k-* ) machine=ns32000 ;;
esac
case "$ac_cv_build" in
- *-*-linux* ) opsys=linux ;;
*-*-netbsd* ) opsys=netbsd ;;
*-*-openbsd* ) opsys=openbsd ;;
- *-*-nextstep* ) opsys=nextstep ;;
- *-*-vms ) opsys=vms ;;
-
- *-dec-osf1.3 | *-dec-osf2* ) opsys=decosf1-3 ;;
- *-dec-osf1.2 | *-dec-osf1* ) opsys=decosf1-2 ;;
- *-dec-osf3.[2-9] ) opsys=decosf3-2 ;;
- *-dec-osf3* ) opsys=decosf3-1 ;;
- *-dec-osf[4-9]* ) opsys=decosf4-0 ;;
-
- *-*-ultrix[0-3].* | *-*-ultrix4.0* ) opsys=bsd4-2 ;;
- *-*-ultrix4.[12]* ) opsys=bsd4-3 ;;
- *-*-ultrix* ) opsys=ultrix4-3 ;;
-
- *-*-aix3.1* ) opsys=aix3-1 ;;
- *-*-aix3.2.5 ) opsys=aix3-2-5 ;;
- *-*-aix3* ) opsys=aix3-2 ;;
- *-*-aix4.0* ) opsys=aix4 ;;
- *-*-aix4.1* ) opsys=aix4-1 ;;
- *-*-aix[4-9]* ) opsys=aix4-2 ;;
+
+ *-*-aix[4-9]* ) opsys=aix4-2 ;;
*-gnu* ) opsys=gnu ;;
- *-*-bsd4.[01] ) opsys=bsd4-1 ;;
- *-*-bsd4.2 ) opsys=bsd4-2 ;;
*-*-bsd4.3 ) opsys=bsd4-3 ;;
- *-*-aos4.2 ) opsys=bsd4-2 ;;
*-*-aos* ) opsys=bsd4-3 ;;
- *-*-sysv0 | *-*-sysvr0 ) opsys=usg5-0 ;;
- *-*-sysv2 | *-*-sysvr2 ) opsys=usg5-2 ;;
- *-*-sysv2.2 | *-*-sysvr2.2 ) opsys=usg5-2-2 ;;
- *-*-sysv3* | *-*-sysvr3* ) opsys=usg5-3 ;;
*-*-sysv4.1* | *-*-sysvr4.1* )opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;;
*-*-sysv4.[2-9]* | *-sysvr4.[2-9]* )
if test -z "$NON_GNU_CPP" ; then
@@ -5818,224 +5256,44 @@
*-*-netbsd* )
case "${ac_cv_build}" in
i[3-9]86-*-netbsd*) machine=intel386 ;;
- hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* )
- machine=hp9000s300 ;;
- pc532-*-netbsd* | ns32k-*-netbsd* ) machine=ns32000 ;;
- pmax-*-netbsd* | mips-*-netbsd* ) machine=pmax ;;
esac
;;
*-*-openbsd* )
case "${ac_cv_build}" in
i386-*-openbsd*) machine=intel386 ;;
- m68k-*-openbsd*) machine=hp9000s300 ;;
- mipsel-*-openbsd*) machine=pmax ;;
esac
;;
- arm-acorn-riscix1.1* ) machine=acorn opsys=riscix1-1 ;;
- arm-acorn-riscix1.2* | arm-acorn-riscix ) machine=acorn opsys=riscix1-2 ;;
-
- fx80-alliant-* ) machine=alliant4 opsys=bsd4-2 ;;
- i860-alliant-* ) machine=alliant-2800 opsys=bsd4-3 ;;
-
- m68*-altos-sysv* ) machine=altos opsys=usg5-2 ;;
-
- 580-amdahl-sysv* ) machine=amdahl opsys=usg5-2-2 ;;
-
- m68*-apollo-* ) machine=apollo opsys=bsd4-3 ;;
-
- we32k-att-sysv* ) machine=att3b opsys=usg5-2-2 ;;
-
- m68*-att-sysv* ) machine=7300 opsys=usg5-2-2 ;;
-
- rs6000-bull-bosx* ) machine=ibmrs6000 opsys=aix3-2 ;; # dpx20
- m68*-bull-sysv3* ) machine=dpx2 opsys=usg5-3 ;; # dpx2
- m68*-bull-sysv2* ) machine=sps7 opsys=usg5-2 ;; # sps7
-
-
- celerity-celerity-bsd* ) machine=celerity opsys=bsd4-2 ;;
-
- *-convex-bsd* | *-convex-convexos* )
- machine=convex opsys=bsd4-3
- NON_GNU_CPP="cc -E -P"
- ;;
-
- i[3-9]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;;
-
*-*-darwin*)
opsys=darwin
- $as_echo "#define USE_PARAM_H 1" >>confdefs.h
-
- ;;
-
- i586-dg-dgux*R4* | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
- m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) opsys=dgux5-4r3 ;;
- m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) opsys=dgux5-4r2 ;;
- m88k-dg-dgux* ) opsys=dgux ;;
-
- m68k-motorola-sysv* | m68000-motorola-sysv* ) machine=delta opsys=usg5-3 ;;
- m88k-motorola-sysv4* )
- machine=delta88k opsys=usg5-4-2
- ;;
- m88k-motorola-sysv* | m88k-motorola-m88kbcs* ) machine=delta88k opsys=usg5-3 ;;
-
- m68*-dual-sysv* ) machine=dual opsys=usg5-2 ;;
- m68*-dual-uniplus* ) machine=dual opsys=unipl5-2 ;;
-
- ns16k-encore-bsd* ) machine=ns16000 opsys=umax ;;
-
- pn-gould-bsd4.2* ) machine=gould opsys=bsd4-2 ;;
- pn-gould-bsd4.3* ) machine=gould opsys=bsd4-3 ;;
- np1-gould-bsd* ) machine=gould-np1 opsys=bsd4-3 ;;
-
- m88k-harris-cxux* )
- case "`uname -r`" in
- [56].[0-9] ) machine=nh4000 opsys=cxux ;;
- [7].[0-9] ) machine=nh4000 opsys=cxux7 ;;
- esac
- NON_GNU_CPP="/lib/cpp"
- ;;
- m68k-harris-cxux* ) machine=nh3000 opsys=cxux ;;
- powerpc-harris-powerunix ) machine=nh6000 opsys=powerunix NON_GNU_CPP="cc -Xo -E -P" ;;
-
- xps*-honeywell-sysv* ) machine=xps100 opsys=usg5-2 ;;
-
- m68*-hp-bsd* ) machine=hp9000s300 opsys=bsd4-3 ;;
-
- *-hp-hpux* )
- case "$ac_cv_build" in
- m68* ) machine=hp9000s300 ;;
- hppa* ) machine=hp800 ;;
- esac
-
- case "$ac_cv_build" in
- *-hp-hpux7* ) opsys=hpux ;;
- *-hp-hpux8* ) opsys=hpux8 ;;
- *-hp-hpux9* ) opsys=hpux9 ;;
- *-hp-hpux10* ) opsys=hpux10 ;;
- *-hp-hpux11* ) opsys=hpux11 ;;
- * ) opsys=hpux ;;
- esac
-
- case "$opsys" in hpux9 | hpux10 ) extra_objs="$extra_objs strcat.o" && if test "$verbose" = "yes"; then
- echo " xemacs will be linked with \"strcat.o\""
- fi ;; esac
-
- if test "$opsys" = "hpux10" -o "$opsys" = "hpux11"; then \
- ansi_flag="-Ae"; else ansi_flag="-Aa"; fi
- NON_GNU_CC="cc $ansi_flag" NON_GNU_CPP="cc $ansi_flag -E"
+ cat >>confdefs.h <<\_ACEOF
+#define USE_PARAM_H 1
+_ACEOF
+
+ ;;
+
+ *-hp-hpux* ) machine=hp800 opsys=hpux11
+ NON_GNU_CC="cc -Ae" NON_GNU_CPP="cc -Ae -E"
case "$ac_cv_build" in *-hp-hpux*shr* ) opsys="${opsys}-shr" ;; esac
;;
- orion-orion-bsd* ) machine=orion opsys=bsd4-2 ;;
- clipper-orion-bsd* ) machine=orion105 opsys=bsd4-2 ;;
-
- i[3-9]86-ibm-aix1.1* ) machine=ibmps2-aix opsys=usg5-2-2 ;;
- i[3-9]86-ibm-aix1.[23]* | i[3-9]86-ibm-aix* ) machine=ibmps2-aix opsys=usg5-3 ;;
- i370-ibm-aix*) machine=ibm370aix opsys=usg5-3 ;;
- romp-ibm-aos* ) opsys=bsd4-3 ;;
- romp-ibm-bsd* ) opsys=bsd4-3 ;;
- romp-ibm-mach* ) opsys=mach-bsd4-3 ;;
-
- m68*-isi-bsd4.2* ) machine=isi-ov opsys=bsd4-2 ;;
- m68*-isi-bsd4.3* ) machine=isi-ov opsys=bsd4-3 ;;
-
- i[3-9]86-intsys-sysv* ) machine=is386 opsys=usg5-2-2 ;;
-
- i[3-9]86-prime-sysv* ) machine=i386 opsys=usg5-3 ;;
-
- i[3-9]86-sequent-bsd* ) machine=symmetry opsys=bsd4-3 ;;
-
- i[3-9]86-sequent-ptx* ) machine=sequent-ptx opsys=ptx NON_GNU_CPP="/lib/cpp" ;;
-
- i[3-9]86-ncr-sysv* ) machine=ncr386 opsys=usg5-4-2 ;;
-
- i860-intel-osf1* ) machine=paragon opsys=osf1 NON_GNU_CPP=/usr/mach/lib/cpp ;;
-
- i860-*-sysv4* ) machine=i860 opsys=usg5-4 NON_GNU_CC="/bin/cc" NON_GNU_CPP="/usr/ccs/lib/cpp" ;;
-
- m68*-masscomp-rtu* ) machine=masscomp opsys=rtu ;;
-
- m68*-megatest-bsd* ) machine=mega68 opsys=bsd4-2 ;;
-
- mips-mips-usg* ) machine=mips4 ;;
- mips-mips-riscos4 )
- machine=mips4
- NON_GNU_CC="cc -systype bsd43"
- NON_GNU_CPP="cc -systype bsd43 -E"
- case "$ac_cv_build" in
- mips-mips-riscos4* ) opsys=bsd4-3 ;;
- mips-mips-riscos5* ) opsys=riscos5 ;;
- esac
- ;;
- mips-mips-bsd* ) machine=mips opsys=bsd4-3 ;;
- mips-mips-* ) machine=mips opsys=usg5-2-2 ;;
-
- m68*-next-* | m68k-*-nextstep* ) machine=m68k opsys=nextstep ;;
-
- ns32k-ns-genix* ) machine=ns32000 opsys=usg5-2 ;;
-
- m68*-ncr-sysv2* | m68*-ncr-sysvr2* ) machine=tower32 opsys=usg5-2-2 ;;
- m68*-ncr-sysv3* | m68*-ncr-sysvr3* ) machine=tower32v3 opsys=usg5-3 ;;
-
- m68*-nixdorf-sysv* ) machine=targon31 opsys=usg5-2-2 ;;
-
- m68*-nu-sysv* ) machine=nu opsys=usg5-2 ;;
-
- m68*-plexus-sysv* ) machine=plexus opsys=usg5-2 ;;
-
- pyramid-pyramid-bsd* ) machine=pyramid opsys=bsd4-2 ;;
-
- ns32k-sequent-bsd4.2* ) machine=sequent opsys=bsd4-2 ;;
- ns32k-sequent-bsd4.3* ) machine=sequent opsys=bsd4-3 ;;
-
- mips-siemens-sysv* | mips-sni-sysv*)
- machine=mips-siemens opsys=usg5-4
- NON_GNU_CC=/usr/ccs/bin/cc
- NON_GNU_CPP=/usr/ccs/lib/cpp
- ;;
-
- mips-nec-sysv*)
- machine=mips-nec
- NON_GNU_CC=/usr/ccs/bin/cc
- NON_GNU_CPP=/usr/ccs/lib/cpp
- ;;
-
- m68*-sgi-iris3.5* ) machine=irist opsys=iris3-5 ;;
- m68*-sgi-iris3.6* | m68*-sgi-iris*) machine=irist opsys=iris3-6 ;;
- mips-sgi-irix3.* ) opsys=irix3-3 ;;
- mips-sgi-irix4.* ) opsys=irix4-0 ;;
- mips-sgi-irix6* ) opsys=irix6-0 ;;
- mips-sgi-irix5.1* ) opsys=irix5-1 ;;
- mips-sgi-irix5.2* ) opsys=irix5-2 ;;
- mips-sgi-irix5.* ) opsys=irix5-3 ;;
- mips-sgi-irix* ) opsys=irix5-0 ;;
-
- *-sony-newsos[34]* | *-sony-news[34]* ) opsys=bsd4-3 ;;
- *-sony-news* ) opsys=newsos5 ;;
-
- m68*-stride-sysv* ) machine=stride opsys=usg5-2 ;;
-
- *-*-solaris* | *-*-sunos* | *-sun-mach* | *-sun-bsd* )
+ mips-mips-bsd* ) machine=mips opsys=bsd4-3 ;;
+ mips-mips-* ) machine=mips opsys=usg5-4-2 ;;
+
+ mips-sgi-irix6* ) opsys=irix6-0 ;;
+
+ *-*-solaris* | *-sun-mach* | *-sun-bsd* )
case "$ac_cv_build" in
- m68*-sunos1* ) machine=sun1 ;;
- m68*-sunos2* ) machine=sun2 ;;
- m68* ) machine=sun3 ;;
- i*86*-sun-sunos[34]* ) machine=sun386 ;;
i*86-*-* ) machine=intel386 ;;
- rs6000* ) machine=rs6000 ;;
esac
case "$ac_cv_build" in *-sunos5*)
ac_cv_build=`echo $ac_cv_build | sed -e s/sunos5/solaris2/`;;
esac
- case "$ac_cv_build" in
- *-sunos4* )
- #test -f /usr/lib/cpp && NON_GNU_CPP=/usr/lib/cpp ;;
- : ;;
+ case "$ac_cv_build" in
*-solaris2* )
#test -f /usr/ccs/lib/cpp && NON_GNU_CPP=/usr/ccs/lib/cpp
RANLIB=':' ;;
@@ -6055,83 +5313,25 @@
_ACEOF
;;
- i*86-*-sunos4* ) opsys=sunos4-0 ;;
- *-sunos4.0* ) opsys=sunos4-0 ;;
- *-sunos4.1.2* ) opsys=sunos4-1-2 ;;
- *-sunos4.1.3* ) opsys=sunos4-1-3 ;;
- *-sunos4.1.[4-9]* ) opsys=sunos4-1-4 ;;
- *-sunos4* | *-sunos ) opsys=sunos4-1 ;;
*-mach* ) opsys=mach-bsd4-3 ;;
- * ) opsys=bsd4-2 ;;
- esac
-
- case "$ac_cv_build" in *-sunos4*shr* ) opsys="${opsys}-shr" ;; esac
+ * ) opsys=bsd4-3 ;;
+ esac
test "$opsys $CC" = "sol2 /usr/ucb/cc" && CC=""
;;
- m68*-tadpole-sysv* ) machine=tad68k opsys=usg5-3 ;;
-
- tahoe-tahoe-bsd4.2* ) machine=tahoe opsys=bsd4-2 ;;
- tahoe-tahoe-bsd4.3* ) machine=tahoe opsys=bsd4-3 ;;
-
- mips-tandem-sysv* ) machine=tandem-s2 opsys=usg5-3 ;;
-
- m88k-tektronix-sysv3* ) machine=tekxd88 opsys=usg5-3 ;;
-
- ns16k-tektronix-bsd* ) machine=ns16000 opsys=bsd4-2 ;;
- m68*-tektronix-bsd* ) machine=tek4300 opsys=bsd4-3 ;;
-
- titan-titan-sysv* ) machine=titan opsys=usg5-3 ;;
-
- m68*-unisys-uniplus* ) machine=ustation opsystem=unipl5-2 ;;
-
- vax-dec-* )
- case "$ac_cv_build" in
- *-sysv[01]* | *-sysvr[01]* ) opsys=usg5-0 ;;
- *-sysv2* | *-sysvr2* ) opsys=usg5-2 ;;
- *-mach* ) opsys=mach-bsd4-3 ;;
- esac
- ;;
-
- ns16k-whitechapel-* ) machine=mg1 ;;
-
- m68*-wicat-sysv* ) machine=wicat opsys=usg5-2 ;;
-
i[3-9]86-*-* )
machine=intel386
case "$ac_cv_build" in
- *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;;
- *-isc2.2* ) opsys=isc2-2 ;;
- *-isc4.0* ) opsys=isc4-0 ;;
- *-isc4.* ) opsys=isc4-1
- GCC_TEST_OPTIONS=-posix
- NON_GCC_TEST_OPTIONS=-Xp
- ;;
- *-isc* ) opsys=isc3-0 ;;
- *-esix5* ) opsys=esix5r4 NON_GNU_CPP=/usr/lib/cpp ;;
- *-esix* ) opsys=esix ;;
*-mach* ) opsys=mach-bsd4-3 ;;
- *-xenix* ) opsys=xenix ;;
- *-sco3.2v4* ) opsys=sco4 NON_GNU_CPP=/lib/cpp ;;
- *-bsd386* | *-bsdi1* ) opsys=bsd386 ;;
- *-bsdi4* ) opsys=bsdos4 ;;
- *-bsdi3* ) opsys=bsdos3 ;;
- *-bsdi2.1* ) opsys=bsdos2-1 ;;
- *-bsdi2* ) opsys=bsdos2 ;;
- *-sco3.2v5* ) opsys=sco5 ;;
*-sysv5* ) opsys=sco7 ;;
- *-386bsd* ) opsys=386bsd ;;
*-freebsd* ) opsys=freebsd ;;
- *-nextstep* ) opsys=nextstep ;;
*-pc-cygwin* ) opsys=cygwin32 ;;
*-pc-mingw* ) opsys=mingw32 ;
test -z "$with_tty" && with_tty="no";;
esac
;;
- m68k-*-linux* ) machine=m68k opsys=linux ;;
-
esac
test -z "$machine" && machine=`echo $ac_cv_build | sed 's/-.*$//'`
@@ -6173,10 +5373,14 @@
case "$opsys" in
darwin ) case "$machine" in
i[3-9]86 ) check_vdb_posix=yes ;;
- * ) $as_echo "#define VDB_MACH 1" >>confdefs.h
+ * ) cat >>confdefs.h <<\_ACEOF
+#define VDB_MACH 1
+_ACEOF
have_vdb_mach=yes ;;
esac ;;
- cygwin* ) $as_echo "#define VDB_WIN32 1" >>confdefs.h
+ cygwin* ) cat >>confdefs.h <<\_ACEOF
+#define VDB_WIN32 1
+_ACEOF
have_vdb_win32=yes ;;
linux* ) check_vdb_posix=yes ;;
freebsd ) check_vdb_posix=yes ;;
@@ -6184,9 +5388,13 @@
esac
else
case "$enable_vdb" in
- mach ) $as_echo "#define VDB_MACH 1" >>confdefs.h
+ mach ) cat >>confdefs.h <<\_ACEOF
+#define VDB_MACH 1
+_ACEOF
have_vdb_mach=yes ;;
- win32 ) $as_echo "#define VDB_WIN32 1" >>confdefs.h
+ win32 ) cat >>confdefs.h <<\_ACEOF
+#define VDB_WIN32 1
+_ACEOF
have_vdb_win32=yes ;;
posix ) check_vdb_posix=yes ;;
fake ) have_vdb_fake=yes ;;
@@ -6197,15 +5405,16 @@
if test -z "$with_dynamic"; then
case "$opsys" in
- hpux* | sunos4* ) with_dynamic=no ;;
+ hpux* ) with_dynamic=no ;;
*) with_dynamic=yes ;;
esac
fi
if test "$with_dynamic" = "yes"; then
case "$opsys" in
- hpux* | sunos4* | sco5 ) opsys="${opsys}-shr" ;;
- decosf* ) ld_call_shared="-call_shared" ;;
- darwin ) $as_echo "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
+ hpux* ) opsys="${opsys}-shr" ;;
+ darwin ) cat >>confdefs.h <<\_ACEOF
+#define DLSYM_NEEDS_UNDERSCORE 1
+_ACEOF
;;
esac
else case "$opsys" in
@@ -6214,7 +5423,6 @@
echo "Rerun configure without specifying --without-dynamic."
exit 1 ;;
linux ) ld_call_shared="-Bstatic" ;;
- decosf* ) ld_call_shared="-non_shared" ;;
esac
fi
@@ -6238,12 +5446,16 @@
fi
if test "$with_workshop" = "yes"; then
- $as_echo "#define SUNPRO 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define SUNPRO 1
+_ACEOF
fi
if test "$enable_clash_detection" != "no"; then
- $as_echo "#define CLASH_DETECTION 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define CLASH_DETECTION 1
+_ACEOF
fi
@@ -6285,9 +5497,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -6298,24 +5510,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6325,9 +5537,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -6338,24 +5550,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6364,7 +5576,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -6378,9 +5590,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -6391,24 +5603,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6418,9 +5630,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -6432,18 +5644,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -6462,10 +5674,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6477,9 +5689,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -6490,24 +5702,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6521,9 +5733,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -6534,24 +5746,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -6564,7 +5776,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -6575,55 +5787,73 @@
fi
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
set X $ac_compile
ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
;
return 0;
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
$as_echo_n "checking for C compiler default output file name... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
@@ -6640,17 +5870,17 @@
done
rm -f $ac_rmfiles
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
@@ -6667,7 +5897,7 @@
# certainly right.
break;;
*.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
@@ -6686,75 +5916,84 @@
else
ac_file=''
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then :
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test -z "$ac_file"; then
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
-fi
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
+fi
+
ac_exeext=$ac_cv_exeext
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
$as_echo_n "checking whether the C compiler works... " >&6; }
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
$as_echo "$cross_compiling" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -6769,24 +6008,32 @@
esac
done
else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
-fi
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+fi
+
rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_objext+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -6798,17 +6045,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
@@ -6821,23 +6068,31 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
-fi
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+fi
+
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -6851,16 +6106,37 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- ac_compiler_gnu=no
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
@@ -6869,68 +6145,145 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- ac_c_werror_flag=$ac_save_c_werror_flag
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -6947,14 +6300,18 @@
CFLAGS=
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -7011,9 +6368,32 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
-fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -7024,19 +6404,17 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
$as_echo "none needed" >&6; } ;;
xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
+
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -7056,14 +6434,14 @@
ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
+ if test "${ac_cv_prog_CPP+set}" = set; then
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -7078,7 +6456,11 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -7087,34 +6469,78 @@
#endif
Syntax error
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
# Passes both tests.
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok; then
break
fi
@@ -7126,7 +6552,7 @@
else
ac_cv_prog_CPP=$CPP
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
@@ -7137,7 +6563,11 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -7146,40 +6576,87 @@
#endif
Syntax error
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
# Passes both tests.
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if $ac_preproc_ok; then
+ :
+else
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
fi
ac_ext=c
@@ -7192,9 +6669,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if test "${ac_cv_path_GREP+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -7205,7 +6682,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
+ for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
@@ -7225,7 +6702,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
+ ac_count=`expr $ac_count + 1`
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
@@ -7240,24 +6717,26 @@
$ac_path_GREP_found && break 3
done
done
- done
+done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
fi
else
ac_cv_path_GREP=$GREP
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
$as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if test "${ac_cv_path_EGREP+set}" = set; then
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -7271,7 +6750,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
+ for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
@@ -7291,7 +6770,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
+ ac_count=`expr $ac_count + 1`
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
@@ -7306,10 +6785,12 @@
$ac_path_EGREP_found && break 3
done
done
- done
+done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
fi
else
ac_cv_path_EGREP=$EGREP
@@ -7317,17 +6798,21 @@
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_header_stdc+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -7342,23 +6827,48 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
- ac_cv_header_stdc=no
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_stdc=no
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
+ $EGREP "memchr" >/dev/null 2>&1; then
+ :
else
ac_cv_header_stdc=no
fi
@@ -7368,14 +6878,18 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
-
+ $EGREP "free" >/dev/null 2>&1; then
+ :
else
ac_cv_header_stdc=no
fi
@@ -7385,10 +6899,14 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -7415,34 +6933,118 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -7453,8 +7055,139 @@
- ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+ if test "${ac_cv_header_minix_config_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <minix/config.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <minix/config.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_minix_config_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+
+fi
+if test "x$ac_cv_header_minix_config_h" = x""yes; then
MINIX=yes
else
MINIX=
@@ -7463,23 +7196,34 @@
if test "$MINIX" = yes; then
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-
-
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
-
-
-$as_echo "#define _MINIX 1" >>confdefs.h
-
- fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_SOURCE 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_1_SOURCE 2
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _MINIX 1
+_ACEOF
+
+ fi
+
+
+
+ { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
# define __EXTENSIONS__ 1
@@ -7492,26 +7236,56 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_safe_to_define___extensions__=yes
else
- ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_safe_to_define___extensions__=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
test $ac_cv_safe_to_define___extensions__ = yes &&
- $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
- $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
-
- $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
- $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
- $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-
+ cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
ac_ext=c
@@ -7525,9 +7299,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -7538,24 +7312,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7565,9 +7339,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -7578,24 +7352,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7604,7 +7378,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7618,9 +7392,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -7631,24 +7405,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7658,9 +7432,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -7672,18 +7446,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -7702,10 +7476,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7717,9 +7491,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -7730,24 +7504,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7761,9 +7535,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -7774,24 +7548,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -7804,7 +7578,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -7815,42 +7589,62 @@
fi
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
set X $ac_compile
ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -7864,16 +7658,37 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- ac_compiler_gnu=no
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
@@ -7882,68 +7697,145 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- ac_c_werror_flag=$ac_save_c_werror_flag
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -7960,14 +7852,18 @@
CFLAGS=
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -8024,9 +7920,32 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
-fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -8037,19 +7956,17 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
$as_echo "none needed" >&6; } ;;
xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
+
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -8073,9 +7990,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -8086,24 +8003,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8113,9 +8030,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -8126,24 +8043,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8152,7 +8069,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8166,9 +8083,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -8179,24 +8096,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8206,9 +8123,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -8220,18 +8137,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -8250,10 +8167,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8265,9 +8182,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -8278,24 +8195,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8309,9 +8226,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -8322,24 +8239,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8352,7 +8269,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8363,42 +8280,62 @@
fi
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
set X $ac_compile
ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -8412,16 +8349,37 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- ac_compiler_gnu=no
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
@@ -8430,68 +8388,145 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- ac_c_werror_flag=$ac_save_c_werror_flag
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -8508,14 +8543,18 @@
CFLAGS=
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -8572,9 +8611,32 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
-fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -8585,19 +8647,17 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
$as_echo "none needed" >&6; } ;;
xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
+
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -8621,9 +8681,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -8634,24 +8694,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8661,9 +8721,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -8674,24 +8734,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8700,7 +8760,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8714,9 +8774,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -8727,24 +8787,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8754,9 +8814,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -8768,18 +8828,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
@@ -8798,10 +8858,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8813,9 +8873,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if test "${ac_cv_prog_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -8826,24 +8886,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
$as_echo "$CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8857,9 +8917,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -8870,24 +8930,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
$as_echo "$ac_ct_CC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8900,7 +8960,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -8911,42 +8971,62 @@
fi
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
set X $ac_compile
ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
- { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- sed '10a\
-... rest of stderr output deleted ...
- 10q' conftest.err >conftest.er1
- cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -8960,16 +9040,37 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- ac_compiler_gnu=no
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
@@ -8978,68 +9079,145 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
ac_cv_prog_cc_g=no
CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- CFLAGS=""
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
- ac_c_werror_flag=$ac_save_c_werror_flag
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
CFLAGS="-g"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
@@ -9056,14 +9234,18 @@
CFLAGS=
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -9120,9 +9302,32 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
-fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
@@ -9133,19 +9338,17 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
$as_echo "none needed" >&6; } ;;
xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
$as_echo "unsupported" >&6; } ;;
*)
CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
+
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -9160,47 +9363,115 @@
CFLAGS="$xe_save_CFLAGS"
if test "$GCC" = "yes"; then
-if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int main () {
return __GNUC__;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- :
-else
- __GCC="$?"
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+__GCC="$?"
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int main () {
return __GNUC_MINOR__;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- :
-else
- __GCC_MINOR="$?"
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+__GCC_MINOR="$?"
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
__GCC_VERSION=$__GCC"."$__GCC_MINOR
echo "You appear to be using GCC version" $__GCC_VERSION
@@ -9224,14 +9495,14 @@
ac_compile='$CC -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then :
+ if test "${ac_cv_prog_CPP+set}" = set; then
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -9246,7 +9517,11 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -9255,34 +9530,78 @@
#endif
Syntax error
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
# Passes both tests.
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok; then
break
fi
@@ -9294,7 +9613,7 @@
else
ac_cv_prog_CPP=$CPP
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
@@ -9305,7 +9624,11 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -9314,40 +9637,87 @@
#endif
Syntax error
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
# Broken: fails on valid input.
continue
fi
+
rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
# Passes both tests.
ac_preproc_ok=:
break
fi
+
rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if $ac_preproc_ok; then
+ :
+else
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
fi
ac_ext=c
@@ -9362,9 +9732,13 @@
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc" >&5
+{ $as_echo "$as_me:$LINENO: checking for GNU libc" >&5
$as_echo_n "checking for GNU libc... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <features.h>
int
@@ -9380,50 +9754,96 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
have_glibc=yes
else
- have_glibc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_glibc" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ have_glibc=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $have_glibc" >&5
$as_echo "$have_glibc" >&6; }
-test "$have_glibc" = "yes" && $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+test "$have_glibc" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
case "$opsys" in
sol2)
- $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
if test "$os_release" -ge 505; then
- $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
-
- $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define _XOPEN_SOURCE 500
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define _XOPEN_SOURCE_EXTENDED 1
+_ACEOF
fi ;;
linux)
- $as_echo "#define _POSIX_C_SOURCE 199506L" >>confdefs.h
-
- $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
-
- $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define _POSIX_C_SOURCE 199506L
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define _XOPEN_SOURCE 500
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define _XOPEN_SOURCE_EXTENDED 1
+_ACEOF
;;
freebsd4*)
- $as_echo "#define _POSIX_C_SOURCE 199506L" >>confdefs.h
-
- $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define _POSIX_C_SOURCE 199506L
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define _XOPEN_SOURCE 500
+_ACEOF
;;
esac
-if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int main () {
#if defined __SUNPRO_C
@@ -9439,10 +9859,36 @@
#endif
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- case "$?" in
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+case "$?" in
11) echo "You appear to be using the SunPro C compiler." ; __SUNPRO_C=yes ;;
12) echo "You appear to be using the DEC C compiler." ; __DECC=yes ;;
13) echo "You appear to be using the SCO C compiler." ; __USLC__=yes ;;
@@ -9450,9 +9896,10 @@
GCC=no ;;
esac
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
@@ -9558,15 +10005,11 @@
#ifdef ORDINARY_LINK
#define LD ORDINARY_LD
#else /* no ORDINARY LINK */
-#ifdef COFF_ENCAPSULATE
-#define LD "\$(CC) -nostdlib"
-#else /* not COFF_ENCAPSULATE */
#ifdef LINKER
#define LD LINKER
#else /* ! defined (LINKER) */
#define LD "ld"
#endif /* ! defined (LINKER) */
-#endif /* ! defined (COFF_ENCAPSULATE) */
#endif /* not ORDINARY_LINK */
configure___ ld=LD
@@ -9583,11 +10026,7 @@
#if ! defined (ORDINARY_LINK) && !defined (START_FILES)
#ifdef NO_REMAP
-#ifdef COFF_ENCAPSULATE
-#define START_FILES "pre-crt0.o /usr/local/lib/gcc-crt0.o"
-#else /* ! defined (COFF_ENCAPSULATE) */
#define START_FILES "pre-crt0.o /lib/crt0.o"
-#endif /* ! defined (COFF_ENCAPSULATE) */
#else /* ! defined (NO_REMAP) */
#define START_FILES "ecrt0.o"
#endif /* ! defined (NO_REMAP) */
@@ -9700,10 +10139,14 @@
test "$__DECC" = "yes" && c_switch_site="$c_switch_site -std1" && if test "$verbose" = "yes"; then echo " Appending \"-std1\" to \$c_switch_site"; fi
if test "$__USLC__" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for whether the -Kalloca compiler flag is needed" >&5
+ { $as_echo "$as_me:$LINENO: checking for whether the -Kalloca compiler flag is needed" >&5
$as_echo_n "checking for whether the -Kalloca compiler flag is needed... " >&6; }
need_kalloca=no
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -9714,13 +10157,40 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- :
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
xe_save_c_switch_system="$c_switch_system"
c_switch_system="$c_switch_system -Kalloca"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -9731,16 +10201,45 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
need_kalloca=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
c_switch_system="$xe_save_c_switch_system"
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $need_kalloca" >&5
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ { $as_echo "$as_me:$LINENO: result: $need_kalloca" >&5
$as_echo "$need_kalloca" >&6; }
test "$need_kalloca" = "yes" && c_switch_system="$c_switch_system -Kalloca" && if test "$verbose" = "yes"; then echo " Appending \"-Kalloca\" to \$c_switch_system"; fi
fi
@@ -9751,7 +10250,7 @@
case "$XEMACS_CC" in
*g++* )
if test "$GCC" != "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: CC and g++ are mismatched; XE_CFLAGS may be wrong" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: CC and g++ are mismatched; XE_CFLAGS may be wrong" >&5
$as_echo "$as_me: WARNING: CC and g++ are mismatched; XE_CFLAGS may be wrong" >&2;}
xemacs_cc_cc_mismatch=yes
fi
@@ -9763,7 +10262,7 @@
# it's as expected, do nothing
;;
* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong" >&5
$as_echo "$as_me: WARNING: gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong" >&2;}
xemacs_cc_cc_mismatch=yes
;;
@@ -9788,9 +10287,7 @@
fi
fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for preferred optimization flags" >&5
+{ $as_echo "$as_me:$LINENO: checking for preferred optimization flags" >&5
$as_echo_n "checking for preferred optimization flags... " >&6; }
if test "$with_optimization" = "yes" ; then
if test "$cflags_optimization_specified" = "no"; then
@@ -9799,7 +10296,6 @@
elif test "$__SUNPRO_C" = "yes"; then
case "$opsys" in
sol2 ) with_cflags_optimization="-xO4" ;;
- sunos4* ) with_cflags_optimization="-xO2" ;;
esac
elif test "$__DECC" = "yes"; then
with_cflags_optimization="-O3"
@@ -9814,11 +10310,10 @@
with_cflags_optimization=
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_cflags_optimization}" >&5
+{ $as_echo "$as_me:$LINENO: result: ${with_cflags_optimization}" >&5
$as_echo "${with_cflags_optimization}" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for preferred debugging flags" >&5
+{ $as_echo "$as_me:$LINENO: checking for preferred debugging flags" >&5
$as_echo_n "checking for preferred debugging flags... " >&6; }
if test "$cflags_debugging_specified" = "no"; then
with_cflags_debugging="-g"
@@ -9832,11 +10327,11 @@
with_cflags_debugging=
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_cflags_debugging}" >&5
+{ $as_echo "$as_me:$LINENO: result: ${with_cflags_debugging}" >&5
$as_echo "${with_cflags_debugging}" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for preferred warning flags for XEMACS_CC" >&5
+{ $as_echo "$as_me:$LINENO: checking for preferred warning flags for XEMACS_CC" >&5
$as_echo_n "checking for preferred warning flags for XEMACS_CC... " >&6; }
xe_cflags_warning=""
@@ -9870,16 +10365,16 @@
fi
fi
test -z "$xe_cflags_warning" && xe_cflags_warning="$with_cflags_warning"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${xe_cflags_warning}" >&5
+{ $as_echo "$as_me:$LINENO: result: ${xe_cflags_warning}" >&5
$as_echo "${xe_cflags_warning}" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for preferred warning flags for CC" >&5
+{ $as_echo "$as_me:$LINENO: checking for preferred warning flags for CC" >&5
$as_echo_n "checking for preferred warning flags for CC... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_cflags_warning}" >&5
+{ $as_echo "$as_me:$LINENO: result: ${with_cflags_warning}" >&5
$as_echo "${with_cflags_warning}" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for remaining CFLAGS" >&5
+{ $as_echo "$as_me:$LINENO: checking for remaining CFLAGS" >&5
$as_echo_n "checking for remaining CFLAGS... " >&6; }
if test "$cflags_specified" = "no"; then
@@ -9887,24 +10382,24 @@
CFLAGS="-qro"
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CFLAGS}" >&5
+{ $as_echo "$as_me:$LINENO: result: ${CFLAGS}" >&5
$as_echo "${CFLAGS}" >&6; }
XE_CFLAGS="$xe_cflags_warning $with_cflags_debugging $with_cflags_optimization $CFLAGS"
CFLAGS="$with_cflags_warning $with_cflags_debugging $with_cflags_optimization $CFLAGS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking total value of XE_CFLAGS" >&5
+{ $as_echo "$as_me:$LINENO: checking total value of XE_CFLAGS" >&5
$as_echo_n "checking total value of XE_CFLAGS... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${XE_CFLAGS}" >&5
+{ $as_echo "$as_me:$LINENO: result: ${XE_CFLAGS}" >&5
$as_echo "${XE_CFLAGS}" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking total value of CFLAGS" >&5
+{ $as_echo "$as_me:$LINENO: checking total value of CFLAGS" >&5
$as_echo_n "checking total value of CFLAGS... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${CFLAGS}" >&5
+{ $as_echo "$as_me:$LINENO: result: ${CFLAGS}" >&5
$as_echo "${CFLAGS}" >&6; }
if test "$GCC" = "yes"; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for buggy gcc versions" >&5
+{ $as_echo "$as_me:$LINENO: checking for buggy gcc versions" >&5
$as_echo_n "checking for buggy gcc versions... " >&6; }
GCC_VERSION=`$CC --version`
case `uname -s`:`uname -m`:$GCC_VERSION in
@@ -9914,26 +10409,30 @@
case "$CFLAGS" in
*-fno-schedule-insns*) ;;
*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures" >&5
$as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: without also using -fno-schedule-insns." >&5
+ { $as_echo "$as_me:$LINENO: WARNING: without also using -fno-schedule-insns." >&5
$as_echo "$as_me: WARNING: without also using -fno-schedule-insns." >&2;}
- as_fn_error "Aborting due to known problem" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: Aborting due to known problem" >&5
+$as_echo "$as_me: error: Aborting due to known problem" >&2;}
+ { (exit 1); exit 1; }; }
;;
esac
;;
esac
;;
Linux:alpha:egcs-2.91.*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: There have been reports of egcs-1.1 not compiling XEmacs correctly on" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: There have been reports of egcs-1.1 not compiling XEmacs correctly on" >&5
$as_echo "$as_me: WARNING: There have been reports of egcs-1.1 not compiling XEmacs correctly on" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Alpha Linux. There have also been reports that egcs-1.0.3a is O.K." >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Alpha Linux. There have also been reports that egcs-1.0.3a is O.K." >&5
$as_echo "$as_me: WARNING: Alpha Linux. There have also been reports that egcs-1.0.3a is O.K." >&2;}
- as_fn_error "Aborting due to known problem" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: Aborting due to known problem" >&5
+$as_echo "$as_me: error: Aborting due to known problem" >&2;}
+ { (exit 1); exit 1; }; }
;;
*:i*86*:2.7.2*)
case "$CFLAGS" in
@@ -9943,13 +10442,15 @@
case "$CFLAGS" in
*-fno-strength-reduce*) ;;
*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&5
$as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -fno-strength-reduce." >&5
+ { $as_echo "$as_me:$LINENO: WARNING: -fno-strength-reduce." >&5
$as_echo "$as_me: WARNING: -fno-strength-reduce." >&2;}
- as_fn_error "Aborting due to known problem" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: Aborting due to known problem" >&5
+$as_echo "$as_me: error: Aborting due to known problem" >&2;}
+ { (exit 1); exit 1; }; }
;;
esac
;;
@@ -9957,31 +10458,33 @@
case "$CFLAGS" in
*-fno-caller-saves*) ;;
*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&5
$as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -fno-caller-saves." >&5
+ { $as_echo "$as_me:$LINENO: WARNING: -fno-caller-saves." >&5
$as_echo "$as_me: WARNING: -fno-caller-saves." >&2;}
- as_fn_error "Aborting due to known problem" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: Aborting due to known problem" >&5
+$as_echo "$as_me: error: Aborting due to known problem" >&2;}
+ { (exit 1); exit 1; }; }
;;
esac
;;
esac
;;
esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$enable_pdump" != "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"-z nocombreloc\" linker flag" >&5
+ { $as_echo "$as_me:$LINENO: checking for \"-z nocombreloc\" linker flag" >&5
$as_echo_n "checking for \"-z nocombreloc\" linker flag... " >&6; }
case "`ld --help 2>&1`" in
- *-z\ nocombreloc* ) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ *-z\ nocombreloc* ) { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ *) { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; } ;;
esac
fi
@@ -10065,25 +10568,6 @@
echo " xemacs will be linked with \"dumper.o\""
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dynodump" >&5
-$as_echo_n "checking for dynodump... " >&6; }
-if test "$unexec" != "unexsol2.o"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- $as_echo "#define DYNODUMP 1" >>confdefs.h
-
- MAKE_SUBDIR="$MAKE_SUBDIR dynodump" && if test "$verbose" = "yes"; then echo " Appending \"dynodump\" to \$MAKE_SUBDIR"; fi
- SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS dynodump" && if test "$verbose" = "yes"; then echo " Appending \"dynodump\" to \$SRC_SUBDIR_DEPS"; fi
- case "$machine" in
- sparc ) dynodump_arch=sparc ;;
- *86* ) dynodump_arch=i386 ;;
- powerpc ) dynodump_arch=ppc ;;
- esac
-fi
-
ac_ext=c
@@ -10105,14 +10589,18 @@
for f in "/usr/lpp/X11/bin/smt.exp" "/usr/bin/X11/smt.exp"; do
if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; break; fi
done
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for terminateAndUnload in -lc" >&5
+ { $as_echo "$as_me:$LINENO: checking for terminateAndUnload in -lc" >&5
$as_echo_n "checking for terminateAndUnload in -lc... " >&6; }
-if test "${ac_cv_lib_c_terminateAndUnload+set}" = set; then :
+if test "${ac_cv_lib_c_terminateAndUnload+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lc $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -10130,18 +10618,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_c_terminateAndUnload=yes
else
- ac_cv_lib_c_terminateAndUnload=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_terminateAndUnload" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_c_terminateAndUnload=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_terminateAndUnload" >&5
$as_echo "$ac_cv_lib_c_terminateAndUnload" >&6; }
-if test "x$ac_cv_lib_c_terminateAndUnload" = x""yes; then :
+if test "x$ac_cv_lib_c_terminateAndUnload" = x""yes; then
libs_system="$libs_system -lC" && if test "$verbose" = "yes"; then echo " Appending \"-lC\" to \$libs_system"; fi
fi
@@ -10166,7 +10679,7 @@
gcc_compiler_specs=""
libc_version=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler version information" >&5
+{ $as_echo "$as_me:$LINENO: checking for compiler version information" >&5
$as_echo_n "checking for compiler version information... " >&6; }
if test "$GCC" = "yes"; then
@@ -10216,10 +10729,10 @@
if test -z "$compiler_version"; then
compiler_version="detection failed (please report this)"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $compiler_version" >&5
+{ $as_echo "$as_me:$LINENO: result: $compiler_version" >&5
$as_echo "$compiler_version" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard C library version information" >&5
+{ $as_echo "$as_me:$LINENO: checking for standard C library version information" >&5
$as_echo_n "checking for standard C library version information... " >&6; }
case "$ac_cv_build" in
@@ -10259,7 +10772,7 @@
if test -z "libc_version"; then
libc_version="detection failed (please report this)"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_version" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_version" >&5
$as_echo "$libc_version" >&6; }
@@ -10326,17 +10839,17 @@
elif test "$with_dynamic" = "no"; then add_runtime_path=no
elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes
else case "$opsys" in
- sol2 | irix* | *bsd* | decosf* ) add_runtime_path=yes ;;
+ sol2 | irix* | *bsd* ) add_runtime_path=yes ;;
* ) add_runtime_path=no ;;
esac
fi
if test "$add_runtime_path" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for runtime libraries flag" >&5
+ { $as_echo "$as_me:$LINENO: checking for runtime libraries flag" >&5
$as_echo_n "checking for runtime libraries flag... " >&6; }
case "$opsys" in
sol2 ) dash_r="-R" ;;
- decosf* | linux* | irix*) dash_r="-rpath " ;;
+ linux* | irix*) dash_r="-rpath " ;;
*)
dash_r=""
for try_dash_r in "-R" "-R " "-rpath "; do
@@ -10354,19 +10867,46 @@
shift
done
fi
- if ac_fn_c_try_link "$LINENO"; then :
+ rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
dash_r="$try_dash_r"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
xe_check_libs=""
test -n "$dash_r" && break
done ;;
esac
if test -n "$dash_r";
- then { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"${dash_r}\"" >&5
+ then { $as_echo "$as_me:$LINENO: result: \"${dash_r}\"" >&5
$as_echo "\"${dash_r}\"" >&6; }
- else { $as_echo "$as_me:${as_lineno-$LINENO}: result: NONE" >&5
+ else { $as_echo "$as_me:$LINENO: result: NONE" >&5
$as_echo "NONE" >&6; }
fi
fi
@@ -10447,10 +10987,10 @@
case "$opsys" in
darwin )
if test "$with_system_malloc" = "default"; then
- system_malloc=yes;
- with_system_malloc=yes;
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Forcing system malloc on Darwin." >&5
-$as_echo "Forcing system malloc on Darwin." >&6; };
+ system_malloc=yes
+ with_system_malloc=yes
+ { $as_echo "$as_me:$LINENO: WARNING: Forcing system malloc on Darwin." >&5
+$as_echo "$as_me: WARNING: Forcing system malloc on Darwin." >&2;}
fi ;;
esac
@@ -10461,16 +11001,104 @@
doug_lea_malloc=no
fi
after_morecore_hook_exists=yes
-ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state"
-if test "x$ac_cv_func_malloc_set_state" = x""yes; then :
-
+{ $as_echo "$as_me:$LINENO: checking for malloc_set_state" >&5
+$as_echo_n "checking for malloc_set_state... " >&6; }
+if test "${ac_cv_func_malloc_set_state+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define malloc_set_state to an innocuous variant, in case <limits.h> declares malloc_set_state.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define malloc_set_state innocuous_malloc_set_state
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char malloc_set_state (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef malloc_set_state
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char malloc_set_state ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_malloc_set_state || defined __stub___malloc_set_state
+choke me
+#endif
+
+int
+main ()
+{
+return malloc_set_state ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_malloc_set_state=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_malloc_set_state=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_set_state" >&5
+$as_echo "$ac_cv_func_malloc_set_state" >&6; }
+if test "x$ac_cv_func_malloc_set_state" = x""yes; then
+ :
else
doug_lea_malloc=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __after_morecore_hook exists" >&5
+{ $as_echo "$as_me:$LINENO: checking whether __after_morecore_hook exists" >&5
$as_echo_n "checking whether __after_morecore_hook exists... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
extern void (* __after_morecore_hook)();
int
@@ -10481,16 +11109,41 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
after_morecore_hook_exists=no
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
if test "$system_malloc" = "yes" ; then
GNU_MALLOC=no
GNU_MALLOC_reason="
@@ -10508,12 +11161,16 @@
if test "$doug_lea_malloc" = "yes" -a "$GNU_MALLOC" = "yes" ; then
GNU_MALLOC_reason="
- Using Doug Lea's new malloc from the GNU C Library."
- $as_echo "#define DOUG_LEA_MALLOC 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define DOUG_LEA_MALLOC 1
+_ACEOF
if test "$after_morecore_hook_exists" = "no" ; then
GNU_MALLOC_reason="
- Using Doug Lea's new malloc from the Linux C Library."
- $as_echo "#define _NO_MALLOC_WARNING_ 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define _NO_MALLOC_WARNING_ 1
+_ACEOF
fi
fi
@@ -10523,9 +11180,9 @@
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if test "${ac_cv_prog_AR+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
@@ -10536,14 +11193,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="ar"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="not_found"
@@ -10551,10 +11208,10 @@
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+ { $as_echo "$as_me:$LINENO: result: $AR" >&5
$as_echo "$AR" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -10565,9 +11222,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -10578,24 +11235,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
$as_echo "$RANLIB" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -10605,9 +11262,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -10618,24 +11275,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
$as_echo "$ac_ct_RANLIB" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -10644,7 +11301,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -10668,10 +11325,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if test "${ac_cv_path_install+set}" = set; then
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10679,11 +11336,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
- ./ | .// | /[cC]/* | \
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
@@ -10720,7 +11377,7 @@
;;
esac
- done
+done
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
@@ -10736,7 +11393,7 @@
INSTALL=$ac_install_sh
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -10751,9 +11408,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then :
+if test "${ac_cv_prog_YACC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
@@ -10764,24 +11421,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_YACC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
fi
fi
YACC=$ac_cv_prog_YACC
if test -n "$YACC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+ { $as_echo "$as_me:$LINENO: result: $YACC" >&5
$as_echo "$YACC" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -10791,12 +11448,165 @@
test -n "$YACC" || YACC="yacc"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
for ac_header in a.out.h elf.h cygwin/version.h fcntl.h libgen.h locale.h wchar.h mach/mach.h sys/param.h sys/pstat.h sys/resource.h sys/time.h sys/timeb.h sys/times.h sys/un.h sys/vlimit.h ulimit.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -10805,12 +11615,16 @@
done
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if test "${ac_cv_header_sys_wait_h+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_header_sys_wait_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/wait.h>
@@ -10831,27 +11645,54 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_header_sys_wait_h=yes
else
- ac_cv_header_sys_wait_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_sys_wait_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
$as_echo "$ac_cv_header_sys_wait_h" >&6; }
if test $ac_cv_header_sys_wait_h = yes; then
-$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SYS_WAIT_H 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_header_stdc+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -10866,23 +11707,48 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
- ac_cv_header_stdc=no
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_stdc=no
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
+ $EGREP "memchr" >/dev/null 2>&1; then
+ :
else
ac_cv_header_stdc=no
fi
@@ -10892,14 +11758,18 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
-
+ $EGREP "free" >/dev/null 2>&1; then
+ :
else
ac_cv_header_stdc=no
fi
@@ -10909,10 +11779,14 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
@@ -10939,31 +11813,64 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_header_time+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
@@ -10978,43 +11885,128 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_header_time=yes
else
- ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_time=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
$as_echo "$ac_cv_header_time" >&6; }
if test $ac_cv_header_time = yes; then
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
-ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "#include <signal.h>
+cat >>confdefs.h <<\_ACEOF
+#define TIME_WITH_SYS_TIME 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5
+$as_echo_n "checking whether sys_siglist is declared... " >&6; }
+if test "${ac_cv_have_decl_sys_siglist+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <signal.h>
/* NetBSD declares sys_siglist in unistd.h. */
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
-"
-if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
+
+int
+main ()
+{
+#ifndef sys_siglist
+ (void) sys_siglist;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_sys_siglist=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_sys_siglist=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5
+$as_echo "$ac_cv_have_decl_sys_siglist" >&6; }
+if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SYS_SIGLIST $ac_have_decl
-_ACEOF
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utime" >&5
+#define HAVE_DECL_SYS_SIGLIST 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SYS_SIGLIST 0
+_ACEOF
+
+
+fi
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for utime" >&5
$as_echo_n "checking for utime... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#include <utime.h>
@@ -11026,35 +12018,152 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
- $as_echo "#define HAVE_UTIME 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- for ac_func in utimes
-do :
- ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes"
-if test "x$ac_cv_func_utimes" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_UTIMES 1
-_ACEOF
-
-fi
-done
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_UTIME 1
+_ACEOF
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+for ac_func in utimes
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
$as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_type_signal+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
@@ -11067,14 +12176,35 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_type_signal=int
else
- ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_signal=void
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
@@ -11082,9 +12212,102 @@
_ACEOF
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
-
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
+if test "${ac_cv_type_size_t+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (size_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((size_t)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_size_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
+if test "x$ac_cv_type_size_t" = x""yes; then
+ :
else
cat >>confdefs.h <<_ACEOF
@@ -11093,9 +12316,102 @@
fi
-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = x""yes; then :
-
+{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+$as_echo_n "checking for pid_t... " >&6; }
+if test "${ac_cv_type_pid_t+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_pid_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (pid_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((pid_t)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_pid_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+$as_echo "$ac_cv_type_pid_t" >&6; }
+if test "x$ac_cv_type_pid_t" = x""yes; then
+ :
else
cat >>confdefs.h <<_ACEOF
@@ -11104,18 +12420,22 @@
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_type_uid_t+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "uid_t" >/dev/null 2>&1; then :
+ $EGREP "uid_t" >/dev/null 2>&1; then
ac_cv_type_uid_t=yes
else
ac_cv_type_uid_t=no
@@ -11123,20 +12443,117 @@
rm -f conftest*
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
$as_echo "$ac_cv_type_uid_t" >&6; }
if test $ac_cv_type_uid_t = no; then
-$as_echo "#define uid_t int" >>confdefs.h
-
-
-$as_echo "#define gid_t int" >>confdefs.h
-
-fi
-
-ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = x""yes; then :
-
+cat >>confdefs.h <<\_ACEOF
+#define uid_t int
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define gid_t int
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
+$as_echo_n "checking for mode_t... " >&6; }
+if test "${ac_cv_type_mode_t+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_mode_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (mode_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((mode_t)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_mode_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+$as_echo "$ac_cv_type_mode_t" >&6; }
+if test "x$ac_cv_type_mode_t" = x""yes; then
+ :
else
cat >>confdefs.h <<_ACEOF
@@ -11145,9 +12562,102 @@
fi
-ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = x""yes; then :
-
+{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
+$as_echo_n "checking for off_t... " >&6; }
+if test "${ac_cv_type_off_t+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_off_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (off_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((off_t)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_off_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+$as_echo "$ac_cv_type_off_t" >&6; }
+if test "x$ac_cv_type_off_t" = x""yes; then
+ :
else
cat >>confdefs.h <<_ACEOF
@@ -11156,9 +12666,102 @@
fi
-ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = x""yes; then :
-
+{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
+$as_echo_n "checking for ssize_t... " >&6; }
+if test "${ac_cv_type_ssize_t+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_ssize_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (ssize_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((ssize_t)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_ssize_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
+$as_echo "$ac_cv_type_ssize_t" >&6; }
+if test "x$ac_cv_type_ssize_t" = x""yes; then
+ :
else
cat >>confdefs.h <<_ACEOF
@@ -11169,67 +12772,152 @@
if test "$ac_cv_header_inttypes_h" != "yes"; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for intptr_t in sys/types.h" >&5
+{ $as_echo "$as_me:$LINENO: checking for intptr_t in sys/types.h" >&5
$as_echo_n "checking for intptr_t in sys/types.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
intptr_t x;
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
- $as_echo "#define HAVE_INTPTR_T_IN_SYS_TYPES_H 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_INTPTR_T_IN_SYS_TYPES_H 1
+_ACEOF
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
$as_echo_n "checking for socklen_t... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
socklen_t x;
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
else
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
int accept (int, struct sockaddr *, size_t *);
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: size_t" >&5
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+
+{ $as_echo "$as_me:$LINENO: result: size_t" >&5
$as_echo "size_t" >&6; }
-$as_echo "#define socklen_t size_t" >>confdefs.h
-
-else
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5
+cat >>confdefs.h <<\_ACEOF
+#define socklen_t size_t
+_ACEOF
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+{ $as_echo "$as_me:$LINENO: result: int" >&5
$as_echo "int" >&6; }
-$as_echo "#define socklen_t int" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
+cat >>confdefs.h <<\_ACEOF
+#define socklen_t int
+_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:$LINENO: checking for struct timeval" >&5
$as_echo_n "checking for struct timeval... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
@@ -11249,25 +12937,52 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
HAVE_TIMEVAL=yes
- $as_echo "#define HAVE_TIMEVAL 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_TIMEVAL 1
+_ACEOF
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
HAVE_TIMEVAL=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_struct_tm+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#include <time.h>
@@ -11282,26 +12997,146 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_struct_tm=time.h
else
- ac_cv_struct_tm=sys/time.h
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_struct_tm=sys/time.h
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
$as_echo "$ac_cv_struct_tm" >&6; }
if test $ac_cv_struct_tm = sys/time.h; then
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
-
-fi
-
-ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
+cat >>confdefs.h <<\_ACEOF
+#define TM_IN_SYS_TIME 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
+$as_echo_n "checking for struct tm.tm_zone... " >&6; }
+if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
#include <$ac_cv_struct_tm>
-"
-if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
+
+int
+main ()
+{
+static struct tm ac_aggr;
+if (ac_aggr.tm_zone)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_tm_tm_zone=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <$ac_cv_struct_tm>
+
+
+int
+main ()
+{
+static struct tm ac_aggr;
+if (sizeof ac_aggr.tm_zone)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_tm_tm_zone=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_member_struct_tm_tm_zone=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
+$as_echo "$ac_cv_member_struct_tm_tm_zone" >&6; }
+if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_TM_TM_ZONE 1
@@ -11312,27 +13147,91 @@
if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
-$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
-
-else
- ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
-"
-if test "x$ac_cv_have_decl_tzname" = x""yes; then :
- ac_have_decl=1
-else
- ac_have_decl=0
-fi
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TM_ZONE 1
+_ACEOF
+
+else
+ { $as_echo "$as_me:$LINENO: checking whether tzname is declared" >&5
+$as_echo_n "checking whether tzname is declared... " >&6; }
+if test "${ac_cv_have_decl_tzname+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <time.h>
+
+int
+main ()
+{
+#ifndef tzname
+ (void) tzname;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_tzname=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_tzname=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
+$as_echo "$ac_cv_have_decl_tzname" >&6; }
+if test "x$ac_cv_have_decl_tzname" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TZNAME $ac_have_decl
-_ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+#define HAVE_DECL_TZNAME 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_TZNAME 0
+_ACEOF
+
+
+fi
+
+
+ { $as_echo "$as_me:$LINENO: checking for tzname" >&5
$as_echo_n "checking for tzname... " >&6; }
-if test "${ac_cv_var_tzname+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_var_tzname+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <time.h>
#if !HAVE_DECL_TZNAME
@@ -11347,30 +13246,61 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_var_tzname=yes
else
- ac_cv_var_tzname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_var_tzname=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
$as_echo "$ac_cv_var_tzname" >&6; }
if test $ac_cv_var_tzname = yes; then
-$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
-
- fi
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TZNAME 1
+_ACEOF
+
+ fi
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_c_const+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -11430,27 +13360,50 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_c_const=yes
else
- ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_c_const=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
$as_echo "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
-$as_echo "#define const /**/" >>confdefs.h
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+cat >>confdefs.h <<\_ACEOF
+#define const /**/
+_ACEOF
+
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -11468,24 +13421,29 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
SET_MAKE=
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
+if test "${ac_cv_c_bigendian+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_c_bigendian=unknown
# See if we're dealing with a universal compiler.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifndef __APPLE_CC__
not a universal capable compiler
@@ -11493,34 +13451,46 @@
typedef int dummy;
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
# Check for potential -arch flags. It is not universal unless
- # there are at least two -arch flags with different values.
- ac_arch=
- ac_prev=
- for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
- if test -n "$ac_prev"; then
- case $ac_word in
- i?86 | x86_64 | ppc | ppc64)
- if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
- ac_arch=$ac_word
- else
- ac_cv_c_bigendian=universal
- break
- fi
- ;;
- esac
- ac_prev=
- elif test "x$ac_word" = "x-arch"; then
- ac_prev=arch
- fi
- done
-fi
+ # there are some -arch flags. Note that *ppc* also matches
+ # ppc64. This check is also rather less than ideal.
+ case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
+ *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+ esac
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_c_bigendian = unknown; then
# See if sys/param.h defines the BYTE_ORDER macro.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
@@ -11538,9 +13508,30 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
# It does; now see whether it defined to BIG_ENDIAN or not.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
@@ -11556,18 +13547,49 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_c_bigendian=yes
else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_c_bigendian=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $ac_cv_c_bigendian = unknown; then
# See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <limits.h>
@@ -11582,9 +13604,30 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
# It does; now see whether it defined to _BIG_ENDIAN or not.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <limits.h>
@@ -11599,20 +13642,51 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_c_bigendian=yes
else
- ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_c_bigendian=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $ac_cv_c_bigendian = unknown; then
# Compile a test program.
- if test "$cross_compiling" = yes; then :
+ if test "$cross_compiling" = yes; then
# Try to guess by grepping values from an object file.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
@@ -11638,7 +13712,24 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
@@ -11650,10 +13741,20 @@
ac_cv_c_bigendian=unknown
fi
fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
int
@@ -11673,33 +13774,67 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_c_bigendian=no
else
- ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_bigendian=yes
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+ fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
$as_echo "$ac_cv_c_bigendian" >&6; }
case $ac_cv_c_bigendian in #(
yes)
- $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
;; #(
no)
;; #(
universal)
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define AC_APPLE_UNIVERSAL_BUILD 1
+_ACEOF
;; #(
*)
- as_fn_error "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
@@ -11707,27 +13842,352 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+{ $as_echo "$as_me:$LINENO: checking size of short" >&5
$as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_short" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test "${ac_cv_sizeof_short+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo= ac_hi=
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_short=$ac_lo;;
+'') if test "$ac_cv_type_short" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (short)
-See \`config.log' for more details." "$LINENO" 5; }; }
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (short)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
+ else
+ ac_cv_sizeof_short=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (short)); }
+static unsigned long int ulongval () { return (long int) (sizeof (short)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (short))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (short))))
+ return 1;
+ fprintf (f, "%ld", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (short))))
+ return 1;
+ fprintf (f, "%lu", i);
+ }
+ /* Do not output a trailing newline, as this causes \r\n confusion
+ on some platforms. */
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_short=`cat conftest.val`
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_short" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (short)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
else
ac_cv_sizeof_short=0
fi
fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
$as_echo "$ac_cv_sizeof_short" >&6; }
@@ -11747,27 +14207,352 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+{ $as_echo "$as_me:$LINENO: checking size of int" >&5
$as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_int" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test "${ac_cv_sizeof_int+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo= ac_hi=
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_int=$ac_lo;;
+'') if test "$ac_cv_type_int" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (int)
-See \`config.log' for more details." "$LINENO" 5; }; }
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
+ else
+ ac_cv_sizeof_int=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (int)); }
+static unsigned long int ulongval () { return (long int) (sizeof (int)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (int))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (int))))
+ return 1;
+ fprintf (f, "%ld", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (int))))
+ return 1;
+ fprintf (f, "%lu", i);
+ }
+ /* Do not output a trailing newline, as this causes \r\n confusion
+ on some platforms. */
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_int=`cat conftest.val`
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_int" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
else
ac_cv_sizeof_int=0
fi
fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
$as_echo "$ac_cv_sizeof_int" >&6; }
@@ -11781,27 +14566,352 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+{ $as_echo "$as_me:$LINENO: checking size of long" >&5
$as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test "${ac_cv_sizeof_long+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo= ac_hi=
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long=$ac_lo;;
+'') if test "$ac_cv_type_long" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long)
-See \`config.log' for more details." "$LINENO" 5; }; }
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
+ else
+ ac_cv_sizeof_long=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (long)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (long))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (long))))
+ return 1;
+ fprintf (f, "%ld", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (long))))
+ return 1;
+ fprintf (f, "%lu", i);
+ }
+ /* Do not output a trailing newline, as this causes \r\n confusion
+ on some platforms. */
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_long=`cat conftest.val`
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_long" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
else
ac_cv_sizeof_long=0
fi
fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
$as_echo "$ac_cv_sizeof_long" >&6; }
@@ -11815,27 +14925,352 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
$as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_long_long" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test "${ac_cv_sizeof_long_long+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo= ac_hi=
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long_long=$ac_lo;;
+'') if test "$ac_cv_type_long_long" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long long)
-See \`config.log' for more details." "$LINENO" 5; }; }
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (long long)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
+ else
+ ac_cv_sizeof_long_long=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (long long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (long long)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (long long))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (long long))))
+ return 1;
+ fprintf (f, "%ld", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (long long))))
+ return 1;
+ fprintf (f, "%lu", i);
+ }
+ /* Do not output a trailing newline, as this causes \r\n confusion
+ on some platforms. */
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_long_long=`cat conftest.val`
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_long_long" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (long long)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
else
ac_cv_sizeof_long_long=0
fi
fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
$as_echo "$ac_cv_sizeof_long_long" >&6; }
@@ -11849,27 +15284,352 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+{ $as_echo "$as_me:$LINENO: checking size of void *" >&5
$as_echo_n "checking size of void *... " >&6; }
-if test "${ac_cv_sizeof_void_p+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_void_p" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test "${ac_cv_sizeof_void_p+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo= ac_hi=
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_void_p=$ac_lo;;
+'') if test "$ac_cv_type_void_p" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (void *)
-See \`config.log' for more details." "$LINENO" 5; }; }
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (void *)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
+ else
+ ac_cv_sizeof_void_p=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (void *)); }
+static unsigned long int ulongval () { return (long int) (sizeof (void *)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (void *))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (void *))))
+ return 1;
+ fprintf (f, "%ld", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (void *))))
+ return 1;
+ fprintf (f, "%lu", i);
+ }
+ /* Do not output a trailing newline, as this causes \r\n confusion
+ on some platforms. */
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_void_p=`cat conftest.val`
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_void_p" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (void *)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
else
ac_cv_sizeof_void_p=0
fi
fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
$as_echo "$ac_cv_sizeof_void_p" >&6; }
@@ -11883,27 +15643,352 @@
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
+{ $as_echo "$as_me:$LINENO: checking size of double" >&5
$as_echo_n "checking size of double... " >&6; }
-if test "${ac_cv_sizeof_double+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then :
-
-else
- if test "$ac_cv_type_double" = yes; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test "${ac_cv_sizeof_double+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (double))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_lo=$ac_mid; break
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo= ac_hi=
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_double=$ac_lo;;
+'') if test "$ac_cv_type_double" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (double)
-See \`config.log' for more details." "$LINENO" 5; }; }
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
+ else
+ ac_cv_sizeof_double=0
+ fi ;;
+esac
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (double)); }
+static unsigned long int ulongval () { return (long int) (sizeof (double)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ return 1;
+ if (((long int) (sizeof (double))) < 0)
+ {
+ long int i = longval ();
+ if (i != ((long int) (sizeof (double))))
+ return 1;
+ fprintf (f, "%ld", i);
+ }
+ else
+ {
+ unsigned long int i = ulongval ();
+ if (i != ((long int) (sizeof (double))))
+ return 1;
+ fprintf (f, "%lu", i);
+ }
+ /* Do not output a trailing newline, as this causes \r\n confusion
+ on some platforms. */
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_double=`cat conftest.val`
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_double" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }; }
else
ac_cv_sizeof_double=0
fi
fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
$as_echo "$ac_cv_sizeof_double" >&6; }
@@ -11914,9 +15999,9 @@
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
+{ $as_echo "$as_me:$LINENO: checking for long file names" >&5
$as_echo_n "checking for long file names... " >&6; }
-if test "${ac_cv_sys_long_file_names+set}" = set; then :
+if test "${ac_cv_sys_long_file_names+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_sys_long_file_names=yes
@@ -11946,27 +16031,118 @@
test $ac_cv_sys_long_file_names = no && break
done
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5
$as_echo "$ac_cv_sys_long_file_names" >&6; }
if test $ac_cv_sys_long_file_names = yes; then
-$as_echo "#define HAVE_LONG_FILE_NAMES 1" >>confdefs.h
-
-fi
-
-
-ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin"
-if test "x$ac_cv_func_sin" = x""yes; then :
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LONG_FILE_NAMES 1
+_ACEOF
+
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for sin" >&5
+$as_echo_n "checking for sin... " >&6; }
+if test "${ac_cv_func_sin+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define sin to an innocuous variant, in case <limits.h> declares sin.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define sin innocuous_sin
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char sin (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef sin
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sin ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_sin || defined __stub___sin
+choke me
+#endif
+
+int
+main ()
+{
+return sin ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_sin=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_sin=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_sin" >&5
+$as_echo "$ac_cv_func_sin" >&6; }
+if test "x$ac_cv_func_sin" = x""yes; then
+ :
+else
+
+{ $as_echo "$as_me:$LINENO: checking for sin in -lm" >&5
$as_echo_n "checking for sin in -lm... " >&6; }
-if test "${ac_cv_lib_m_sin+set}" = set; then :
+if test "${ac_cv_lib_m_sin+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -11984,18 +16160,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_m_sin=yes
else
- ac_cv_lib_m_sin=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_m_sin=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_sin" >&5
$as_echo "$ac_cv_lib_m_sin" >&6; }
-if test "x$ac_cv_lib_m_sin" = x""yes; then :
+if test "x$ac_cv_lib_m_sin" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
@@ -12007,7 +16208,11 @@
fi
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <math.h>
int
@@ -12018,35 +16223,243 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- $as_echo "#define HAVE_INVERSE_HYPERBOLIC 1" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_INVERSE_HYPERBOLIC 1
+_ACEOF
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
for ac_func in mkstemp
-do :
- ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
-if test "x$ac_cv_func_mkstemp" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_MKSTEMP 1
-_ACEOF
-
-fi
-done
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking type of mail spool file locking" >&5
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+{ $as_echo "$as_me:$LINENO: checking type of mail spool file locking" >&5
$as_echo_n "checking type of mail spool file locking... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+{ $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
+
+
for ac_func in lockf flock
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -12063,18 +16476,28 @@
esac
fi
-if test "$with_mail_locking" = "lockf"; then $as_echo "#define MAIL_LOCK_LOCKF 1" >>confdefs.h
-
-elif test "$with_mail_locking" = "flock"; then $as_echo "#define MAIL_LOCK_FLOCK 1" >>confdefs.h
-
-elif test "$with_mail_locking" = "locking"; then $as_echo "#define MAIL_LOCK_LOCKING 1" >>confdefs.h
+if test "$with_mail_locking" = "lockf"; then cat >>confdefs.h <<\_ACEOF
+#define MAIL_LOCK_LOCKF 1
+_ACEOF
+
+elif test "$with_mail_locking" = "flock"; then cat >>confdefs.h <<\_ACEOF
+#define MAIL_LOCK_FLOCK 1
+_ACEOF
+
+elif test "$with_mail_locking" = "locking"; then cat >>confdefs.h <<\_ACEOF
+#define MAIL_LOCK_LOCKING 1
+_ACEOF
elif test "$with_mail_locking" = "pop"; then
with_pop=yes
with_mail_locking=
-elif test "$with_mail_locking" = "mmdf"; then $as_echo "#define MAIL_LOCK_MMDF 1" >>confdefs.h
-
-else with_mail_locking="file"; $as_echo "#define MAIL_LOCK_DOT 1" >>confdefs.h
+elif test "$with_mail_locking" = "mmdf"; then cat >>confdefs.h <<\_ACEOF
+#define MAIL_LOCK_MMDF 1
+_ACEOF
+
+else with_mail_locking="file"; cat >>confdefs.h <<\_ACEOF
+#define MAIL_LOCK_DOT 1
+_ACEOF
fi
test "$with_mail_locking" = "lockf" -a "$ac_cv_func_lockf" != "yes" && \
@@ -12084,88 +16507,38 @@
test "$with_mail_locking" = "locking" -a "$ac_cv_func_locking" != "yes" && \
{ echo "Error:" "locking mail locking requested but not available." >&2; exit 1; }
-case "$opsys" in decosf*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cma_open in -lpthreads" >&5
-$as_echo_n "checking for cma_open in -lpthreads... " >&6; }
-if test "${ac_cv_lib_pthreads_cma_open+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthreads $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cma_open ();
-int
-main ()
-{
-return cma_open ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_pthreads_cma_open=yes
-else
- ac_cv_lib_pthreads_cma_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_cma_open" >&5
-$as_echo "$ac_cv_lib_pthreads_cma_open" >&6; }
-if test "x$ac_cv_lib_pthreads_cma_open" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREADS 1
-_ACEOF
-
- LIBS="-lpthreads $LIBS"
-
-fi
-
- test "$ac_cv_lib_pthreads_cma_open" = "yes" && \
- c_switch_site="$c_switch_site -threads" ;;
-esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -xildoff compiler flag is required" >&5
+
+{ $as_echo "$as_me:$LINENO: checking whether the -xildoff compiler flag is required" >&5
$as_echo_n "checking whether the -xildoff compiler flag is required... " >&6; }
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 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ then { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; };
- else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ else { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }; ld_switch_site="$ld_switch_site -xildoff" && if test "$verbose" = "yes"; then echo " Appending \"-xildoff\" to \$ld_switch_site"; fi
fi
- else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ else { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$opsys" = "sol2"; then
if test "$os_release" -ge 506; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"-z ignore\" linker flag" >&5
+ { $as_echo "$as_me:$LINENO: checking for \"-z ignore\" linker flag" >&5
$as_echo_n "checking for \"-z ignore\" linker flag... " >&6; }
case "`ld -h 2>&1`" in
- *-z\ ignore\|record* ) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ *-z\ ignore\|record* ) { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
ld_switch_site="-z ignore $ld_switch_site" && if test "$verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ *) { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; } ;;
esac
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specified window system" >&5
+{ $as_echo "$as_me:$LINENO: checking for specified window system" >&5
$as_echo_n "checking for specified window system... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+{ $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
@@ -12173,7 +16546,7 @@
GTK_CONFIG=no
if test "$with_gnome" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME configuration script" >&5
+ { $as_echo "$as_me:$LINENO: checking for GNOME configuration script" >&5
$as_echo_n "checking for GNOME configuration script... " >&6; }
for possible in gnome-config
do
@@ -12185,21 +16558,23 @@
break
fi
done
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${GNOME_CONFIG}" >&5
+ { $as_echo "$as_me:$LINENO: result: ${GNOME_CONFIG}" >&5
$as_echo "${GNOME_CONFIG}" >&6; }
fi
if test "${GNOME_CONFIG}" != "no"; then
GNOME_LIBS=`${GNOME_CONFIG} --libs gnomeui`
GNOME_CFLAGS=`${GNOME_CONFIG} --cflags gnomeui`
- $as_echo "#define HAVE_GNOME 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GNOME 1
+_ACEOF
libs_gtk="$libs_gtk ${GNOME_LIBS}" && if test "$verbose" = "yes"; then echo " Appending \"${GNOME_LIBS}\" to \$libs_gtk"; fi
c_switch_gtk="$c_switch_gtk ${GNOME_CFLAGS}" && if test "$verbose" = "yes"; then echo " Appending \"${GNOME_CFLAGS}\" to \$c_switch_gtk"; fi
fi
if test "$with_gtk" != "no";then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK configuration script" >&5
+ { $as_echo "$as_me:$LINENO: checking for GTK configuration script" >&5
$as_echo_n "checking for GTK configuration script... " >&6; }
for possible in gtk12-config gtk14-config gtk-config
do
@@ -12207,55 +16582,59 @@
if test "x${possible_version}" != "x"; then
GTK_CONFIG="${possible}"
case "${possible_version}" in
- 1.0.*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GTK 1.2 is required, please upgrade your version of GTK." >&5
+ 1.0.*) { $as_echo "$as_me:$LINENO: WARNING: GTK 1.2 is required, please upgrade your version of GTK." >&5
$as_echo "$as_me: WARNING: GTK 1.2 is required, please upgrade your version of GTK." >&2;}; with_gtk=no;;
- 1.3.*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GTK 1.3 is not supported right now" >&5
+ 1.3.*) { $as_echo "$as_me:$LINENO: WARNING: GTK 1.3 is not supported right now" >&5
$as_echo "$as_me: WARNING: GTK 1.3 is not supported right now" >&2;}; with_gtk=no;;
1.2.*)
with_gtk=yes
break
;;
- *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found unsupported version of GTK: $possible_version" >&5
+ *) { $as_echo "$as_me:$LINENO: WARNING: Found unsupported version of GTK: $possible_version" >&5
$as_echo "$as_me: WARNING: Found unsupported version of GTK: $possible_version" >&2;};;
esac
fi
done
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${GTK_CONFIG}" >&5
+ { $as_echo "$as_me:$LINENO: result: ${GTK_CONFIG}" >&5
$as_echo "${GTK_CONFIG}" >&6; }
fi
if test "${GTK_CONFIG}" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking gtk version" >&5
+ { $as_echo "$as_me:$LINENO: checking gtk version" >&5
$as_echo_n "checking gtk version... " >&6; }
GTK_VERSION=`${GTK_CONFIG} --version`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${GTK_VERSION}" >&5
+ { $as_echo "$as_me:$LINENO: result: ${GTK_VERSION}" >&5
$as_echo "${GTK_VERSION}" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking gtk libs" >&5
+ { $as_echo "$as_me:$LINENO: checking gtk libs" >&5
$as_echo_n "checking gtk libs... " >&6; }
GTK_LIBS=`${GTK_CONFIG} --libs`
libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${GTK_LIBS}" >&5
+ { $as_echo "$as_me:$LINENO: result: ${GTK_LIBS}" >&5
$as_echo "${GTK_LIBS}" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking gtk cflags" >&5
+ { $as_echo "$as_me:$LINENO: checking gtk cflags" >&5
$as_echo_n "checking gtk cflags... " >&6; }
GTK_CFLAGS=`${GTK_CONFIG} --cflags`
if test "$GCC" = "yes"; then
GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
fi
c_switch_gtk="$c_switch_gtk ${GTK_CFLAGS}" && if test "$verbose" = "yes"; then echo " Appending \"${GTK_CFLAGS}\" to \$c_switch_gtk"; fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${GTK_CFLAGS}" >&5
+ { $as_echo "$as_me:$LINENO: result: ${GTK_CFLAGS}" >&5
$as_echo "${GTK_CFLAGS}" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgdk_imlib" >&5
+ { $as_echo "$as_me:$LINENO: checking for main in -lgdk_imlib" >&5
$as_echo_n "checking for main in -lgdk_imlib... " >&6; }
-if test "${ac_cv_lib_gdk_imlib_main+set}" = set; then :
+if test "${ac_cv_lib_gdk_imlib_main+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgdk_imlib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -12267,29 +16646,58 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_gdk_imlib_main=yes
else
- ac_cv_lib_gdk_imlib_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_imlib_main" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gdk_imlib_main=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gdk_imlib_main" >&5
$as_echo "$ac_cv_lib_gdk_imlib_main" >&6; }
-if test "x$ac_cv_lib_gdk_imlib_main" = x""yes; then :
+if test "x$ac_cv_lib_gdk_imlib_main" = x""yes; then
libs_gtk="-lgdk_imlib $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lgdk_imlib\" to \$libs_gtk"; fi
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Imlib_init in -lImlib" >&5
+ { $as_echo "$as_me:$LINENO: checking for Imlib_init in -lImlib" >&5
$as_echo_n "checking for Imlib_init in -lImlib... " >&6; }
-if test "${ac_cv_lib_Imlib_Imlib_init+set}" = set; then :
+if test "${ac_cv_lib_Imlib_Imlib_init+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lImlib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -12307,43 +16715,162 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Imlib_Imlib_init=yes
else
- ac_cv_lib_Imlib_Imlib_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Imlib_Imlib_init" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Imlib_Imlib_init=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Imlib_Imlib_init" >&5
$as_echo "$ac_cv_lib_Imlib_Imlib_init" >&6; }
-if test "x$ac_cv_lib_Imlib_Imlib_init" = x""yes; then :
+if test "x$ac_cv_lib_Imlib_Imlib_init" = x""yes; then
libs_gtk="$libs_gtk -lImlib" && if test "$verbose" = "yes"; then echo " Appending \"-lImlib\" to \$libs_gtk"; fi
fi
- for ac_func in gdk_imlib_init
-do :
- ac_fn_c_check_func "$LINENO" "gdk_imlib_init" "ac_cv_func_gdk_imlib_init"
-if test "x$ac_cv_func_gdk_imlib_init" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_GDK_IMLIB_INIT 1
-_ACEOF
-
-fi
-done
-
-
- $as_echo "#define HAVE_XPM 1" >>confdefs.h
-
- $as_echo "#define HAVE_GTK 1" >>confdefs.h
+
+for ac_func in gdk_imlib_init
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_XPM 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GTK 1
+_ACEOF
window_system=gtk
with_gtk=yes
if test "$with_x11" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Configuring GTK, forcing with_x11 to no" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Configuring GTK, forcing with_x11 to no" >&5
$as_echo "$as_me: WARNING: Configuring GTK, forcing with_x11 to no" >&2;}
with_x11=no
fi
@@ -12356,7 +16883,7 @@
;;
* )
feature_conflict_with_gtk=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-${feature}=${feature_value} is incompatible with --with-gtk" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: --enable-${feature}=${feature_value} is incompatible with --with-gtk" >&5
$as_echo "$as_me: WARNING: --enable-${feature}=${feature_value} is incompatible with --with-gtk" >&2;} ;;
esac
done
@@ -12376,12 +16903,150 @@
CFLAGS="${GTK_CFLAGS} ${CFLAGS}"
CPPFLAGS="${GTK_CFLAGS} ${CFLAGS}"
LDFLAGS="${LDFLAGS} ${GTK_LIBS}"
- for ac_header in glade/glade.h glade.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+
+
+for ac_header in glade/glade.h glade.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -12390,48 +17055,18 @@
done
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lxml" >&5
+ { $as_echo "$as_me:$LINENO: checking for main in -lxml" >&5
$as_echo_n "checking for main in -lxml... " >&6; }
-if test "${ac_cv_lib_xml_main+set}" = set; then :
+if test "${ac_cv_lib_xml_main+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lxml $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-return main ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_xml_main=yes
-else
- ac_cv_lib_xml_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml_main" >&5
-$as_echo "$ac_cv_lib_xml_main" >&6; }
-if test "x$ac_cv_lib_xml_main" = x""yes; then :
- libs_gtk="-lxml $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lxml\" to \$libs_gtk"; fi
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lglade" >&5
-$as_echo_n "checking for main in -lglade... " >&6; }
-if test "${ac_cv_lib_glade_main+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lglade $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -12443,29 +17078,58 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_glade_main=yes
-else
- ac_cv_lib_glade_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glade_main" >&5
-$as_echo "$ac_cv_lib_glade_main" >&6; }
-if test "x$ac_cv_lib_glade_main" = x""yes; then :
- libs_gtk="-lglade $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lglade\" to \$libs_gtk"; fi
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lglade-gnome" >&5
-$as_echo_n "checking for main in -lglade-gnome... " >&6; }
-if test "${ac_cv_lib_glade_gnome_main+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lglade-gnome $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_xml_main=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_xml_main=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xml_main" >&5
+$as_echo "$ac_cv_lib_xml_main" >&6; }
+if test "x$ac_cv_lib_xml_main" = x""yes; then
+ libs_gtk="-lxml $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lxml\" to \$libs_gtk"; fi
+fi
+
+ { $as_echo "$as_me:$LINENO: checking for main in -lglade" >&5
+$as_echo_n "checking for main in -lglade... " >&6; }
+if test "${ac_cv_lib_glade_main+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lglade $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -12477,34 +17141,128 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_glade_main=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_glade_main=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_glade_main" >&5
+$as_echo "$ac_cv_lib_glade_main" >&6; }
+if test "x$ac_cv_lib_glade_main" = x""yes; then
+ libs_gtk="-lglade $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lglade\" to \$libs_gtk"; fi
+fi
+
+ { $as_echo "$as_me:$LINENO: checking for main in -lglade-gnome" >&5
+$as_echo_n "checking for main in -lglade-gnome... " >&6; }
+if test "${ac_cv_lib_glade_gnome_main+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lglade-gnome $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_glade_gnome_main=yes
else
- ac_cv_lib_glade_gnome_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_glade_gnome_main" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_glade_gnome_main=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_glade_gnome_main" >&5
$as_echo "$ac_cv_lib_glade_gnome_main" >&6; }
-if test "x$ac_cv_lib_glade_gnome_main" = x""yes; then :
+if test "x$ac_cv_lib_glade_gnome_main" = x""yes; then
libs_gtk="-lglade-gnome $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lglade-gnome\" to \$libs_gtk"; fi
fi
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <glade/glade-xml.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "char \*txtdomain;" >/dev/null 2>&1; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $EGREP "char \*txtdomain;" >/dev/null 2>&1; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
- $as_echo "#define LIBGLADE_XML_TXTDOMAIN 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define LIBGLADE_XML_TXTDOMAIN 1
+_ACEOF
+
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
rm -f conftest*
@@ -12541,12 +17299,12 @@
done
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+ { $as_echo "$as_me:$LINENO: checking for X" >&5
$as_echo_n "checking for X... " >&6; }
# Check whether --with-x was given.
-if test "${with_x+set}" = set; then :
+if test "${with_x+set}" = set; then
withval=$with_x;
fi
@@ -12556,8 +17314,10 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
- *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+ *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
+$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
+ { (exit 1); exit 1; }; };; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
@@ -12605,25 +17365,21 @@
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
-/usr/X11R7/include
/usr/X11R6/include
/usr/X11R5/include
/usr/X11R4/include
/usr/include/X11
-/usr/include/X11R7
/usr/include/X11R6
/usr/include/X11R5
/usr/include/X11R4
/usr/local/X11/include
-/usr/local/X11R7/include
/usr/local/X11R6/include
/usr/local/X11R5/include
/usr/local/X11R4/include
/usr/local/include/X11
-/usr/local/include/X11R7
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
@@ -12645,14 +17401,37 @@
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Xlib.h>
_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# We can compile using X headers with no special include directory.
ac_x_includes=
else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
@@ -12660,6 +17439,7 @@
fi
done
fi
+
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
@@ -12669,7 +17449,11 @@
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Xlib.h>
int
@@ -12680,12 +17464,35 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
else
- LIBS=$ac_save_LIBS
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ LIBS=$ac_save_LIBS
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
@@ -12697,8 +17504,10 @@
done
done
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
@@ -12719,7 +17528,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+ { $as_echo "$as_me:$LINENO: result: $have_x" >&5
$as_echo "$have_x" >&6; }
no_x=yes
else
@@ -12730,14 +17539,16 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
+ { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
-$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define X_DISPLAY_MISSING 1
+_ACEOF
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
@@ -12750,52 +17561,110 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+ { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
$as_echo_n "checking whether -R must be followed by a space... " >&6; }
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
ac_xsave_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
X_LIBS="$X_LIBS -R$x_libraries"
else
- LIBS="$ac_xsave_LIBS -R $x_libraries"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
X_LIBS="$X_LIBS -R $x_libraries"
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: neither works" >&5
$as_echo "neither works" >&6; }
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
@@ -12811,7 +17680,11 @@
# libraries were built with DECnet support. And Karl Berry says
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -12829,17 +17702,114 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dnet_ntoa ();
+int
+main ()
+{
+return dnet_ntoa ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_dnet_dnet_ntoa=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dnet_dnet_ntoa=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet_stub $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -12857,66 +17827,52 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dnet_dnet_ntoa=yes
-else
- ac_cv_lib_dnet_dnet_ntoa=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-fi
-
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet_stub $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
- ac_cv_lib_dnet_stub_dnet_ntoa=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
fi
fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
@@ -12927,20 +17883,175 @@
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
- ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-
-fi
+ { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+$as_echo_n "checking for gethostbyname... " >&6; }
+if test "${ac_cv_func_gethostbyname+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define gethostbyname innocuous_gethostbyname
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gethostbyname (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef gethostbyname
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_gethostbyname || defined __stub___gethostbyname
+choke me
+#endif
+
+int
+main ()
+{
+return gethostbyname ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_gethostbyname=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_gethostbyname=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+$as_echo "$ac_cv_func_gethostbyname" >&6; }
if test $ac_cv_func_gethostbyname = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+ { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+int
+main ()
+{
+return gethostbyname ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_nsl_gethostbyname=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_nsl_gethostbyname=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+ { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -12958,59 +18069,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_gethostbyname=yes
-else
- ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-fi
-
- if test $ac_cv_lib_nsl_gethostbyname = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_bsd_gethostbyname=yes
else
- ac_cv_lib_bsd_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_bsd_gethostbyname=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
@@ -13024,20 +18119,105 @@
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
- ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = x""yes; then :
-
-fi
+ { $as_echo "$as_me:$LINENO: checking for connect" >&5
+$as_echo_n "checking for connect... " >&6; }
+if test "${ac_cv_func_connect+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define connect innocuous_connect
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char connect (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef connect
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char connect ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_connect || defined __stub___connect
+choke me
+#endif
+
+int
+main ()
+{
+return connect ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_connect=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_connect=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+$as_echo "$ac_cv_func_connect" >&6; }
if test $ac_cv_func_connect = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+ { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then :
+if test "${ac_cv_lib_socket_connect+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13055,38 +18235,148 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_socket_connect=yes
else
- ac_cv_lib_socket_connect=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_socket_connect=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+if test "x$ac_cv_lib_socket_connect" = x""yes; then
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
- ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = x""yes; then :
-
-fi
+ { $as_echo "$as_me:$LINENO: checking for remove" >&5
+$as_echo_n "checking for remove... " >&6; }
+if test "${ac_cv_func_remove+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define remove innocuous_remove
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char remove (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef remove
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char remove ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_remove || defined __stub___remove
+choke me
+#endif
+
+int
+main ()
+{
+return remove ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_remove=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_remove=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+$as_echo "$ac_cv_func_remove" >&6; }
if test $ac_cv_func_remove = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+ { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
$as_echo_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then :
+if test "${ac_cv_lib_posix_remove+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13104,38 +18394,148 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_posix_remove=yes
else
- ac_cv_lib_posix_remove=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_posix_remove=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
$as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+if test "x$ac_cv_lib_posix_remove" = x""yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = x""yes; then :
-
-fi
+ { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+$as_echo_n "checking for shmat... " >&6; }
+if test "${ac_cv_func_shmat+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define shmat innocuous_shmat
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shmat (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef shmat
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shmat ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_shmat || defined __stub___shmat
+choke me
+#endif
+
+int
+main ()
+{
+return shmat ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_shmat=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_shmat=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+$as_echo "$ac_cv_func_shmat" >&6; }
if test $ac_cv_func_shmat = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+ { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
$as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lipc $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13153,18 +18553,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_ipc_shmat=yes
else
- ac_cv_lib_ipc_shmat=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ipc_shmat=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
@@ -13180,14 +18605,18 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+ { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13205,18 +18634,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_ICE_IceConnectionNumber=yes
else
- ac_cv_lib_ICE_IceConnectionNumber=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ICE_IceConnectionNumber=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
@@ -13232,21 +18686,158 @@
if test "$with_x11" = "yes"; then
- $as_echo "#define HAVE_X_WINDOWS 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_X_WINDOWS 1
+_ACEOF
MAKE_SUBDIR="$MAKE_SUBDIR lwlib" && if test "$verbose" = "yes"; then echo " Appending \"lwlib\" to \$MAKE_SUBDIR"; fi
SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS lwlib" && if test "$verbose" = "yes"; then echo " Appending \"lwlib\" to \$SRC_SUBDIR_DEPS"; fi
- ac_fn_c_check_header_mongrel "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default"
-if test "x$ac_cv_header_Xm_Xm_h" = x""yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmStringFree in -lXm" >&5
+ if test "${ac_cv_header_Xm_Xm_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for Xm/Xm.h" >&5
+$as_echo_n "checking for Xm/Xm.h... " >&6; }
+if test "${ac_cv_header_Xm_Xm_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Xm_Xm_h" >&5
+$as_echo "$ac_cv_header_Xm_Xm_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking Xm/Xm.h usability" >&5
+$as_echo_n "checking Xm/Xm.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <Xm/Xm.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking Xm/Xm.h presence" >&5
+$as_echo_n "checking Xm/Xm.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <Xm/Xm.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for Xm/Xm.h" >&5
+$as_echo_n "checking for Xm/Xm.h... " >&6; }
+if test "${ac_cv_header_Xm_Xm_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_Xm_Xm_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Xm_Xm_h" >&5
+$as_echo "$ac_cv_header_Xm_Xm_h" >&6; }
+
+fi
+if test "x$ac_cv_header_Xm_Xm_h" = x""yes; then
+ { $as_echo "$as_me:$LINENO: checking for XmStringFree in -lXm" >&5
$as_echo_n "checking for XmStringFree in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmStringFree+set}" = set; then :
+if test "${ac_cv_lib_Xm_XmStringFree+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13264,18 +18855,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xm_XmStringFree=yes
else
- ac_cv_lib_Xm_XmStringFree=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmStringFree" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xm_XmStringFree=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xm_XmStringFree" >&5
$as_echo "$ac_cv_lib_Xm_XmStringFree" >&6; }
-if test "x$ac_cv_lib_Xm_XmStringFree" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmStringFree" = x""yes; then
got_motif=yes
fi
@@ -13314,10 +18930,6 @@
break; fi
done
- case "$opsys" in
- decosf*) if test "$GCC" = yes -a -d /usr/shlib; then X_LIBS="$X_LIBS -L/usr/shlib" && if test "$verbose" = "yes"; then echo " Appending \"-L/usr/shlib\" to \$X_LIBS"; fi; fi ;;
- esac
-
ld_switch_x_site="$X_LIBS"
@@ -13405,9 +19017,9 @@
_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X defines extracted by xmkmf" >&5
+ { $as_echo "$as_me:$LINENO: checking for X defines extracted by xmkmf" >&5
$as_echo_n "checking for X defines extracted by xmkmf... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ { $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
rm -fr conftestdir
if mkdir conftestdir; then
@@ -13447,23 +19059,160 @@
done
fi
- ac_fn_c_check_header_mongrel "$LINENO" "X11/Intrinsic.h" "ac_cv_header_X11_Intrinsic_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Intrinsic_h" = x""yes; then :
-
-else
- as_fn_error "Unable to find X11 header files." "$LINENO" 5
-fi
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
+ if test "${ac_cv_header_X11_Intrinsic_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for X11/Intrinsic.h" >&5
+$as_echo_n "checking for X11/Intrinsic.h... " >&6; }
+if test "${ac_cv_header_X11_Intrinsic_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Intrinsic_h" >&5
+$as_echo "$ac_cv_header_X11_Intrinsic_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking X11/Intrinsic.h usability" >&5
+$as_echo_n "checking X11/Intrinsic.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <X11/Intrinsic.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking X11/Intrinsic.h presence" >&5
+$as_echo_n "checking X11/Intrinsic.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <X11/Intrinsic.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/Intrinsic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/Intrinsic.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/Intrinsic.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/Intrinsic.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/Intrinsic.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/Intrinsic.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/Intrinsic.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Intrinsic.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/Intrinsic.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for X11/Intrinsic.h" >&5
+$as_echo_n "checking for X11/Intrinsic.h... " >&6; }
+if test "${ac_cv_header_X11_Intrinsic_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_X11_Intrinsic_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Intrinsic_h" >&5
+$as_echo "$ac_cv_header_X11_Intrinsic_h" >&6; }
+
+fi
+if test "x$ac_cv_header_X11_Intrinsic_h" = x""yes; then
+ :
+else
+ { { $as_echo "$as_me:$LINENO: error: Unable to find X11 header files." >&5
+$as_echo "$as_me: error: Unable to find X11 header files." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
+ { $as_echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then :
+if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13481,30 +19230,59 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_X11_XOpenDisplay=yes
else
- ac_cv_lib_X11_XOpenDisplay=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_X11_XOpenDisplay=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then :
+if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then
have_lib_x11=yes
fi
if test "$have_lib_x11" != "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGetFontProperty in -lX11" >&5
+ { $as_echo "$as_me:$LINENO: checking for XGetFontProperty in -lX11" >&5
$as_echo_n "checking for XGetFontProperty in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XGetFontProperty+set}" = set; then :
+if test "${ac_cv_lib_X11_XGetFontProperty+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 -b i486-linuxaout $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13522,35 +19300,66 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_X11_XGetFontProperty=yes
else
- ac_cv_lib_X11_XGetFontProperty=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XGetFontProperty" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_X11_XGetFontProperty=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XGetFontProperty" >&5
$as_echo "$ac_cv_lib_X11_XGetFontProperty" >&6; }
-if test "x$ac_cv_lib_X11_XGetFontProperty" = x""yes; then :
+if test "x$ac_cv_lib_X11_XGetFontProperty" = x""yes; then
ld_switch_x_site="-b i486-linuxaout $ld_switch_x_site"
else
- as_fn_error "Unable to find X11 libraries." "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: Unable to find X11 libraries." >&5
+$as_echo "$as_me: error: Unable to find X11 libraries." >&2;}
+ { (exit 1); exit 1; }; }
fi
fi
libs_x="-lX11"
test "$verbose" = "yes" && echo " Setting libs_x to \"-lX11\""
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeSelectInput in -lXext" >&5
+ { $as_echo "$as_me:$LINENO: checking for XShapeSelectInput in -lXext" >&5
$as_echo_n "checking for XShapeSelectInput in -lXext... " >&6; }
-if test "${ac_cv_lib_Xext_XShapeSelectInput+set}" = set; then :
+if test "${ac_cv_lib_Xext_XShapeSelectInput+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXext $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13568,30 +19377,59 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xext_XShapeSelectInput=yes
else
- ac_cv_lib_Xext_XShapeSelectInput=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeSelectInput" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xext_XShapeSelectInput=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeSelectInput" >&5
$as_echo "$ac_cv_lib_Xext_XShapeSelectInput" >&6; }
-if test "x$ac_cv_lib_Xext_XShapeSelectInput" = x""yes; then :
+if test "x$ac_cv_lib_Xext_XShapeSelectInput" = x""yes; then
libs_x="-lXext $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXext\" to \$libs_x"; fi
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XtOpenDisplay in -lXt" >&5
+ { $as_echo "$as_me:$LINENO: checking for XtOpenDisplay in -lXt" >&5
$as_echo_n "checking for XtOpenDisplay in -lXt... " >&6; }
-if test "${ac_cv_lib_Xt_XtOpenDisplay+set}" = set; then :
+if test "${ac_cv_lib_Xt_XtOpenDisplay+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13609,44 +19447,102 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xt_XtOpenDisplay=yes
else
- ac_cv_lib_Xt_XtOpenDisplay=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xt_XtOpenDisplay" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xt_XtOpenDisplay=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xt_XtOpenDisplay" >&5
$as_echo "$ac_cv_lib_Xt_XtOpenDisplay" >&6; }
-if test "x$ac_cv_lib_Xt_XtOpenDisplay" = x""yes; then :
+if test "x$ac_cv_lib_Xt_XtOpenDisplay" = x""yes; then
libs_x="-lXt $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXt\" to \$libs_x"; fi
else
- as_fn_error "Unable to find X11 libraries." "$LINENO" 5
-fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking the version of X11 being used" >&5
+ { { $as_echo "$as_me:$LINENO: error: Unable to find X11 libraries." >&5
+$as_echo "$as_me: error: Unable to find X11 libraries." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+ { $as_echo "$as_me:$LINENO: checking the version of X11 being used" >&5
$as_echo_n "checking the version of X11 being used... " >&6; }
- if test "$cross_compiling" = yes; then :
+ if test "$cross_compiling" = yes; then
x11_release=4
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <X11/Intrinsic.h>
int main(int c, char **v) { return c>1 ? XlibSpecificationRelease : 0; }
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
./conftest foobar; x11_release=$?
else
- x11_release=4
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: R${x11_release}" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+x11_release=4
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+ { $as_echo "$as_me:$LINENO: result: R${x11_release}" >&5
$as_echo "R${x11_release}" >&6; }
cat >>confdefs.h <<_ACEOF
#define THIS_IS_X11R${x11_release} 1
@@ -13660,12 +19556,101 @@
esac
fi
- for ac_func in XConvertCase XtRegisterDrawable
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+
+
+for ac_func in XConvertCase XtRegisterDrawable
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -13674,12 +19659,150 @@
done
- for ac_header in X11/Xlocale.h X11/Xfuncproto.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+
+
+for ac_header in X11/Xlocale.h X11/Xfuncproto.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -13689,20 +19812,114 @@
done
- for ac_func in XRegisterIMInstantiateCallback
-do :
- ac_fn_c_check_func "$LINENO" "XRegisterIMInstantiateCallback" "ac_cv_func_XRegisterIMInstantiateCallback"
-if test "x$ac_cv_func_XRegisterIMInstantiateCallback" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_XREGISTERIMINSTANTIATECALLBACK 1
-_ACEOF
-
-fi
-done
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+
+for ac_func in XRegisterIMInstantiateCallback
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ { $as_echo "$as_me:$LINENO: checking for standard XRegisterIMInstantiateCallback prototype" >&5
$as_echo_n "checking for standard XRegisterIMInstantiateCallback prototype... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define NeedFunctionPrototypes 1
@@ -13711,25 +19928,52 @@
Display*, struct _XrmHashBucketRec*, char*, char*, XIMProc, XPointer*);
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- $as_echo "#define XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE 1" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- test -z "$with_xmu" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ cat >>confdefs.h <<\_ACEOF
+#define XREGISTERIMINSTANTIATECALLBACK_NONSTANDARD_PROTOTYPE 1
+_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ test -z "$with_xmu" && { { $as_echo "$as_me:$LINENO: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
$as_echo_n "checking for XmuReadBitmapDataFromFile in -lXmu... " >&6; }
-if test "${ac_cv_lib_Xmu_XmuReadBitmapDataFromFile+set}" = set; then :
+if test "${ac_cv_lib_Xmu_XmuReadBitmapDataFromFile+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXmu $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13747,18 +19991,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xmu_XmuReadBitmapDataFromFile=yes
else
- ac_cv_lib_Xmu_XmuReadBitmapDataFromFile=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xmu_XmuReadBitmapDataFromFile=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" >&5
$as_echo "$ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" >&6; }
-if test "x$ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" = x""yes; then :
+if test "x$ac_cv_lib_Xmu_XmuReadBitmapDataFromFile" = x""yes; then
with_xmu=yes
else
with_xmu=no
@@ -13770,18 +20039,24 @@
fi
else
libs_x="-lXmu $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXmu\" to \$libs_x"; fi
- $as_echo "#define HAVE_XMU 1" >>confdefs.h
-
- fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_XMU 1
+_ACEOF
+
+ fi
+
+ { $as_echo "$as_me:$LINENO: checking for main in -lXbsd" >&5
$as_echo_n "checking for main in -lXbsd... " >&6; }
-if test "${ac_cv_lib_Xbsd_main+set}" = set; then :
+if test "${ac_cv_lib_Xbsd_main+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXbsd $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13793,18 +20068,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xbsd_main=yes
else
- ac_cv_lib_Xbsd_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xbsd_main=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5
$as_echo "$ac_cv_lib_Xbsd_main" >&6; }
-if test "x$ac_cv_lib_Xbsd_main" = x""yes; then :
+if test "x$ac_cv_lib_Xbsd_main" = x""yes; then
libs_x="-lXbsd $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXbsd\" to \$libs_x"; fi
fi
@@ -13824,7 +20124,7 @@
if test "$with_xft_emacs" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xrender, fontconfig, and Xft" >&5
+ { $as_echo "$as_me:$LINENO: checking for Xrender, fontconfig, and Xft" >&5
$as_echo_n "checking for Xrender, fontconfig, and Xft... " >&6; }
xft_includes_found=no
xft_config_prog="pkg-config xft"
@@ -13836,12 +20136,151 @@
ld_switch_site="$ld_switch_site $xft_libs"
xft_includes_found=yes
else
- for ac_header in freetype/config/ftheader.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_freetype_config_ftheader_h" "$ac_includes_default"
-if test "x$ac_cv_header_freetype_config_ftheader_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_FREETYPE_CONFIG_FTHEADER_H 1
+
+for ac_header in freetype/config/ftheader.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
xft_includes_found=yes
else
@@ -13851,17 +20290,156 @@
"/usr/include/freetype2"
do
if test -d $freetype_include_top; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking in ${freetype_include_top}" >&5
+ { $as_echo "$as_me:$LINENO: checking in ${freetype_include_top}" >&5
$as_echo_n "checking in ${freetype_include_top}... " >&6; }
unset "$as_ac_Header"
save_c_switch_site="$c_switch_site"
c_switch_site="$c_switch_site -I${freetype_include_top}"
- for ac_header in freetype/config/ftheader.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_freetype_config_ftheader_h" "$ac_includes_default"
-if test "x$ac_cv_header_freetype_config_ftheader_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_FREETYPE_CONFIG_FTHEADER_H 1
+
+for ac_header in freetype/config/ftheader.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
xft_includes_found=yes
else
@@ -13880,14 +20458,18 @@
if test "$xft_includes_found" != "yes"; then
{ echo "Error:" "Unable to find headers for --with-xft" >&2; exit 1; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryExtension in -lXrender" >&5
+ { $as_echo "$as_me:$LINENO: checking for XRenderQueryExtension in -lXrender" >&5
$as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; }
-if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then :
+if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXrender $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13905,31 +20487,60 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xrender_XRenderQueryExtension=yes
else
- ac_cv_lib_Xrender_XRenderQueryExtension=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xrender_XRenderQueryExtension=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5
$as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = x""yes; then :
+if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = x""yes; then
libs_x="-lXrender $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXrender\" to \$libs_x"; fi
else
{ echo "Error:" "Unable to find libXrender for --with-xft" >&2; exit 1; }
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcPatternCreate in -lfontconfig" >&5
+ { $as_echo "$as_me:$LINENO: checking for FcPatternCreate in -lfontconfig" >&5
$as_echo_n "checking for FcPatternCreate in -lfontconfig... " >&6; }
-if test "${ac_cv_lib_fontconfig_FcPatternCreate+set}" = set; then :
+if test "${ac_cv_lib_fontconfig_FcPatternCreate+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lfontconfig $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13947,31 +20558,60 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_fontconfig_FcPatternCreate=yes
else
- ac_cv_lib_fontconfig_FcPatternCreate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcPatternCreate" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_fontconfig_FcPatternCreate=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcPatternCreate" >&5
$as_echo "$ac_cv_lib_fontconfig_FcPatternCreate" >&6; }
-if test "x$ac_cv_lib_fontconfig_FcPatternCreate" = x""yes; then :
+if test "x$ac_cv_lib_fontconfig_FcPatternCreate" = x""yes; then
libs_x="-lfontconfig $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lfontconfig\" to \$libs_x"; fi
else
{ echo "Error:" "Unable to find libfontconfig for --with-xft" >&2; exit 1; }
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5
+ { $as_echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
$as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
-if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then :
+if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXft $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -13989,50 +20629,259 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xft_XftFontOpen=yes
else
- ac_cv_lib_Xft_XftFontOpen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xft_XftFontOpen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
$as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
-if test "x$ac_cv_lib_Xft_XftFontOpen" = x""yes; then :
+if test "x$ac_cv_lib_Xft_XftFontOpen" = x""yes; then
libs_x="-lXft $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXft\" to \$libs_x"; fi
else
{ echo "Error:" "Unable to find libXft for --with-xft" >&2; exit 1; }
fi
- for ac_func in FcConfigGetRescanInterval
-do :
- ac_fn_c_check_func "$LINENO" "FcConfigGetRescanInterval" "ac_cv_func_FcConfigGetRescanInterval"
-if test "x$ac_cv_func_FcConfigGetRescanInterval" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_FCCONFIGGETRESCANINTERVAL 1
-_ACEOF
-
-fi
-done
-
- for ac_func in FcConfigSetRescanInterval
-do :
- ac_fn_c_check_func "$LINENO" "FcConfigSetRescanInterval" "ac_cv_func_FcConfigSetRescanInterval"
-if test "x$ac_cv_func_FcConfigSetRescanInterval" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_FCCONFIGSETRESCANINTERVAL 1
+
+for ac_func in FcConfigGetRescanInterval
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+for ac_func in FcConfigSetRescanInterval
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
with_fontconfig=yes
- $as_echo "#define HAVE_FONTCONFIG 1" >>confdefs.h
-
- $as_echo "#define USE_XFT 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_FONTCONFIG 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define USE_XFT 1
+_ACEOF
unset xft_includes_found
fi
@@ -14040,18 +20889,22 @@
fi
if test "$with_msw" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MS-Windows" >&5
+ { $as_echo "$as_me:$LINENO: checking for MS-Windows" >&5
$as_echo_n "checking for MS-Windows... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ { $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgdi32" >&5
+ { $as_echo "$as_me:$LINENO: checking for main in -lgdi32" >&5
$as_echo_n "checking for main in -lgdi32... " >&6; }
-if test "${ac_cv_lib_gdi32_main+set}" = set; then :
+if test "${ac_cv_lib_gdi32_main+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgdi32 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14063,23 +20916,50 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_gdi32_main=yes
else
- ac_cv_lib_gdi32_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdi32_main" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gdi32_main=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gdi32_main" >&5
$as_echo "$ac_cv_lib_gdi32_main" >&6; }
-if test "x$ac_cv_lib_gdi32_main" = x""yes; then :
+if test "x$ac_cv_lib_gdi32_main" = x""yes; then
with_msw=yes
fi
if test "$with_msw" = "yes"; then
- $as_echo "#define HAVE_MS_WINDOWS 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_MS_WINDOWS 1
+_ACEOF
if test "$with_netinstall" = "yes"; then
@@ -14102,24 +20982,60 @@
test "$enable_dialogs" != "no" && enable_dialogs=msw
test "$enable_widgets" != "no" && enable_widgets=msw
fi
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <fcntl.h>
int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- $as_echo "#define HAVE_MSG_SELECT 1" >>confdefs.h
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_MSG_SELECT 1
+_ACEOF
+
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
fi
fi
@@ -14133,7 +21049,7 @@
for feature in menubars scrollbars toolbars dialogs dragndrop xface
do
if eval "test -n \"\$enable_${feature}\" -a \"\$enable_${feature}\" != no" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-$feature ignored: Not valid without window system support" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: --enable-$feature ignored: Not valid without window system support" >&5
$as_echo "$as_me: WARNING: --enable-$feature ignored: Not valid without window system support" >&2;}
fi
eval "enable_${feature}=no"
@@ -14146,7 +21062,7 @@
for feature in MARTIN_IS_CLUELESS_ABOUT_MSW_FEATURES
do
if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-$feature ignored: Not valid without MS-Windows support" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: --with-$feature ignored: Not valid without MS-Windows support" >&5
$as_echo "$as_me: WARNING: --with-$feature ignored: Not valid without MS-Windows support" >&2;}
fi
eval "with_${feature}=no"
@@ -14159,7 +21075,7 @@
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
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --$feature ignored: Not valid without X support" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: --$feature ignored: Not valid without X support" >&5
$as_echo "$as_me: WARNING: --$feature ignored: Not valid without X support" >&2;}
fi
eval "${feature}=no"
@@ -14167,14 +21083,59 @@
fi
if test "$with_x11" = "yes"; then
- ac_fn_c_check_header_compile "$LINENO" "X11/extensions/shape.h" "ac_cv_header_X11_extensions_shape_h" "
+ { $as_echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
+$as_echo_n "checking for X11/extensions/shape.h... " >&6; }
+if test "${ac_cv_header_X11_extensions_shape_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-"
-if test "x$ac_cv_header_X11_extensions_shape_h" = x""yes; then :
-
- $as_echo "#define HAVE_BALLOON_HELP 1" >>confdefs.h
+
+#include <X11/extensions/shape.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_X11_extensions_shape_h=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_X11_extensions_shape_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_shape_h" >&5
+$as_echo "$ac_cv_header_X11_extensions_shape_h" >&6; }
+if test "x$ac_cv_header_X11_extensions_shape_h" = x""yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_BALLOON_HELP 1
+_ACEOF
fi
@@ -14195,40 +21156,172 @@
none ) HAVE_X_WINDOWS=no ; echo " Using no window system." ;;
esac
-case "$x_libraries" in *X11R4* )
- test "$opsys" = "hpux9" && opsysfile="s/hpux9-x11r4.h"
- test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h"
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WM_COMMAND option" >&5
+{ $as_echo "$as_me:$LINENO: checking for WM_COMMAND option" >&5
$as_echo_n "checking for WM_COMMAND option... " >&6; }
if test "$with_wmcommand" != "no"; then
- $as_echo "#define HAVE_WMCOMMAND 1" >>confdefs.h
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_WMCOMMAND 1
+_ACEOF
+
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
-test -z "$with_xauth" && { ac_fn_c_check_header_mongrel "$LINENO" "X11/Xauth.h" "ac_cv_header_X11_Xauth_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xauth_h" = x""yes; then :
-
+test -z "$with_xauth" && { if test "${ac_cv_header_X11_Xauth_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for X11/Xauth.h" >&5
+$as_echo_n "checking for X11/Xauth.h... " >&6; }
+if test "${ac_cv_header_X11_Xauth_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xauth_h" >&5
+$as_echo "$ac_cv_header_X11_Xauth_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking X11/Xauth.h usability" >&5
+$as_echo_n "checking X11/Xauth.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <X11/Xauth.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking X11/Xauth.h presence" >&5
+$as_echo_n "checking X11/Xauth.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <X11/Xauth.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/Xauth.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/Xauth.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/Xauth.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/Xauth.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/Xauth.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/Xauth.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/Xauth.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xauth.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/Xauth.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for X11/Xauth.h" >&5
+$as_echo_n "checking for X11/Xauth.h... " >&6; }
+if test "${ac_cv_header_X11_Xauth_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_X11_Xauth_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xauth_h" >&5
+$as_echo "$ac_cv_header_X11_Xauth_h" >&6; }
+
+fi
+if test "x$ac_cv_header_X11_Xauth_h" = x""yes; then
+ :
else
with_xauth=no
fi
}
-test -z "$with_xauth" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetAuthByAddr in -lXau" >&5
+test -z "$with_xauth" && { { $as_echo "$as_me:$LINENO: checking for XauGetAuthByAddr in -lXau" >&5
$as_echo_n "checking for XauGetAuthByAddr in -lXau... " >&6; }
-if test "${ac_cv_lib_Xau_XauGetAuthByAddr+set}" = set; then :
+if test "${ac_cv_lib_Xau_XauGetAuthByAddr+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXau $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -14246,18 +21339,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xau_XauGetAuthByAddr=yes
else
- ac_cv_lib_Xau_XauGetAuthByAddr=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauGetAuthByAddr" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xau_XauGetAuthByAddr=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauGetAuthByAddr" >&5
$as_echo "$ac_cv_lib_Xau_XauGetAuthByAddr" >&6; }
-if test "x$ac_cv_lib_Xau_XauGetAuthByAddr" = x""yes; then :
+if test "x$ac_cv_lib_Xau_XauGetAuthByAddr" = x""yes; then
:
else
with_xauth=no
@@ -14265,7 +21383,9 @@
}
test -z "$with_xauth" && with_xauth=yes
if test "$with_xauth" = "yes"; then
- $as_echo "#define HAVE_XAUTH 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_XAUTH 1
+_ACEOF
T=""
@@ -14286,24 +21406,161 @@
if test "$enable_modules" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for module support" >&5
+ { $as_echo "$as_me:$LINENO: checking for module support" >&5
$as_echo_n "checking for module support... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ { $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
case "$opsys" in
mingw* | cygwin* ) have_dl=yes ;;
darwin ) have_dl=yes
- $as_echo "#define HAVE_DYLD 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_DYLD 1
+_ACEOF
;;
* )
- ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
+ if test "${ac_cv_header_dlfcn_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for dlfcn.h" >&5
+$as_echo_n "checking for dlfcn.h... " >&6; }
+if test "${ac_cv_header_dlfcn_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5
+$as_echo "$ac_cv_header_dlfcn_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking dlfcn.h usability" >&5
+$as_echo_n "checking dlfcn.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <dlfcn.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking dlfcn.h presence" >&5
+$as_echo_n "checking dlfcn.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <dlfcn.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: dlfcn.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: dlfcn.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dlfcn.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: dlfcn.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: dlfcn.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: dlfcn.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dlfcn.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: dlfcn.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dlfcn.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: dlfcn.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dlfcn.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: dlfcn.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dlfcn.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: dlfcn.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for dlfcn.h" >&5
+$as_echo_n "checking for dlfcn.h... " >&6; }
+if test "${ac_cv_header_dlfcn_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_dlfcn_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5
+$as_echo "$ac_cv_header_dlfcn_h" >&6; }
+
+fi
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then
+
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
$as_echo_n "checking for dlopen in -lc... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <dlfcn.h>
int
@@ -14314,18 +21571,45 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- have_dl=yes ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ have_dl=yes ; { $as_echo "$as_me:$LINENO: result: $have_dl" >&5
$as_echo "$have_dl" >&6; }
else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
ac_save_LIBS="$LIBS"
LIBS="$LIBS -ldl"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <dlfcn.h>
int
@@ -14336,17 +21620,44 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- have_dl=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ have_dl=yes; { $as_echo "$as_me:$LINENO: result: $have_dl" >&5
$as_echo "$have_dl" >&6; }
else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
LIBS="$ac_save_LIBS -lsvld"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <dlfcn.h>
int
@@ -14357,34 +21668,200 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- have_dl=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ have_dl=yes; { $as_echo "$as_me:$LINENO: result: $have_dl" >&5
$as_echo "$have_dl" >&6; }
else
- LIBS="$ac_save_LIBS" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ LIBS="$ac_save_LIBS" ; { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
if test "$have_dl" = "yes"; then
- $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_DLOPEN 1
+_ACEOF
else
- ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
-if test "x$ac_cv_header_dl_h" = x""yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -lc" >&5
+ if test "${ac_cv_header_dl_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for dl.h" >&5
+$as_echo_n "checking for dl.h... " >&6; }
+if test "${ac_cv_header_dl_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dl_h" >&5
+$as_echo "$ac_cv_header_dl_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking dl.h usability" >&5
+$as_echo_n "checking dl.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <dl.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking dl.h presence" >&5
+$as_echo_n "checking dl.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <dl.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: dl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: dl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: dl.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: dl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: dl.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dl.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: dl.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: dl.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dl.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: dl.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: dl.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: dl.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for dl.h" >&5
+$as_echo_n "checking for dl.h... " >&6; }
+if test "${ac_cv_header_dl_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_dl_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dl_h" >&5
+$as_echo "$ac_cv_header_dl_h" >&6; }
+
+fi
+if test "x$ac_cv_header_dl_h" = x""yes; then
+
+ { $as_echo "$as_me:$LINENO: checking for shl_load in -lc" >&5
$as_echo_n "checking for shl_load in -lc... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <dl.h>
int
@@ -14395,18 +21872,45 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- have_dl=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ have_dl=yes; { $as_echo "$as_me:$LINENO: result: $have_dl" >&5
$as_echo "$have_dl" >&6; }
else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldl" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for shl_load in -ldl" >&5
$as_echo_n "checking for shl_load in -ldl... " >&6; }
ac_save_LIBS="$LIBS"
LIBS="$LIBS -ldld"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <dl.h>
int
@@ -14417,32 +21921,196 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
have_dl=yes
else
- LIBS="$ac_save_LIBS"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ LIBS="$ac_save_LIBS"; { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
if test "$have_dl" = "yes"; then
- $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SHL_LOAD 1
+_ACEOF
else
- ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
-if test "x$ac_cv_header_ltdl_h" = x""yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
+ if test "${ac_cv_header_ltdl_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for ltdl.h" >&5
+$as_echo_n "checking for ltdl.h... " >&6; }
+if test "${ac_cv_header_ltdl_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
+$as_echo "$ac_cv_header_ltdl_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking ltdl.h usability" >&5
+$as_echo_n "checking ltdl.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <ltdl.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking ltdl.h presence" >&5
+$as_echo_n "checking ltdl.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ltdl.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: ltdl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: ltdl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ltdl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: ltdl.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: ltdl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: ltdl.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ltdl.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: ltdl.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ltdl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: ltdl.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ltdl.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: ltdl.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ltdl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: ltdl.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ltdl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: ltdl.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for ltdl.h" >&5
+$as_echo_n "checking for ltdl.h... " >&6; }
+if test "${ac_cv_header_ltdl_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_ltdl_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
+$as_echo "$ac_cv_header_ltdl_h" >&6; }
+
+fi
+if test "x$ac_cv_header_ltdl_h" = x""yes; then
+
+ { $as_echo "$as_me:$LINENO: checking for lt_dlinit in -lltdl" >&5
$as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
ac_save_LIBS="$LIBS"
LIBS="$LIBS -lltdl"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ltdl.h>
int
@@ -14453,20 +22121,47 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
have_dl=yes
else
- LIBS="$ac_save_LIBS"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ LIBS="$ac_save_LIBS"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+ { $as_echo "$as_me:$LINENO: result: $have_dl" >&5
$as_echo "$have_dl" >&6; }
if test "$have_dl" = "yes"; then
- $as_echo "#define HAVE_LTDL 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_LTDL 1
+_ACEOF
fi
fi
@@ -14485,9 +22180,9 @@
xehost=$ac_cv_build
xealias=$ac_cv_build_alias
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build dynamic libraries for ${xehost}" >&5
+{ $as_echo "$as_me:$LINENO: checking how to build dynamic libraries for ${xehost}" >&5
$as_echo_n "checking how to build dynamic libraries for ${xehost}... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+{ $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
case "$xehost" in
@@ -14499,25 +22194,17 @@
xehost_vendor=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
xehost_os=`echo $xehost | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-case "$xehost_os" in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "${COLLECT_NAMES+set}" != set; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
# Now see if the compiler is really GCC.
if test "$GCC" = "yes"; then
XEGCC=yes
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using GNU C" >&5
+ { $as_echo "$as_me:$LINENO: checking whether we are using GNU C" >&5
$as_echo_n "checking whether we are using GNU C... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef __GNUC__
@@ -14526,18 +22213,18 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
+ $EGREP "yes" >/dev/null 2>&1; then
XEGCC=yes
else
XEGCC=no
fi
rm -f conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${XEGCC}" >&5
+ { $as_echo "$as_me:$LINENO: result: ${XEGCC}" >&5
$as_echo "${XEGCC}" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to produce PIC code" >&5
+{ $as_echo "$as_me:$LINENO: checking how to produce PIC code" >&5
$as_echo_n "checking how to produce PIC code... " >&6; }
wl=
@@ -14546,7 +22233,7 @@
wl='-Wl,'
case "$xehost_os" in
- aix[3-9]* | irix[5-9]* | osf[3-9])
+ aix[4-9]* | irix[5-9]* | osf[3-9])
# PIC is the default for these OSes.
;;
@@ -14572,7 +22259,7 @@
else
# PORTME Check for PIC flags for the system compiler.
case "$xehost_os" in
- hpux9* | hpux1[0-9]*)
+ hpux1[0-9]*)
# Is there a better link_static_flag that works with the bundled CC?
wl='-Wl,'
dll_cflags='+Z'
@@ -14592,7 +22279,7 @@
wl='-Wl,'
;;
- aix[3-9]*)
+ aix[4-9]*)
# All AIX code is PIC.
wl='-Wl,'
;;
@@ -14622,11 +22309,6 @@
wl='-Wl,'
;;
- sunos4*)
- dll_cflags='-PIC'
- wl='-Qoption ld '
- ;;
-
uts4*)
dll_cflags='-pic'
;;
@@ -14638,41 +22320,66 @@
fi
if test -n "$dll_cflags"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${dll_cflags}" >&5
+ { $as_echo "$as_me:$LINENO: result: ${dll_cflags}" >&5
$as_echo "${dll_cflags}" >&6; }
# Check to make sure the dll_cflags actually works.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PIC flag ${dll_cflags} really works" >&5
+ { $as_echo "$as_me:$LINENO: checking if PIC flag ${dll_cflags} really works" >&5
$as_echo_n "checking if PIC flag ${dll_cflags} really works... " >&6; }
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $dll_cflags -DPIC"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int x=0;
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
# On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
# reports no error. So, we need to grep stderr for (Bundled).
if grep '(Bundled)' config.log >/dev/null; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
can_build_shared=no
dll_cflags=
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
can_build_shared=no
dll_cflags=
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+ { $as_echo "$as_me:$LINENO: result: none" >&5
$as_echo "none" >&6; }
fi
@@ -14680,7 +22387,7 @@
cc_produces_so=no
xldf=
xcldf=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if C compiler can produce shared libraries" >&5
+{ $as_echo "$as_me:$LINENO: checking if C compiler can produce shared libraries" >&5
$as_echo_n "checking if C compiler can produce shared libraries... " >&6; }
if test "$XEGCC" = yes -o "$__ICC" = yes; then
case "$xehost_os" in
@@ -14695,7 +22402,7 @@
esac
else # Not using GCC
case "$xehost_os" in
- aix[3-9]*)
+ aix[4-9]*)
xldf="-bE:ELLSONAME.exp -H512 -T512 -bhalt:4 -bM:SRE -bnoentry -lc"
xcldf="${wl}-bE:ELLSONAME.exp ${wl}-H512 ${wl}-T512 ${wl}-bhalt:4 ${wl}-bM:SRE ${wl}-bnoentry ${wl}-lc"
;;
@@ -14723,11 +22430,6 @@
xcldf="-G"
xldf="-G"
;;
-
- sunos4*)
- xcldf="${wl}-assert ${wl}pure-text ${wl}-Bstatic"
- xldf="-assert pure-text -Bstatic"
- ;;
esac
fi # End if if we are using gcc
@@ -14739,17 +22441,46 @@
LIBS=
xe_libs=
ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int x=0;
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cc_produces_so=yes
else
- cc_produces_so=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cc_produces_so=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
xe_libs=$save_xe_libs
@@ -14757,7 +22488,7 @@
else
cc_produces_so=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${cc_produces_so}" >&5
+{ $as_echo "$as_me:$LINENO: result: ${cc_produces_so}" >&5
$as_echo "${cc_produces_so}" >&6; }
LTLD=$LD
@@ -14765,7 +22496,7 @@
ac_prog=ld
if test "$XEGCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+ { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
$as_echo_n "checking for ld used by GCC... " >&6; }
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
@@ -14791,7 +22522,7 @@
;;
esac
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
fi
@@ -14815,15 +22546,17 @@
fi
if test -n "$LTLD"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LTLD}" >&5
+ { $as_echo "$as_me:$LINENO: result: ${LTLD}" >&5
$as_echo "${LTLD}" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
if test -z "$LTLD" -a "$cc_produces_so" = no; then
- as_fn_error "no acceptable linker found in \$PATH" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: no acceptable linker found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable linker found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
exit 1
fi
fi
@@ -14831,7 +22564,7 @@
ld_dynamic_link_flags=
# Check to see if it really is or isn't GNU ld.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker is GNU ld" >&5
+{ $as_echo "$as_me:$LINENO: checking if the linker is GNU ld" >&5
$as_echo_n "checking if the linker is GNU ld... " >&6; }
# 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
@@ -14839,12 +22572,12 @@
else
xe_gnu_ld=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${xe_gnu_ld}" >&5
+{ $as_echo "$as_me:$LINENO: result: ${xe_gnu_ld}" >&5
$as_echo "${xe_gnu_ld}" >&6; }
case "$xehost_os" in
- amigaos* | sunos4*)
- # On these operating systems, we should treat GNU ld like the system ld.
+ amigaos*)
+ # On this operating system, we should treat GNU ld like the system ld.
gnu_ld_acts_native=yes
;;
*)
@@ -14867,7 +22600,7 @@
else
# OK - only NOW do we futz about with ld.
# See if the linker supports building shared libraries.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker supports shared libraries" >&5
+ { $as_echo "$as_me:$LINENO: checking whether the linker supports shared libraries" >&5
$as_echo_n "checking whether the linker supports shared libraries... " >&6; }
dll_ld=$CC
dll_ldflags=$LDFLAGS
@@ -14885,11 +22618,6 @@
else
# PORTME fill in a description of your system's linker (not GNU ld)
case "$xehost_os" in
- aix3*)
- dll_ld=$LTLD
- dll_ldflags=$xldf
- ;;
-
aix[4-9]*)
dll_ldflags=$xcldf
;;
@@ -14953,15 +22681,6 @@
esac
;;
- sunos4*)
- if test "$XEGCC" = yes; then
- dll_ld=$CC
- else
- dll_ld=$LTLD
- fi
- dll_ldflags=$xldf
- ;;
-
uts4*)
dll_ld=$LTLD
dll_ldflags="-G"
@@ -14978,7 +22697,7 @@
;;
esac
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ld_shlibs}" >&5
+ { $as_echo "$as_me:$LINENO: result: ${ld_shlibs}" >&5
$as_echo "${ld_shlibs}" >&6; }
if test "$ld_shlibs" = "no"; then
can_build_shared=no
@@ -15038,22 +22757,14 @@
ld_dynamic_link_flags=
;;
- sco3.2v5* | unixware* | sysv5* | sysv4*)
+ unixware* | sysv5* | sysv4*)
ld_dynamic_link_flags="${wl}-Bexport"
;;
- sunos4*)
- ld_dynamic_link_flags=
- ;;
-
uts4*)
ld_dynamic_link_flags=
;;
- bsdi*)
- ld_dynamic_link_flags=
- ;;
-
esac
fi # End of if -z ld_dynamic_link_flags
fi # End of if test "$can_build_shared" = "yes"
@@ -15068,17 +22779,108 @@
fi
if test "$can_build_shared" = "yes"; then
- $as_echo "#define HAVE_SHLIB 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SHLIB 1
+_ACEOF
MAKE_SUBDIR="$MAKE_SUBDIR src" && if test "$verbose" = "yes"; then echo " Appending \"src\" to \$MAKE_SUBDIR"; fi
INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR src" && if test "$verbose" = "yes"; then echo " Appending \"src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
test -n "$libdl" && LIBS="-l${libdl} $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-l${libdl}\" to \$LIBS"; fi
- for ac_func in dlerror _dlerror
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+
+
+for ac_func in dlerror _dlerror
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -15123,9 +22925,145 @@
if test "$with_tooltalk" != "no" ; then
for dir in "" "Tt/" "desktop/" ; do
as_ac_Header=`$as_echo "ac_cv_header_${dir}tt_c.h" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "${dir}tt_c.h" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for ${dir}tt_c.h" >&5
+$as_echo_n "checking for ${dir}tt_c.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking ${dir}tt_c.h usability" >&5
+$as_echo_n "checking ${dir}tt_c.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <${dir}tt_c.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking ${dir}tt_c.h presence" >&5
+$as_echo_n "checking ${dir}tt_c.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <${dir}tt_c.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}tt_c.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: ${dir}tt_c.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}tt_c.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: ${dir}tt_c.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}tt_c.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: ${dir}tt_c.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}tt_c.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: ${dir}tt_c.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}tt_c.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: ${dir}tt_c.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}tt_c.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: ${dir}tt_c.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}tt_c.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: ${dir}tt_c.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}tt_c.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: ${dir}tt_c.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for ${dir}tt_c.h" >&5
+$as_echo_n "checking for ${dir}tt_c.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
tt_c_h_file="${dir}tt_c.h"; break
fi
@@ -15142,14 +23080,18 @@
fi
if test "$with_tooltalk" != "no" ; then
for extra_libs in "" "-lI18N -lce" "-lcxx"; do
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tt_message_create in -ltt" >&5
+ { $as_echo "$as_me:$LINENO: checking for tt_message_create in -ltt" >&5
$as_echo_n "checking for tt_message_create in -ltt... " >&6; }
-if test "${ac_cv_lib_tt_tt_message_create+set}" = set; then :
+if test "${ac_cv_lib_tt_tt_message_create+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltt $extra_libs $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15167,18 +23109,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_tt_tt_message_create=yes
else
- ac_cv_lib_tt_tt_message_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tt_tt_message_create" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_tt_tt_message_create=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tt_tt_message_create" >&5
$as_echo "$ac_cv_lib_tt_tt_message_create" >&6; }
-if test "x$ac_cv_lib_tt_tt_message_create" = x""yes; then :
+if test "x$ac_cv_lib_tt_tt_message_create" = x""yes; then
tt_libs="-ltt $extra_libs"; break
else
:
@@ -15196,7 +23163,9 @@
fi
test -z "$with_tooltalk" && with_tooltalk=yes
if test "$with_tooltalk" = "yes"; then
- $as_echo "#define TOOLTALK 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define TOOLTALK 1
+_ACEOF
cat >>confdefs.h <<_ACEOF
#define TT_C_H_FILE "$tt_c_h_file"
@@ -15205,22 +23174,157 @@
libs_x="$tt_libs $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"$tt_libs\" to \$libs_x"; fi
fi
-test -z "$with_cde" && { ac_fn_c_check_header_mongrel "$LINENO" "Dt/Dt.h" "ac_cv_header_Dt_Dt_h" "$ac_includes_default"
-if test "x$ac_cv_header_Dt_Dt_h" = x""yes; then :
-
+test -z "$with_cde" && { if test "${ac_cv_header_Dt_Dt_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for Dt/Dt.h" >&5
+$as_echo_n "checking for Dt/Dt.h... " >&6; }
+if test "${ac_cv_header_Dt_Dt_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Dt_Dt_h" >&5
+$as_echo "$ac_cv_header_Dt_Dt_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking Dt/Dt.h usability" >&5
+$as_echo_n "checking Dt/Dt.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <Dt/Dt.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking Dt/Dt.h presence" >&5
+$as_echo_n "checking Dt/Dt.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <Dt/Dt.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: Dt/Dt.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: Dt/Dt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Dt/Dt.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: Dt/Dt.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: Dt/Dt.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: Dt/Dt.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Dt/Dt.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: Dt/Dt.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Dt/Dt.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: Dt/Dt.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Dt/Dt.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: Dt/Dt.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Dt/Dt.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: Dt/Dt.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Dt/Dt.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: Dt/Dt.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for Dt/Dt.h" >&5
+$as_echo_n "checking for Dt/Dt.h... " >&6; }
+if test "${ac_cv_header_Dt_Dt_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_Dt_Dt_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Dt_Dt_h" >&5
+$as_echo "$ac_cv_header_Dt_Dt_h" >&6; }
+
+fi
+if test "x$ac_cv_header_Dt_Dt_h" = x""yes; then
+ :
else
with_cde=no
fi
}
-test -z "$with_cde" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DtDndDragStart in -lDtSvc" >&5
+test -z "$with_cde" && { { $as_echo "$as_me:$LINENO: checking for DtDndDragStart in -lDtSvc" >&5
$as_echo_n "checking for DtDndDragStart in -lDtSvc... " >&6; }
-if test "${ac_cv_lib_DtSvc_DtDndDragStart+set}" = set; then :
+if test "${ac_cv_lib_DtSvc_DtDndDragStart+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lDtSvc $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15238,18 +23342,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_DtSvc_DtDndDragStart=yes
else
- ac_cv_lib_DtSvc_DtDndDragStart=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_DtSvc_DtDndDragStart" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_DtSvc_DtDndDragStart=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_DtSvc_DtDndDragStart" >&5
$as_echo "$ac_cv_lib_DtSvc_DtDndDragStart" >&6; }
-if test "x$ac_cv_lib_DtSvc_DtDndDragStart" = x""yes; then :
+if test "x$ac_cv_lib_DtSvc_DtDndDragStart" = x""yes; then
:
else
with_cde=no
@@ -15257,14 +23386,16 @@
}
if test "$with_dragndrop" = "no" ; then
if test "$with_cde" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-cde forced to \`no'; no generic Drag'n'Drop support" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: --with-cde forced to \`no'; no generic Drag'n'Drop support" >&5
$as_echo "$as_me: WARNING: --with-cde forced to \`no'; no generic Drag'n'Drop support" >&2;}
fi
with_cde=no
fi
test -z "$with_cde" && with_cde=yes
if test "$with_cde" = "yes" ; then
- $as_echo "#define HAVE_CDE 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_CDE 1
+_ACEOF
libs_x="-lDtSvc $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lDtSvc\" to \$libs_x"; fi
dragndrop_proto="$dragndrop_proto CDE" && if test "$verbose" = "yes"; then echo " Appending \"CDE\" to \$dragndrop_proto"; fi
@@ -15275,28 +23406,30 @@
test "$window_system" != "x11" && with_offix=no
if test "$with_xmu" != yes -a "$with_x11" = yes; then
if test "$with_offix" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-offix forced to \`no'; no real Xmu support" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: --with-offix forced to \`no'; no real Xmu support" >&5
$as_echo "$as_me: WARNING: --with-offix forced to \`no'; no real Xmu support" >&2;}
fi
with_offix=no
fi
if test "$with_dragndrop" = no; then
if test "$with_offix" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-offix forced to \`no'; no generic Drag'n'Drop support" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: --with-offix forced to \`no'; no generic Drag'n'Drop support" >&5
$as_echo "$as_me: WARNING: --with-offix forced to \`no'; no generic Drag'n'Drop support" >&2;}
fi
with_offix=no
fi
if test "$with_cde" = yes; then
if test "$with_offix" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-offix forced to \`no'; CDE already found" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: --with-offix forced to \`no'; CDE already found" >&5
$as_echo "$as_me: WARNING: --with-offix forced to \`no'; CDE already found" >&2;}
fi
with_offix=no
fi
test -z "$with_offix" && with_offix=no
if test "$with_offix" = "yes"; then
- $as_echo "#define HAVE_OFFIX_DND 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_OFFIX_DND 1
+_ACEOF
dnd_objs="$dnd_objs offix.o" && if test "$verbose" = "yes"; then echo " Appending \"offix.o\" to \$dnd_objs"; fi
dragndrop_proto="$dragndrop_proto OffiX" && if test "$verbose" = "yes"; then echo " Appending \"OffiX\" to \$dragndrop_proto"; fi
@@ -15306,52 +23439,320 @@
fi
if test "$with_dragndrop" != "no" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if drag and drop API is needed" >&5
+ { $as_echo "$as_me:$LINENO: checking if drag and drop API is needed" >&5
$as_echo_n "checking if drag and drop API is needed... " >&6; }
if test -n "$dragndrop_proto" ; then
with_dragndrop=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (${dragndrop_proto} )" >&5
+ { $as_echo "$as_me:$LINENO: result: yes (${dragndrop_proto} )" >&5
$as_echo "yes (${dragndrop_proto} )" >&6; }
- $as_echo "#define HAVE_DRAGNDROP 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_DRAGNDROP 1
+_ACEOF
extra_objs="$extra_objs dragdrop.o" && if test "$verbose" = "yes"; then echo " Appending \"dragdrop.o\" to \$extra_objs"; fi
else
with_dragndrop=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- fi
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for LDAP" >&5
$as_echo_n "checking for LDAP... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+{ $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
ldap_libs=
-test -z "$with_ldap" && { ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
-if test "x$ac_cv_header_ldap_h" = x""yes; then :
-
+test -z "$with_ldap" && { if test "${ac_cv_header_ldap_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for ldap.h" >&5
+$as_echo_n "checking for ldap.h... " >&6; }
+if test "${ac_cv_header_ldap_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5
+$as_echo "$ac_cv_header_ldap_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking ldap.h usability" >&5
+$as_echo_n "checking ldap.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <ldap.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking ldap.h presence" >&5
+$as_echo_n "checking ldap.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ldap.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: ldap.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: ldap.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ldap.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: ldap.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: ldap.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: ldap.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ldap.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: ldap.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ldap.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: ldap.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ldap.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: ldap.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ldap.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: ldap.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ldap.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: ldap.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for ldap.h" >&5
+$as_echo_n "checking for ldap.h... " >&6; }
+if test "${ac_cv_header_ldap_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_ldap_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5
+$as_echo "$ac_cv_header_ldap_h" >&6; }
+
+fi
+if test "x$ac_cv_header_ldap_h" = x""yes; then
+ :
else
with_ldap=no
fi
}
-test -z "$with_ldap" && { ac_fn_c_check_header_mongrel "$LINENO" "lber.h" "ac_cv_header_lber_h" "$ac_includes_default"
-if test "x$ac_cv_header_lber_h" = x""yes; then :
-
+test -z "$with_ldap" && { if test "${ac_cv_header_lber_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for lber.h" >&5
+$as_echo_n "checking for lber.h... " >&6; }
+if test "${ac_cv_header_lber_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lber_h" >&5
+$as_echo "$ac_cv_header_lber_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking lber.h usability" >&5
+$as_echo_n "checking lber.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <lber.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking lber.h presence" >&5
+$as_echo_n "checking lber.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <lber.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: lber.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: lber.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: lber.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: lber.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: lber.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: lber.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: lber.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: lber.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: lber.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: lber.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: lber.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: lber.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: lber.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: lber.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: lber.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: lber.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for lber.h" >&5
+$as_echo_n "checking for lber.h... " >&6; }
+if test "${ac_cv_header_lber_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_lber_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lber_h" >&5
+$as_echo "$ac_cv_header_lber_h" >&6; }
+
+fi
+if test "x$ac_cv_header_lber_h" = x""yes; then
+ :
else
with_ldap=no
fi
}
if test "$with_ldap" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_search in -lldap" >&5
+ { $as_echo "$as_me:$LINENO: checking for ldap_search in -lldap" >&5
$as_echo_n "checking for ldap_search in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_search+set}" = set; then :
+if test "${ac_cv_lib_ldap_ldap_search+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lldap $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15369,29 +23770,58 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_ldap_ldap_search=yes
else
- ac_cv_lib_ldap_ldap_search=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_search" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ldap_ldap_search=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_search" >&5
$as_echo "$ac_cv_lib_ldap_ldap_search" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_search" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_search" = x""yes; then
with_ldap=yes
fi
- test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
+ test "$with_ldap" != "yes" && { { $as_echo "$as_me:$LINENO: checking for ldap_open in -lldap" >&5
$as_echo_n "checking for ldap_open in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then :
+if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lldap -llber $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15409,29 +23839,127 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_ldap_ldap_open=yes
else
- ac_cv_lib_ldap_ldap_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ldap_ldap_open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_open" >&5
$as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then
with_ldap=yes with_ldap_lber=yes
fi
}
- test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
+ test "$with_ldap" != "yes" && { { $as_echo "$as_me:$LINENO: checking for ldap_open in -lldap" >&5
$as_echo_n "checking for ldap_open in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then :
+if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lldap -llber -lkrb $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ldap_open ();
+int
+main ()
+{
+return ldap_open ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_ldap_ldap_open=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ldap_ldap_open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_open" >&5
+$as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
+if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then
+ with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes
+fi
+ }
+ test "$with_ldap" != "yes" && { { $as_echo "$as_me:$LINENO: checking for ldap_open in -lldap" >&5
+$as_echo_n "checking for ldap_open in -lldap... " >&6; }
+if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lldap -llber -lkrb -ldes $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15449,69 +23977,58 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_ldap_ldap_open=yes
else
- ac_cv_lib_ldap_ldap_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ldap_ldap_open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_open" >&5
$as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then :
- with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes
-fi
- }
- test "$with_ldap" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
-$as_echo_n "checking for ldap_open in -lldap... " >&6; }
-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap -llber -lkrb -ldes $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ldap_open ();
-int
-main ()
-{
-return ldap_open ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ldap_ldap_open=yes
-else
- ac_cv_lib_ldap_ldap_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then :
+if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then
with_ldap=yes with_ldap_lber=yes with_ldap_krb=yes with_ldap_des=yes
fi
}
- test "$with_ldap_lber" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_pvt_opt_on in -llber" >&5
+ test "$with_ldap_lber" != "yes" && { { $as_echo "$as_me:$LINENO: checking for ber_pvt_opt_on in -llber" >&5
$as_echo_n "checking for ber_pvt_opt_on in -llber... " >&6; }
-if test "${ac_cv_lib_lber_ber_pvt_opt_on+set}" = set; then :
+if test "${ac_cv_lib_lber_ber_pvt_opt_on+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-llber $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15529,24 +24046,51 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_lber_ber_pvt_opt_on=yes
else
- ac_cv_lib_lber_ber_pvt_opt_on=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_pvt_opt_on" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_lber_ber_pvt_opt_on=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_pvt_opt_on" >&5
$as_echo "$ac_cv_lib_lber_ber_pvt_opt_on" >&6; }
-if test "x$ac_cv_lib_lber_ber_pvt_opt_on" = x""yes; then :
+if test "x$ac_cv_lib_lber_ber_pvt_opt_on" = x""yes; then
with_ldap_lber=yes
fi
}
fi
if test "$with_ldap" = "yes"; then
- $as_echo "#define HAVE_LDAP 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_LDAP 1
+_ACEOF
if test "$with_ldap_des" = "yes" ; then
ldap_libs="-ldes $ldap_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-ldes\" to \$ldap_libs"; fi
@@ -15559,12 +24103,103 @@
fi
ldap_libs="-lldap $ldap_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lldap\" to \$ldap_libs"; fi
save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs"
- for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+
+
+
+
+for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -15583,16 +24218,152 @@
postgresql_libs=
if test "$with_postgresql" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL" >&5
+ { $as_echo "$as_me:$LINENO: checking for PostgreSQL" >&5
$as_echo_n "checking for PostgreSQL... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ { $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
for header_dir in "" "pgsql/" "postgresql/"; do
as_ac_Header=`$as_echo "ac_cv_header_${header_dir}libpq-fe.h" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "${header_dir}libpq-fe.h" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for ${header_dir}libpq-fe.h" >&5
+$as_echo_n "checking for ${header_dir}libpq-fe.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking ${header_dir}libpq-fe.h usability" >&5
+$as_echo_n "checking ${header_dir}libpq-fe.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <${header_dir}libpq-fe.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking ${header_dir}libpq-fe.h presence" >&5
+$as_echo_n "checking ${header_dir}libpq-fe.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <${header_dir}libpq-fe.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: ${header_dir}libpq-fe.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: ${header_dir}libpq-fe.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${header_dir}libpq-fe.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: ${header_dir}libpq-fe.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: ${header_dir}libpq-fe.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: ${header_dir}libpq-fe.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${header_dir}libpq-fe.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: ${header_dir}libpq-fe.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${header_dir}libpq-fe.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: ${header_dir}libpq-fe.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${header_dir}libpq-fe.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: ${header_dir}libpq-fe.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${header_dir}libpq-fe.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: ${header_dir}libpq-fe.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${header_dir}libpq-fe.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: ${header_dir}libpq-fe.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for ${header_dir}libpq-fe.h" >&5
+$as_echo_n "checking for ${header_dir}libpq-fe.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
libpq_fe_h_file=${header_dir}libpq-fe.h; break
fi
@@ -15602,14 +24373,18 @@
pq_libs=
extra_libs=
if test -n "$libpq_fe_h_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5
+ { $as_echo "$as_me:$LINENO: checking for PQconnectdb in -lpq" >&5
$as_echo_n "checking for PQconnectdb in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then :
+if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpq $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15627,30 +24402,59 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_pq_PQconnectdb=yes
else
- ac_cv_lib_pq_PQconnectdb=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdb" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_pq_PQconnectdb=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQconnectdb" >&5
$as_echo "$ac_cv_lib_pq_PQconnectdb" >&6; }
-if test "x$ac_cv_lib_pq_PQconnectdb" = x""yes; then :
+if test "x$ac_cv_lib_pq_PQconnectdb" = x""yes; then
pq_libs="-lpq"
else
unset ac_cv_lib_pq_PQconnectdb;
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5
+ { $as_echo "$as_me:$LINENO: checking for PQconnectdb in -lpq" >&5
$as_echo_n "checking for PQconnectdb in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then :
+if test "${ac_cv_lib_pq_PQconnectdb+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpq -lcrypto -lssl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15668,18 +24472,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_pq_PQconnectdb=yes
else
- ac_cv_lib_pq_PQconnectdb=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdb" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_pq_PQconnectdb=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQconnectdb" >&5
$as_echo "$ac_cv_lib_pq_PQconnectdb" >&6; }
-if test "x$ac_cv_lib_pq_PQconnectdb" = x""yes; then :
+if test "x$ac_cv_lib_pq_PQconnectdb" = x""yes; then
pq_libs="-lpq -lcrypto -lssl"
fi
@@ -15694,16 +24523,22 @@
if test -n "$libpq_fe_h_file" -a "$have_libpq" = "yes"; then
with_postgresql=yes
- $as_echo "#define HAVE_POSTGRESQL 1" >>confdefs.h
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectStart in -lpq" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_POSTGRESQL 1
+_ACEOF
+
+ { $as_echo "$as_me:$LINENO: checking for PQconnectStart in -lpq" >&5
$as_echo_n "checking for PQconnectStart in -lpq... " >&6; }
-if test "${ac_cv_lib_pq_PQconnectStart+set}" = set; then :
+if test "${ac_cv_lib_pq_PQconnectStart+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpq $extra_libs $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15721,21 +24556,48 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_pq_PQconnectStart=yes
else
- ac_cv_lib_pq_PQconnectStart=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectStart" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_pq_PQconnectStart=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQconnectStart" >&5
$as_echo "$ac_cv_lib_pq_PQconnectStart" >&6; }
-if test "x$ac_cv_lib_pq_PQconnectStart" = x""yes; then :
+if test "x$ac_cv_lib_pq_PQconnectStart" = x""yes; then
with_postgresqlv7=yes;
- $as_echo "#define HAVE_POSTGRESQLV7 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_POSTGRESQLV7 1
+_ACEOF
else
:
@@ -15759,9 +24621,9 @@
if test "$window_system" != "none"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for graphics libraries" >&5
+ { $as_echo "$as_me:$LINENO: checking for graphics libraries" >&5
$as_echo_n "checking for graphics libraries... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ { $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
libpath_xpm=
@@ -15789,16 +24651,23 @@
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi
LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xpm - no older than 3.4f" >&5
+ { $as_echo "$as_me:$LINENO: checking for Xpm - no older than 3.4f" >&5
$as_echo_n "checking for Xpm - no older than 3.4f... " >&6; }
xe_check_libs="$libname_xpm"
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define XPM_NUMBERS
#include <X11/xpm.h>
@@ -15807,7 +24676,28 @@
XpmIncludeVersion != XpmLibraryVersion() ? 1 :
XpmIncludeVersion < 30406 ? 2 : 0 ;}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
./conftest dummy_arg; xpm_status=$?;
if test "$xpm_status" = "0"; then
with_xpm=yes;
@@ -15827,27 +24717,39 @@
configure and add '--with-xpm=yes', but don't blame me if XEmacs crashes!"
fi
else
- with_xpm=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+with_xpm=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
xe_check_libs=
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_xpm" >&5
+ { $as_echo "$as_me:$LINENO: result: $with_xpm" >&5
$as_echo "$with_xpm" >&6; }
fi
if test "$with_xpm" = "yes"; then
- $as_echo "#define HAVE_XPM 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_XPM 1
+_ACEOF
LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
libs_x=""$libname_xpm" $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \""$libname_xpm"\" to \$libs_x"; fi
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
XE_CFLAGS=""$incpath_xpm" $XE_CFLAGS" && if test "$verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$XE_CFLAGS"; fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"FOR_MSW\" xpm" >&5
+ { $as_echo "$as_me:$LINENO: checking for \"FOR_MSW\" xpm" >&5
$as_echo_n "checking for \"FOR_MSW\" xpm... " >&6; }
xe_check_libs="$libname_xpm"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -15858,38 +24760,200 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
xpm_for_msw=no
else
- xpm_for_msw=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ xpm_for_msw=yes
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
xe_check_libs=
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xpm_for_msw" >&5
+ { $as_echo "$as_me:$LINENO: result: $xpm_for_msw" >&5
$as_echo "$xpm_for_msw" >&6; }
if test "$xpm_for_msw" = "yes"; then
- $as_echo "#define FOR_MSW 1" >>confdefs.h
-
- fi
- fi
-
- test -z "$with_xface" && { ac_fn_c_check_header_mongrel "$LINENO" "compface.h" "ac_cv_header_compface_h" "$ac_includes_default"
-if test "x$ac_cv_header_compface_h" = x""yes; then :
-
+ cat >>confdefs.h <<\_ACEOF
+#define FOR_MSW 1
+_ACEOF
+
+ fi
+ fi
+
+ test -z "$with_xface" && { if test "${ac_cv_header_compface_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for compface.h" >&5
+$as_echo_n "checking for compface.h... " >&6; }
+if test "${ac_cv_header_compface_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_compface_h" >&5
+$as_echo "$ac_cv_header_compface_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking compface.h usability" >&5
+$as_echo_n "checking compface.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <compface.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking compface.h presence" >&5
+$as_echo_n "checking compface.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <compface.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: compface.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: compface.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: compface.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: compface.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: compface.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: compface.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: compface.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: compface.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for compface.h" >&5
+$as_echo_n "checking for compface.h... " >&6; }
+if test "${ac_cv_header_compface_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_compface_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_compface_h" >&5
+$as_echo "$ac_cv_header_compface_h" >&6; }
+
+fi
+if test "x$ac_cv_header_compface_h" = x""yes; then
+ :
else
with_xface=no
fi
}
- test -z "$with_xface" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UnGenFace in -lcompface" >&5
+ test -z "$with_xface" && { { $as_echo "$as_me:$LINENO: checking for UnGenFace in -lcompface" >&5
$as_echo_n "checking for UnGenFace in -lcompface... " >&6; }
-if test "${ac_cv_lib_compface_UnGenFace+set}" = set; then :
+if test "${ac_cv_lib_compface_UnGenFace+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcompface $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15907,18 +24971,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_compface_UnGenFace=yes
else
- ac_cv_lib_compface_UnGenFace=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_compface_UnGenFace" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_compface_UnGenFace=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_compface_UnGenFace" >&5
$as_echo "$ac_cv_lib_compface_UnGenFace" >&6; }
-if test "x$ac_cv_lib_compface_UnGenFace" = x""yes; then :
+if test "x$ac_cv_lib_compface_UnGenFace" = x""yes; then
:
else
with_xface=no
@@ -15926,14 +25015,147 @@
}
test -z "$with_xface" && with_xface=yes
if test "$with_xface" = "yes"; then
- $as_echo "#define HAVE_XFACE 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_XFACE 1
+_ACEOF
libs_x="-lcompface $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lcompface\" to \$libs_x"; fi
fi
- test -z "$with_gif" && { ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
-if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
-
+ test -z "$with_gif" && { if test "${ac_cv_header_gif_lib_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for gif_lib.h" >&5
+$as_echo_n "checking for gif_lib.h... " >&6; }
+if test "${ac_cv_header_gif_lib_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5
+$as_echo "$ac_cv_header_gif_lib_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking gif_lib.h usability" >&5
+$as_echo_n "checking gif_lib.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <gif_lib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking gif_lib.h presence" >&5
+$as_echo_n "checking gif_lib.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <gif_lib.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: gif_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: gif_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gif_lib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: gif_lib.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: gif_lib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: gif_lib.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gif_lib.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: gif_lib.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gif_lib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: gif_lib.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gif_lib.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: gif_lib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gif_lib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: gif_lib.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gif_lib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: gif_lib.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for gif_lib.h" >&5
+$as_echo_n "checking for gif_lib.h... " >&6; }
+if test "${ac_cv_header_gif_lib_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_gif_lib_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5
+$as_echo "$ac_cv_header_gif_lib_h" >&6; }
+
+fi
+if test "x$ac_cv_header_gif_lib_h" = x""yes; then
+ :
else
with_gif=no
fi
@@ -15941,14 +25163,18 @@
}
if test "$with_gif" != "no"; then
with_gif="yes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
+ { $as_echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lgif" >&5
$as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
-if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then :
+if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgif $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -15966,28 +25192,57 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_gif_EGifPutExtensionLast=yes
else
- ac_cv_lib_gif_EGifPutExtensionLast=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gif_EGifPutExtensionLast=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
$as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = x""yes; then :
+if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = x""yes; then
libs_x="-lgif $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lgif\" to \$libs_x"; fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lungif" >&5
+ { $as_echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5
$as_echo_n "checking for EGifPutExtensionLast in -lungif... " >&6; }
-if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then :
+if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lungif $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16005,18 +25260,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_ungif_EGifPutExtensionLast=yes
else
- ac_cv_lib_ungif_EGifPutExtensionLast=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ungif_EGifPutExtensionLast=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
$as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then :
+if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then
libs_x="-lungif $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lungif\" to \$libs_x"; fi
else
with_gif=no
@@ -16026,19 +25306,25 @@
fi
if test "$with_gif" != "no"; then
- $as_echo "#define HAVE_GIF 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GIF 1
+_ACEOF
fi
if test "$with_png $with_tiff" != "no no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lc" >&5
+ { $as_echo "$as_me:$LINENO: checking for inflate in -lc" >&5
$as_echo_n "checking for inflate in -lc... " >&6; }
-if test "${ac_cv_lib_c_inflate+set}" = set; then :
+if test "${ac_cv_lib_c_inflate+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lc $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16056,29 +25342,58 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_c_inflate=yes
else
- ac_cv_lib_c_inflate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inflate" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_c_inflate=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_inflate" >&5
$as_echo "$ac_cv_lib_c_inflate" >&6; }
-if test "x$ac_cv_lib_c_inflate" = x""yes; then :
- :
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
+if test "x$ac_cv_lib_c_inflate" = x""yes; then
+ :
+else
+
+ { $as_echo "$as_me:$LINENO: checking for inflate in -lz" >&5
$as_echo_n "checking for inflate in -lz... " >&6; }
-if test "${ac_cv_lib_z_inflate+set}" = set; then :
+if test "${ac_cv_lib_z_inflate+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lz $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16096,29 +25411,58 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_z_inflate=yes
else
- ac_cv_lib_z_inflate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_z_inflate=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
$as_echo "$ac_cv_lib_z_inflate" >&6; }
-if test "x$ac_cv_lib_z_inflate" = x""yes; then :
+if test "x$ac_cv_lib_z_inflate" = x""yes; then
libs_x="-lz $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lz\" to \$libs_x"; fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lgz" >&5
+ { $as_echo "$as_me:$LINENO: checking for inflate in -lgz" >&5
$as_echo_n "checking for inflate in -lgz... " >&6; }
-if test "${ac_cv_lib_gz_inflate+set}" = set; then :
+if test "${ac_cv_lib_gz_inflate+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgz $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16136,18 +25480,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_gz_inflate=yes
else
- ac_cv_lib_gz_inflate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gz_inflate" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gz_inflate=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gz_inflate" >&5
$as_echo "$ac_cv_lib_gz_inflate" >&6; }
-if test "x$ac_cv_lib_gz_inflate" = x""yes; then :
+if test "x$ac_cv_lib_gz_inflate" = x""yes; then
libs_x="-lgz $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lgz\" to \$libs_x"; fi
fi
@@ -16157,22 +25526,157 @@
fi
- test -z "$with_jpeg" && { ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
-
+ test -z "$with_jpeg" && { if test "${ac_cv_header_jpeglib_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+$as_echo_n "checking for jpeglib.h... " >&6; }
+if test "${ac_cv_header_jpeglib_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+$as_echo "$ac_cv_header_jpeglib_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking jpeglib.h usability" >&5
+$as_echo_n "checking jpeglib.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <jpeglib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking jpeglib.h presence" >&5
+$as_echo_n "checking jpeglib.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <jpeglib.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5
+$as_echo_n "checking for jpeglib.h... " >&6; }
+if test "${ac_cv_header_jpeglib_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_jpeglib_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5
+$as_echo "$ac_cv_header_jpeglib_h" >&6; }
+
+fi
+if test "x$ac_cv_header_jpeglib_h" = x""yes; then
+ :
else
with_jpeg=no
fi
}
- test -z "$with_jpeg" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_decompress in -ljpeg" >&5
+ test -z "$with_jpeg" && { { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then :
+if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ljpeg $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16190,18 +25694,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
else
- ac_cv_lib_jpeg_jpeg_destroy_decompress=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_jpeg_jpeg_destroy_decompress=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then :
+if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then
:
else
with_jpeg=no
@@ -16209,35 +25738,256 @@
}
test -z "$with_jpeg" && with_jpeg=yes
if test "$with_jpeg" = "yes"; then
- $as_echo "#define HAVE_JPEG 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_JPEG 1
+_ACEOF
libs_x="-ljpeg $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-ljpeg\" to \$libs_x"; fi
fi
png_problem=""
- test -z "$with_png" && { ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = x""yes; then :
-
+ test -z "$with_png" && { { $as_echo "$as_me:$LINENO: checking for pow" >&5
+$as_echo_n "checking for pow... " >&6; }
+if test "${ac_cv_func_pow+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define pow to an innocuous variant, in case <limits.h> declares pow.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define pow innocuous_pow
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char pow (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef pow
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pow ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_pow || defined __stub___pow
+choke me
+#endif
+
+int
+main ()
+{
+return pow ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_pow=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_pow=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5
+$as_echo "$ac_cv_func_pow" >&6; }
+if test "x$ac_cv_func_pow" = x""yes; then
+ :
else
with_png=no
fi
}
- test -z "$with_png" && { ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
-if test "x$ac_cv_header_png_h" = x""yes; then :
-
+ test -z "$with_png" && { if test "${ac_cv_header_png_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for png.h" >&5
+$as_echo_n "checking for png.h... " >&6; }
+if test "${ac_cv_header_png_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+$as_echo "$ac_cv_header_png_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking png.h usability" >&5
+$as_echo_n "checking png.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <png.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5
+$as_echo_n "checking png.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <png.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for png.h" >&5
+$as_echo_n "checking for png.h... " >&6; }
+if test "${ac_cv_header_png_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_png_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
+$as_echo "$ac_cv_header_png_h" >&6; }
+
+fi
+if test "x$ac_cv_header_png_h" = x""yes; then
+ :
else
with_png=no
fi
}
- test -z "$with_png" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng" >&5
+ test -z "$with_png" && { { $as_echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
$as_echo_n "checking for png_read_image in -lpng... " >&6; }
-if test "${ac_cv_lib_png_png_read_image+set}" = set; then :
+if test "${ac_cv_lib_png_png_read_image+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpng -lz $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16255,34 +26005,66 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_png_png_read_image=yes
else
- ac_cv_lib_png_png_read_image=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_image" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_png_png_read_image=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
$as_echo "$ac_cv_lib_png_png_read_image" >&6; }
-if test "x$ac_cv_lib_png_png_read_image" = x""yes; then :
+if test "x$ac_cv_lib_png_png_read_image" = x""yes; then
:
else
with_png=no
fi
}
if test -z "$with_png"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for workable png version information" >&5
+ { $as_echo "$as_me:$LINENO: checking for workable png version information" >&5
$as_echo_n "checking for workable png version information... " >&6; }
xe_check_libs="-lpng -lz"
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <png.h>
int main(int c, char **v) {
@@ -16290,7 +26072,28 @@
if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
./conftest dummy_arg; png_status=$?;
if test "$png_status" = "0"; then
with_png=yes;
@@ -16308,38 +26111,181 @@
configure and add '--with-png=yes', but don't blame me if XEmacs crashes!"
fi
else
- with_png=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+with_png=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
xe_check_libs=
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_png" >&5
+ { $as_echo "$as_me:$LINENO: result: $with_png" >&5
$as_echo "$with_png" >&6; }
fi
if test "$with_png" = "yes"; then
- $as_echo "#define HAVE_PNG 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_PNG 1
+_ACEOF
libs_x="-lpng $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lpng\" to \$libs_x"; fi
fi
- test -z "$with_tiff" && { ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
-if test "x$ac_cv_header_tiffio_h" = x""yes; then :
-
+ test -z "$with_tiff" && { if test "${ac_cv_header_tiffio_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
+$as_echo_n "checking for tiffio.h... " >&6; }
+if test "${ac_cv_header_tiffio_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+$as_echo "$ac_cv_header_tiffio_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5
+$as_echo_n "checking tiffio.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <tiffio.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5
+$as_echo_n "checking tiffio.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <tiffio.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5
+$as_echo_n "checking for tiffio.h... " >&6; }
+if test "${ac_cv_header_tiffio_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_tiffio_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5
+$as_echo "$ac_cv_header_tiffio_h" >&6; }
+
+fi
+if test "x$ac_cv_header_tiffio_h" = x""yes; then
+ :
else
with_tiff=no
fi
}
- test -z "$with_tiff" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFClientOpen in -ltiff" >&5
+ test -z "$with_tiff" && { { $as_echo "$as_me:$LINENO: checking for TIFFClientOpen in -ltiff" >&5
$as_echo_n "checking for TIFFClientOpen in -ltiff... " >&6; }
-if test "${ac_cv_lib_tiff_TIFFClientOpen+set}" = set; then :
+if test "${ac_cv_lib_tiff_TIFFClientOpen+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltiff -lz $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16357,18 +26303,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_tiff_TIFFClientOpen=yes
else
- ac_cv_lib_tiff_TIFFClientOpen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFClientOpen" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_tiff_TIFFClientOpen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFClientOpen" >&5
$as_echo "$ac_cv_lib_tiff_TIFFClientOpen" >&6; }
-if test "x$ac_cv_lib_tiff_TIFFClientOpen" = x""yes; then :
+if test "x$ac_cv_lib_tiff_TIFFClientOpen" = x""yes; then
:
else
with_tiff=no
@@ -16376,7 +26347,9 @@
}
test -z "$with_tiff" && with_tiff=yes
if test "$with_tiff" = "yes"; then
- $as_echo "#define HAVE_TIFF 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_TIFF 1
+_ACEOF
libs_x="-ltiff $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-ltiff\" to \$libs_x"; fi
fi
@@ -16384,22 +26357,157 @@
if test "$with_gtk" = "yes"; then
- test -z "$with_xface" && { ac_fn_c_check_header_mongrel "$LINENO" "compface.h" "ac_cv_header_compface_h" "$ac_includes_default"
-if test "x$ac_cv_header_compface_h" = x""yes; then :
-
+ test -z "$with_xface" && { if test "${ac_cv_header_compface_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for compface.h" >&5
+$as_echo_n "checking for compface.h... " >&6; }
+if test "${ac_cv_header_compface_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_compface_h" >&5
+$as_echo "$ac_cv_header_compface_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking compface.h usability" >&5
+$as_echo_n "checking compface.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <compface.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking compface.h presence" >&5
+$as_echo_n "checking compface.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <compface.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: compface.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: compface.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: compface.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: compface.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: compface.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: compface.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: compface.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: compface.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: compface.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for compface.h" >&5
+$as_echo_n "checking for compface.h... " >&6; }
+if test "${ac_cv_header_compface_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_compface_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_compface_h" >&5
+$as_echo "$ac_cv_header_compface_h" >&6; }
+
+fi
+if test "x$ac_cv_header_compface_h" = x""yes; then
+ :
else
with_xface=no
fi
}
- test -z "$with_xface" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UnGenFace in -lcompface" >&5
+ test -z "$with_xface" && { { $as_echo "$as_me:$LINENO: checking for UnGenFace in -lcompface" >&5
$as_echo_n "checking for UnGenFace in -lcompface... " >&6; }
-if test "${ac_cv_lib_compface_UnGenFace+set}" = set; then :
+if test "${ac_cv_lib_compface_UnGenFace+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcompface $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16417,18 +26525,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_compface_UnGenFace=yes
else
- ac_cv_lib_compface_UnGenFace=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_compface_UnGenFace" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_compface_UnGenFace=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_compface_UnGenFace" >&5
$as_echo "$ac_cv_lib_compface_UnGenFace" >&6; }
-if test "x$ac_cv_lib_compface_UnGenFace" = x""yes; then :
+if test "x$ac_cv_lib_compface_UnGenFace" = x""yes; then
:
else
with_xface=no
@@ -16436,7 +26569,9 @@
}
test -z "$with_xface" && with_xface=yes
if test "$with_xface" = "yes"; then
- $as_echo "#define HAVE_XFACE 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_XFACE 1
+_ACEOF
libs_gtk="-lcompface $libs_gtk" && if test "$verbose" = "yes"; then echo " Prepending \"-lcompface\" to \$libs_gtk"; fi
fi
@@ -16444,9 +26579,9 @@
if test "$with_x11" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 graphics libraries" >&5
+ { $as_echo "$as_me:$LINENO: checking for X11 graphics libraries" >&5
$as_echo_n "checking for X11 graphics libraries... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ { $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
fi
@@ -16460,9 +26595,9 @@
esac
if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Athena widgets" >&5
+ { $as_echo "$as_me:$LINENO: checking for the Athena widgets" >&5
$as_echo_n "checking for the Athena widgets... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ { $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
case "$with_athena" in
@@ -16476,14 +26611,18 @@
if test "$athena_3d" = "no"; then
as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawScrollbarSetThumb" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+{ $as_echo "$as_me:$LINENO: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
$as_echo_n "checking for XawScrollbarSetThumb in -l$athena_variant... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$athena_variant $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16501,30 +26640,217 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
eval "$as_ac_Lib=yes"
else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
- if test "x$as_val" = x""yes; then :
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
+{ $as_echo "$as_me:$LINENO: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
$as_echo_n "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$athena_variant $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XawSme3dComputeTopShadowRGB ();
+int
+main ()
+{
+return XawSme3dComputeTopShadowRGB ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_Lib=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ { $as_echo "$as_me:$LINENO: WARNING: Could not find a non-3d Athena widget library." >&5
+$as_echo "$as_me: WARNING: Could not find a non-3d Athena widget library." >&2;}
+else
+ athena_lib=$athena_variant
+fi
+
+
+else
+ { $as_echo "$as_me:$LINENO: WARNING: Could not find an Athena widget library." >&5
+$as_echo "$as_me: WARNING: Could not find an Athena widget library." >&2;}
+fi
+
+ else
+ as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
+$as_echo_n "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$athena_variant $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XawSme3dComputeTopShadowRGB ();
+int
+main ()
+{
+return XawSme3dComputeTopShadowRGB ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_Lib=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ athena_lib=$athena_variant
+else
+ { $as_echo "$as_me:$LINENO: checking for XawSme3dComputeTopShadowRGB in -lXaw" >&5
+$as_echo_n "checking for XawSme3dComputeTopShadowRGB in -lXaw... " >&6; }
+if test "${ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXaw $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16542,119 +26868,50 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
- if test "x$as_val" = x""yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a non-3d Athena widget library." >&5
-$as_echo "$as_me: WARNING: Could not find a non-3d Athena widget library." >&2;}
-else
- athena_lib=$athena_variant
-fi
-
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find an Athena widget library." >&5
-$as_echo "$as_me: WARNING: Could not find an Athena widget library." >&2;}
-fi
-
- else
- as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5
-$as_echo_n "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$athena_variant $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XawSme3dComputeTopShadowRGB ();
-int
-main ()
-{
-return XawSme3dComputeTopShadowRGB ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
- if test "x$as_val" = x""yes; then :
- athena_lib=$athena_variant
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -lXaw" >&5
-$as_echo_n "checking for XawSme3dComputeTopShadowRGB in -lXaw... " >&6; }
-if test "${ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXaw $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XawSme3dComputeTopShadowRGB ();
-int
-main ()
-{
-return XawSme3dComputeTopShadowRGB ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB=yes
else
- ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" >&5
$as_echo "$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" >&6; }
-if test "x$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" = x""yes; then :
+if test "x$ac_cv_lib_Xaw_XawSme3dComputeTopShadowRGB" = x""yes; then
athena_lib=Xaw;
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that libXaw is actually $athena_variant." >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Assuming that libXaw is actually $athena_variant." >&5
$as_echo "$as_me: WARNING: Assuming that libXaw is actually $athena_variant." >&2;};
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a 3d Athena widget library that looked like $athena_variant." >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Could not find a 3d Athena widget library that looked like $athena_variant." >&5
$as_echo "$as_me: WARNING: Could not find a 3d Athena widget library that looked like $athena_variant." >&2;}
fi
@@ -16663,19 +26920,193 @@
fi
if test "$athena_3d" = "no"; then
- ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw/ThreeD.h" "ac_cv_header_X11_Xaw_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = x""yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a non-3d Athena header set." >&5
+ if test "${ac_cv_header_X11_Xaw_ThreeD_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for X11/Xaw/ThreeD.h" >&5
+$as_echo_n "checking for X11/Xaw/ThreeD.h... " >&6; }
+if test "${ac_cv_header_X11_Xaw_ThreeD_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw_ThreeD_h" >&5
+$as_echo "$ac_cv_header_X11_Xaw_ThreeD_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking X11/Xaw/ThreeD.h usability" >&5
+$as_echo_n "checking X11/Xaw/ThreeD.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <X11/Xaw/ThreeD.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking X11/Xaw/ThreeD.h presence" >&5
+$as_echo_n "checking X11/Xaw/ThreeD.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <X11/Xaw/ThreeD.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for X11/Xaw/ThreeD.h" >&5
+$as_echo_n "checking for X11/Xaw/ThreeD.h... " >&6; }
+if test "${ac_cv_header_X11_Xaw_ThreeD_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_X11_Xaw_ThreeD_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw_ThreeD_h" >&5
+$as_echo "$ac_cv_header_X11_Xaw_ThreeD_h" >&6; }
+
+fi
+if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = x""yes; then
+ { $as_echo "$as_me:$LINENO: WARNING: Could not find a non-3d Athena header set." >&5
$as_echo "$as_me: WARNING: Could not find a non-3d Athena header set." >&2;}
else
- ac_fn_c_check_header_compile "$LINENO" "X11/Xaw/XawInit.h" "ac_cv_header_X11_Xaw_XawInit_h" "
+ { $as_echo "$as_me:$LINENO: checking for X11/Xaw/XawInit.h" >&5
+$as_echo_n "checking for X11/Xaw/XawInit.h... " >&6; }
+if test "${ac_cv_header_X11_Xaw_XawInit_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
#include <X11/Intrinsic.h>
-"
-if test "x$ac_cv_header_X11_Xaw_XawInit_h" = x""yes; then :
+
+#include <X11/Xaw/XawInit.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_X11_Xaw_XawInit_h=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_X11_Xaw_XawInit_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw_XawInit_h" >&5
+$as_echo "$ac_cv_header_X11_Xaw_XawInit_h" >&6; }
+if test "x$ac_cv_header_X11_Xaw_XawInit_h" = x""yes; then
athena_h_path=X11/Xaw
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a non-3d Athena header set." >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Could not find a non-3d Athena header set." >&5
$as_echo "$as_me: WARNING: Could not find a non-3d Athena header set." >&2;}
fi
@@ -16685,19 +27116,201 @@
else
as_ac_Header=`$as_echo "ac_cv_header_X11/$athena_variant/XawInit.h" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "X11/$athena_variant/XawInit.h" "$as_ac_Header" "
+{ $as_echo "$as_me:$LINENO: checking for X11/$athena_variant/XawInit.h" >&5
+$as_echo_n "checking for X11/$athena_variant/XawInit.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
#if HAVE_X11_XFUNCPROTO_H
#include <X11/Xfuncproto.h>
#endif
#include <X11/Intrinsic.h>
-"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+
+#include <X11/$athena_variant/XawInit.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
as_ac_Header=`$as_echo "ac_cv_header_X11/$athena_variant/ThreeD.h" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "X11/$athena_variant/ThreeD.h" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for X11/$athena_variant/ThreeD.h" >&5
+$as_echo_n "checking for X11/$athena_variant/ThreeD.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking X11/$athena_variant/ThreeD.h usability" >&5
+$as_echo_n "checking X11/$athena_variant/ThreeD.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <X11/$athena_variant/ThreeD.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking X11/$athena_variant/ThreeD.h presence" >&5
+$as_echo_n "checking X11/$athena_variant/ThreeD.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <X11/$athena_variant/ThreeD.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/$athena_variant/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/$athena_variant/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/$athena_variant/ThreeD.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/$athena_variant/ThreeD.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/$athena_variant/ThreeD.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/$athena_variant/ThreeD.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/$athena_variant/ThreeD.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/$athena_variant/ThreeD.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/$athena_variant/ThreeD.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/$athena_variant/ThreeD.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/$athena_variant/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/$athena_variant/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/$athena_variant/ThreeD.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/$athena_variant/ThreeD.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/$athena_variant/ThreeD.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/$athena_variant/ThreeD.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for X11/$athena_variant/ThreeD.h" >&5
+$as_echo_n "checking for X11/$athena_variant/ThreeD.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
athena_h_path=X11/$athena_variant
fi
@@ -16708,19 +27321,201 @@
if test -z "$athena_h_path"; then
as_ac_Header=`$as_echo "ac_cv_header_$athena_variant/XawInit.h" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$athena_variant/XawInit.h" "$as_ac_Header" "
+{ $as_echo "$as_me:$LINENO: checking for $athena_variant/XawInit.h" >&5
+$as_echo_n "checking for $athena_variant/XawInit.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
#if HAVE_X11_XFUNCPROTO_H
#include <X11/Xfuncproto.h>
#endif
#include <X11/Intrinsic.h>
-"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+
+#include <$athena_variant/XawInit.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
as_ac_Header=`$as_echo "ac_cv_header_$athena_variant/ThreeD.h" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$athena_variant/ThreeD.h" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $athena_variant/ThreeD.h" >&5
+$as_echo_n "checking for $athena_variant/ThreeD.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $athena_variant/ThreeD.h usability" >&5
+$as_echo_n "checking $athena_variant/ThreeD.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$athena_variant/ThreeD.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $athena_variant/ThreeD.h presence" >&5
+$as_echo_n "checking $athena_variant/ThreeD.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$athena_variant/ThreeD.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $athena_variant/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $athena_variant/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $athena_variant/ThreeD.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $athena_variant/ThreeD.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $athena_variant/ThreeD.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $athena_variant/ThreeD.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $athena_variant/ThreeD.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $athena_variant/ThreeD.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $athena_variant/ThreeD.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $athena_variant/ThreeD.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $athena_variant/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $athena_variant/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $athena_variant/ThreeD.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $athena_variant/ThreeD.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $athena_variant/ThreeD.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $athena_variant/ThreeD.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $athena_variant/ThreeD.h" >&5
+$as_echo_n "checking for $athena_variant/ThreeD.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
athena_h_path=$athena_variant
fi
@@ -16731,18 +27526,192 @@
fi
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
- ac_fn_c_check_header_compile "$LINENO" "X11/Xaw3d/XawInit.h" "ac_cv_header_X11_Xaw3d_XawInit_h" "
+ { $as_echo "$as_me:$LINENO: checking for X11/Xaw3d/XawInit.h" >&5
+$as_echo_n "checking for X11/Xaw3d/XawInit.h... " >&6; }
+if test "${ac_cv_header_X11_Xaw3d_XawInit_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
#if HAVE_X11_XFUNCPROTO_H
#include <X11/Xfuncproto.h>
#endif
#include <X11/Intrinsic.h>
-"
-if test "x$ac_cv_header_X11_Xaw3d_XawInit_h" = x""yes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw3d/ThreeD.h" "ac_cv_header_X11_Xaw3d_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xaw3d_ThreeD_h" = x""yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that X11/Xaw3d headers are suitable for $athena_variant." >&5
+
+#include <X11/Xaw3d/XawInit.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_X11_Xaw3d_XawInit_h=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_X11_Xaw3d_XawInit_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_XawInit_h" >&5
+$as_echo "$ac_cv_header_X11_Xaw3d_XawInit_h" >&6; }
+if test "x$ac_cv_header_X11_Xaw3d_XawInit_h" = x""yes; then
+ if test "${ac_cv_header_X11_Xaw3d_ThreeD_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for X11/Xaw3d/ThreeD.h" >&5
+$as_echo_n "checking for X11/Xaw3d/ThreeD.h... " >&6; }
+if test "${ac_cv_header_X11_Xaw3d_ThreeD_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_ThreeD_h" >&5
+$as_echo "$ac_cv_header_X11_Xaw3d_ThreeD_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking X11/Xaw3d/ThreeD.h usability" >&5
+$as_echo_n "checking X11/Xaw3d/ThreeD.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <X11/Xaw3d/ThreeD.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking X11/Xaw3d/ThreeD.h presence" >&5
+$as_echo_n "checking X11/Xaw3d/ThreeD.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <X11/Xaw3d/ThreeD.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw3d/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/Xaw3d/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw3d/ThreeD.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/Xaw3d/ThreeD.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw3d/ThreeD.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/Xaw3d/ThreeD.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw3d/ThreeD.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/Xaw3d/ThreeD.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw3d/ThreeD.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/Xaw3d/ThreeD.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw3d/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/Xaw3d/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw3d/ThreeD.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/Xaw3d/ThreeD.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw3d/ThreeD.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/Xaw3d/ThreeD.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for X11/Xaw3d/ThreeD.h" >&5
+$as_echo_n "checking for X11/Xaw3d/ThreeD.h... " >&6; }
+if test "${ac_cv_header_X11_Xaw3d_ThreeD_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_X11_Xaw3d_ThreeD_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_ThreeD_h" >&5
+$as_echo "$ac_cv_header_X11_Xaw3d_ThreeD_h" >&6; }
+
+fi
+if test "x$ac_cv_header_X11_Xaw3d_ThreeD_h" = x""yes; then
+
+ { $as_echo "$as_me:$LINENO: WARNING: Assuming that X11/Xaw3d headers are suitable for $athena_variant." >&5
$as_echo "$as_me: WARNING: Assuming that X11/Xaw3d headers are suitable for $athena_variant." >&2;}
athena_h_path=X11/Xaw3d
@@ -16755,18 +27724,192 @@
fi
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
- ac_fn_c_check_header_compile "$LINENO" "Xaw3d/XawInit.h" "ac_cv_header_Xaw3d_XawInit_h" "
+ { $as_echo "$as_me:$LINENO: checking for Xaw3d/XawInit.h" >&5
+$as_echo_n "checking for Xaw3d/XawInit.h... " >&6; }
+if test "${ac_cv_header_Xaw3d_XawInit_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
#if HAVE_X11_XFUNCPROTO_H
#include <X11/Xfuncproto.h>
#endif
#include <X11/Intrinsic.h>
-"
-if test "x$ac_cv_header_Xaw3d_XawInit_h" = x""yes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "Xaw3d/ThreeD.h" "ac_cv_header_Xaw3d_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_Xaw3d_ThreeD_h" = x""yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that Xaw3d headers are suitable for $athena_variant." >&5
+
+#include <Xaw3d/XawInit.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_Xaw3d_XawInit_h=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_Xaw3d_XawInit_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Xaw3d_XawInit_h" >&5
+$as_echo "$ac_cv_header_Xaw3d_XawInit_h" >&6; }
+if test "x$ac_cv_header_Xaw3d_XawInit_h" = x""yes; then
+ if test "${ac_cv_header_Xaw3d_ThreeD_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for Xaw3d/ThreeD.h" >&5
+$as_echo_n "checking for Xaw3d/ThreeD.h... " >&6; }
+if test "${ac_cv_header_Xaw3d_ThreeD_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Xaw3d_ThreeD_h" >&5
+$as_echo "$ac_cv_header_Xaw3d_ThreeD_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking Xaw3d/ThreeD.h usability" >&5
+$as_echo_n "checking Xaw3d/ThreeD.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <Xaw3d/ThreeD.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking Xaw3d/ThreeD.h presence" >&5
+$as_echo_n "checking Xaw3d/ThreeD.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <Xaw3d/ThreeD.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: Xaw3d/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: Xaw3d/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xaw3d/ThreeD.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: Xaw3d/ThreeD.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: Xaw3d/ThreeD.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: Xaw3d/ThreeD.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xaw3d/ThreeD.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: Xaw3d/ThreeD.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xaw3d/ThreeD.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: Xaw3d/ThreeD.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xaw3d/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: Xaw3d/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xaw3d/ThreeD.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: Xaw3d/ThreeD.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xaw3d/ThreeD.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: Xaw3d/ThreeD.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for Xaw3d/ThreeD.h" >&5
+$as_echo_n "checking for Xaw3d/ThreeD.h... " >&6; }
+if test "${ac_cv_header_Xaw3d_ThreeD_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_Xaw3d_ThreeD_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Xaw3d_ThreeD_h" >&5
+$as_echo "$ac_cv_header_Xaw3d_ThreeD_h" >&6; }
+
+fi
+if test "x$ac_cv_header_Xaw3d_ThreeD_h" = x""yes; then
+
+ { $as_echo "$as_me:$LINENO: WARNING: Assuming that Xaw3d headers are suitable for $athena_variant." >&5
$as_echo "$as_me: WARNING: Assuming that Xaw3d headers are suitable for $athena_variant." >&2;}
athena_h_path=Xaw3d
@@ -16779,15 +27922,146 @@
fi
if test -z "$athena_h_path"; then
- ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw/ThreeD.h" "ac_cv_header_X11_Xaw_ThreeD_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = x""yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Assuming that X11/Xaw headers are suitable for $athena_variant." >&5
+ if test "${ac_cv_header_X11_Xaw_ThreeD_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for X11/Xaw/ThreeD.h" >&5
+$as_echo_n "checking for X11/Xaw/ThreeD.h... " >&6; }
+if test "${ac_cv_header_X11_Xaw_ThreeD_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw_ThreeD_h" >&5
+$as_echo "$ac_cv_header_X11_Xaw_ThreeD_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking X11/Xaw/ThreeD.h usability" >&5
+$as_echo_n "checking X11/Xaw/ThreeD.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <X11/Xaw/ThreeD.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking X11/Xaw/ThreeD.h presence" >&5
+$as_echo_n "checking X11/Xaw/ThreeD.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <X11/Xaw/ThreeD.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: X11/Xaw/ThreeD.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/Xaw/ThreeD.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for X11/Xaw/ThreeD.h" >&5
+$as_echo_n "checking for X11/Xaw/ThreeD.h... " >&6; }
+if test "${ac_cv_header_X11_Xaw_ThreeD_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_X11_Xaw_ThreeD_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw_ThreeD_h" >&5
+$as_echo "$ac_cv_header_X11_Xaw_ThreeD_h" >&6; }
+
+fi
+if test "x$ac_cv_header_X11_Xaw_ThreeD_h" = x""yes; then
+
+ { $as_echo "$as_me:$LINENO: WARNING: Assuming that X11/Xaw headers are suitable for $athena_variant." >&5
$as_echo "$as_me: WARNING: Assuming that X11/Xaw headers are suitable for $athena_variant." >&2;}
athena_h_path=X11/Xaw
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a suitable 3d Athena header set." >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Could not find a suitable 3d Athena header set." >&5
$as_echo "$as_me: WARNING: Could not find a suitable 3d Athena header set." >&2;}
fi
@@ -16805,16 +28079,151 @@
have_xaw=no
fi
if test "$with_x11" = "yes"; then
- ac_fn_c_check_header_mongrel "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default"
-if test "x$ac_cv_header_Xm_Xm_h" = x""yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmStringCreate in -lXm" >&5
+ if test "${ac_cv_header_Xm_Xm_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for Xm/Xm.h" >&5
+$as_echo_n "checking for Xm/Xm.h... " >&6; }
+if test "${ac_cv_header_Xm_Xm_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Xm_Xm_h" >&5
+$as_echo "$ac_cv_header_Xm_Xm_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking Xm/Xm.h usability" >&5
+$as_echo_n "checking Xm/Xm.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <Xm/Xm.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking Xm/Xm.h presence" >&5
+$as_echo_n "checking Xm/Xm.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <Xm/Xm.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: Xm/Xm.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: Xm/Xm.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for Xm/Xm.h" >&5
+$as_echo_n "checking for Xm/Xm.h... " >&6; }
+if test "${ac_cv_header_Xm_Xm_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_Xm_Xm_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Xm_Xm_h" >&5
+$as_echo "$ac_cv_header_Xm_Xm_h" >&6; }
+
+fi
+if test "x$ac_cv_header_Xm_Xm_h" = x""yes; then
+ { $as_echo "$as_me:$LINENO: checking for XmStringCreate in -lXm" >&5
$as_echo_n "checking for XmStringCreate in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmStringCreate+set}" = set; then :
+if test "${ac_cv_lib_Xm_XmStringCreate+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -16832,18 +28241,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xm_XmStringCreate=yes
else
- ac_cv_lib_Xm_XmStringCreate=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmStringCreate" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xm_XmStringCreate=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xm_XmStringCreate" >&5
$as_echo "$ac_cv_lib_Xm_XmStringCreate" >&6; }
-if test "x$ac_cv_lib_Xm_XmStringCreate" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmStringCreate" = x""yes; then
have_motif=yes
else
have_motif=no
@@ -16856,9 +28290,13 @@
if test "$have_motif" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Lesstif" >&5
+ { $as_echo "$as_me:$LINENO: checking for Lesstif" >&5
$as_echo_n "checking for Lesstif... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <Xm/Xm.h>
#ifdef LESSTIF_VERSION
@@ -16867,14 +28305,14 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
+ $EGREP "yes" >/dev/null 2>&1; then
have_lesstif=yes
else
have_lesstif=no
fi
rm -f conftest*
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_lesstif" >&5
+ { $as_echo "$as_me:$LINENO: result: $have_lesstif" >&5
$as_echo "$have_lesstif" >&6; }
fi
@@ -16996,23 +28434,33 @@
_ACEOF
- $as_echo "#define LWLIB_USES_ATHENA 1" >>confdefs.h
-
- $as_echo "#define NEED_ATHENA 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define LWLIB_USES_ATHENA 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define NEED_ATHENA 1
+_ACEOF
need_athena="yes"
if test "$athena_3d" = "yes"; then
- $as_echo "#define HAVE_ATHENA_3D 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_ATHENA_3D 1
+_ACEOF
fi
;;
esac
case "$all_widgets" in *motif* )
- $as_echo "#define LWLIB_USES_MOTIF 1" >>confdefs.h
-
- $as_echo "#define NEED_MOTIF 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define LWLIB_USES_MOTIF 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define NEED_MOTIF 1
+_ACEOF
lwlib_objs="$lwlib_objs lwlib-Xm.o" && if test "$verbose" = "yes"; then echo " Appending \"lwlib-Xm.o\" to \$lwlib_objs"; fi
need_motif=yes ;;
@@ -17027,61 +28475,103 @@
lwlib_objs="$lwlib_objs xlwradio.o xlwcheckbox.o xlwgauge.o" && if test "$verbose" = "yes"; then echo " Appending \"xlwradio.o xlwcheckbox.o xlwgauge.o\" to \$lwlib_objs"; fi;;
esac
case "$all_widgets" in *lucid* )
- $as_echo "#define NEED_LUCID 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define NEED_LUCID 1
+_ACEOF
lwlib_objs="$lwlib_objs lwlib-Xlw.o" && if test "$verbose" = "yes"; then echo " Appending \"lwlib-Xlw.o\" to \$lwlib_objs"; fi ;;
esac
-test "$enable_scrollbars" = "athena" && $as_echo "#define LWLIB_SCROLLBARS_ATHENA 1" >>confdefs.h
-
-test "$enable_dialogs" = "athena" && $as_echo "#define LWLIB_DIALOGS_ATHENA 1" >>confdefs.h
+test "$enable_scrollbars" = "athena" && cat >>confdefs.h <<\_ACEOF
+#define LWLIB_SCROLLBARS_ATHENA 1
+_ACEOF
+
+test "$enable_dialogs" = "athena" && cat >>confdefs.h <<\_ACEOF
+#define LWLIB_DIALOGS_ATHENA 1
+_ACEOF
if test "$athena_3d" = "yes"; then
- test "$enable_scrollbars" = "athena" && $as_echo "#define LWLIB_SCROLLBARS_ATHENA3D 1" >>confdefs.h
-
- test "$enable_dialogs" = "athena" && $as_echo "#define LWLIB_DIALOGS_ATHENA3D 1" >>confdefs.h
-
-fi
-
-case "$enable_widgets" in athena* ) $as_echo "#define LWLIB_WIDGETS_ATHENA 1" >>confdefs.h
+ test "$enable_scrollbars" = "athena" && cat >>confdefs.h <<\_ACEOF
+#define LWLIB_SCROLLBARS_ATHENA3D 1
+_ACEOF
+
+ test "$enable_dialogs" = "athena" && cat >>confdefs.h <<\_ACEOF
+#define LWLIB_DIALOGS_ATHENA3D 1
+_ACEOF
+
+fi
+
+case "$enable_widgets" in athena* ) cat >>confdefs.h <<\_ACEOF
+#define LWLIB_WIDGETS_ATHENA 1
+_ACEOF
;; esac
test "$enable_widgets" != "no" && test "$enable_widgets" != "msw" && \
- $as_echo "#define LWLIB_TABS_LUCID 1" >>confdefs.h
-
-
-test "$enable_menubars" != "no" && $as_echo "#define HAVE_MENUBARS 1" >>confdefs.h
-
-test "$enable_scrollbars" != "no" && $as_echo "#define HAVE_SCROLLBARS 1" >>confdefs.h
-
-test "$enable_dialogs" != "no" && $as_echo "#define HAVE_DIALOGS 1" >>confdefs.h
-
-test "$enable_toolbars" != "no" && $as_echo "#define HAVE_TOOLBARS 1" >>confdefs.h
-
-test "$enable_widgets" != "no" && $as_echo "#define HAVE_WIDGETS 1" >>confdefs.h
-
-
-test "$enable_menubars" = "lucid" && $as_echo "#define LWLIB_MENUBARS_LUCID 1" >>confdefs.h
-
-test "$enable_scrollbars" = "lucid" && $as_echo "#define LWLIB_SCROLLBARS_LUCID 1" >>confdefs.h
-
-
-test "$enable_menubars" = "motif" && $as_echo "#define LWLIB_MENUBARS_MOTIF 1" >>confdefs.h
-
-test "$enable_scrollbars" = "motif" && $as_echo "#define LWLIB_SCROLLBARS_MOTIF 1" >>confdefs.h
-
-test "$enable_dialogs" = "motif" && $as_echo "#define LWLIB_DIALOGS_MOTIF 1" >>confdefs.h
-
-test "$enable_widgets" = "motif" && $as_echo "#define LWLIB_WIDGETS_MOTIF 1" >>confdefs.h
-
-
-test "$with_xft_menubars" = "yes" && $as_echo "#define USE_XFT_MENUBARS 1" >>confdefs.h
-
-test "$with_xft_tabs" = "yes" && $as_echo "#define USE_XFT_TABS 1" >>confdefs.h
-
-test "$with_xft_gauges" = "yes" && $as_echo "#define USE_XFT_GAUGES 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define LWLIB_TABS_LUCID 1
+_ACEOF
+
+
+test "$enable_menubars" != "no" && cat >>confdefs.h <<\_ACEOF
+#define HAVE_MENUBARS 1
+_ACEOF
+
+test "$enable_scrollbars" != "no" && cat >>confdefs.h <<\_ACEOF
+#define HAVE_SCROLLBARS 1
+_ACEOF
+
+test "$enable_dialogs" != "no" && cat >>confdefs.h <<\_ACEOF
+#define HAVE_DIALOGS 1
+_ACEOF
+
+test "$enable_toolbars" != "no" && cat >>confdefs.h <<\_ACEOF
+#define HAVE_TOOLBARS 1
+_ACEOF
+
+test "$enable_widgets" != "no" && cat >>confdefs.h <<\_ACEOF
+#define HAVE_WIDGETS 1
+_ACEOF
+
+
+test "$enable_menubars" = "lucid" && cat >>confdefs.h <<\_ACEOF
+#define LWLIB_MENUBARS_LUCID 1
+_ACEOF
+
+test "$enable_scrollbars" = "lucid" && cat >>confdefs.h <<\_ACEOF
+#define LWLIB_SCROLLBARS_LUCID 1
+_ACEOF
+
+
+test "$enable_menubars" = "motif" && cat >>confdefs.h <<\_ACEOF
+#define LWLIB_MENUBARS_MOTIF 1
+_ACEOF
+
+test "$enable_scrollbars" = "motif" && cat >>confdefs.h <<\_ACEOF
+#define LWLIB_SCROLLBARS_MOTIF 1
+_ACEOF
+
+test "$enable_dialogs" = "motif" && cat >>confdefs.h <<\_ACEOF
+#define LWLIB_DIALOGS_MOTIF 1
+_ACEOF
+
+test "$enable_widgets" = "motif" && cat >>confdefs.h <<\_ACEOF
+#define LWLIB_WIDGETS_MOTIF 1
+_ACEOF
+
+
+test "$with_xft_menubars" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define USE_XFT_MENUBARS 1
+_ACEOF
+
+test "$with_xft_tabs" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define USE_XFT_TABS 1
+_ACEOF
+
+test "$with_xft_gauges" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define USE_XFT_GAUGES 1
+_ACEOF
@@ -17089,7 +28579,9 @@
if test "$enable_default_eol_detection" = "yes"; then
- $as_echo "#define HAVE_DEFAULT_EOL_DETECTION 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_DEFAULT_EOL_DETECTION 1
+_ACEOF
fi
@@ -17097,31 +28589,177 @@
wnn_libs=
if test "$enable_mule" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mule-related features" >&5
+ { $as_echo "$as_me:$LINENO: checking for Mule-related features" >&5
$as_echo_n "checking for Mule-related features... " >&6; }
- $as_echo "#define MULE 1" >>confdefs.h
-
-
- for ac_header in libintl.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBINTL_H 1
-_ACEOF
-
-fi
-
-done
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lintl" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define MULE 1
+_ACEOF
+
+
+
+for ac_header in libintl.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+{ $as_echo "$as_me:$LINENO: checking for strerror in -lintl" >&5
$as_echo_n "checking for strerror in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_strerror+set}" = set; then :
+if test "${ac_cv_lib_intl_strerror+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17139,18 +28777,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_intl_strerror=yes
else
- ac_cv_lib_intl_strerror=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strerror" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_intl_strerror=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strerror" >&5
$as_echo "$ac_cv_lib_intl_strerror" >&6; }
-if test "x$ac_cv_lib_intl_strerror" = x""yes; then :
+if test "x$ac_cv_lib_intl_strerror" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINTL 1
_ACEOF
@@ -17160,19 +28823,23 @@
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mule input methods" >&5
+ { $as_echo "$as_me:$LINENO: checking for Mule input methods" >&5
$as_echo_n "checking for Mule input methods... " >&6; }
case "$with_xim" in "" | "yes" )
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XIM" >&5
+ { $as_echo "$as_me:$LINENO: checking for XIM" >&5
$as_echo_n "checking for XIM... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenIM in -lX11" >&5
+ { $as_echo "$as_me:$LINENO: checking for XOpenIM in -lX11" >&5
$as_echo_n "checking for XOpenIM in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XOpenIM+set}" = set; then :
+if test "${ac_cv_lib_X11_XOpenIM+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17190,32 +28857,61 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_X11_XOpenIM=yes
else
- ac_cv_lib_X11_XOpenIM=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenIM" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_X11_XOpenIM=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenIM" >&5
$as_echo "$ac_cv_lib_X11_XOpenIM" >&6; }
-if test "x$ac_cv_lib_X11_XOpenIM" = x""yes; then :
+if test "x$ac_cv_lib_X11_XOpenIM" = x""yes; then
with_xim=xlib
else
with_xim=no
fi
if test "$need_motif $have_lesstif" = "yes no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmImMbLookupString in -lXm" >&5
+ { $as_echo "$as_me:$LINENO: checking for XmImMbLookupString in -lXm" >&5
$as_echo_n "checking for XmImMbLookupString in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmImMbLookupString+set}" = set; then :
+if test "${ac_cv_lib_Xm_XmImMbLookupString+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17233,30 +28929,59 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xm_XmImMbLookupString=yes
else
- ac_cv_lib_Xm_XmImMbLookupString=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmImMbLookupString" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xm_XmImMbLookupString=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xm_XmImMbLookupString" >&5
$as_echo "$ac_cv_lib_Xm_XmImMbLookupString" >&6; }
-if test "x$ac_cv_lib_Xm_XmImMbLookupString" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmImMbLookupString" = x""yes; then
with_xim=motif
fi
elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmImMbLookupString in -lXm" >&5
+ { $as_echo "$as_me:$LINENO: checking for XmImMbLookupString in -lXm" >&5
$as_echo_n "checking for XmImMbLookupString in -lXm... " >&6; }
-if test "${ac_cv_lib_Xm_XmImMbLookupString+set}" = set; then :
+if test "${ac_cv_lib_Xm_XmImMbLookupString+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17274,35 +28999,66 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Xm_XmImMbLookupString=yes
else
- ac_cv_lib_Xm_XmImMbLookupString=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xm_XmImMbLookupString" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Xm_XmImMbLookupString=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xm_XmImMbLookupString" >&5
$as_echo "$ac_cv_lib_Xm_XmImMbLookupString" >&6; }
-if test "x$ac_cv_lib_Xm_XmImMbLookupString" = x""yes; then :
+if test "x$ac_cv_lib_Xm_XmImMbLookupString" = x""yes; then
with_xim=motif
fi
fi ;;
esac
if test "$with_xim" != "no"; then
- $as_echo "#define HAVE_XIM 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_XIM 1
+_ACEOF
if test "$with_xim" = "xlib"; then
- $as_echo "#define XIM_XLIB 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define XIM_XLIB 1
+_ACEOF
extra_objs="$extra_objs input-method-xlib.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"input-method-xlib.o\""
fi
fi
if test "$with_xim" = "motif"; then
- $as_echo "#define XIM_MOTIF 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define XIM_MOTIF 1
+_ACEOF
need_motif=yes
extra_objs="$extra_objs input-method-motif.o" && if test "$verbose" = "yes"; then
@@ -17315,16 +29071,20 @@
fi
if test "$with_xfs" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFontSet" >&5
+ { $as_echo "$as_me:$LINENO: checking for XFontSet" >&5
$as_echo_n "checking for XFontSet... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmbDrawString in -lX11" >&5
+ { $as_echo "$as_me:$LINENO: checking for XmbDrawString in -lX11" >&5
$as_echo_n "checking for XmbDrawString in -lX11... " >&6; }
-if test "${ac_cv_lib_X11_XmbDrawString+set}" = set; then :
+if test "${ac_cv_lib_X11_XmbDrawString+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17342,25 +29102,52 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_X11_XmbDrawString=yes
else
- ac_cv_lib_X11_XmbDrawString=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XmbDrawString" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_X11_XmbDrawString=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XmbDrawString" >&5
$as_echo "$ac_cv_lib_X11_XmbDrawString" >&6; }
-if test "x$ac_cv_lib_X11_XmbDrawString" = x""yes; then :
+if test "x$ac_cv_lib_X11_XmbDrawString" = x""yes; then
:
else
with_xfs=no
fi
if test "$with_xfs" = "yes" && test "$enable_menubars" = "lucid"; then
- $as_echo "#define USE_XFONTSET 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define USE_XFONTSET 1
+_ACEOF
if test "$with_xim" = "no" ; then
extra_objs="$extra_objs input-method-xlib.o" && if test "$verbose" = "yes"; then
@@ -17370,42 +29157,399 @@
fi
fi
test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
- test -z "$with_wnn" && { ac_fn_c_check_header_mongrel "$LINENO" "wnn/jllib.h" "ac_cv_header_wnn_jllib_h" "$ac_includes_default"
-if test "x$ac_cv_header_wnn_jllib_h" = x""yes; then :
-
+ test -z "$with_wnn" && { if test "${ac_cv_header_wnn_jllib_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for wnn/jllib.h" >&5
+$as_echo_n "checking for wnn/jllib.h... " >&6; }
+if test "${ac_cv_header_wnn_jllib_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_wnn_jllib_h" >&5
+$as_echo "$ac_cv_header_wnn_jllib_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking wnn/jllib.h usability" >&5
+$as_echo_n "checking wnn/jllib.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <wnn/jllib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking wnn/jllib.h presence" >&5
+$as_echo_n "checking wnn/jllib.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <wnn/jllib.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/jllib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: wnn/jllib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/jllib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: wnn/jllib.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/jllib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: wnn/jllib.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/jllib.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: wnn/jllib.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/jllib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: wnn/jllib.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/jllib.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: wnn/jllib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/jllib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: wnn/jllib.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/jllib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: wnn/jllib.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for wnn/jllib.h" >&5
+$as_echo_n "checking for wnn/jllib.h... " >&6; }
+if test "${ac_cv_header_wnn_jllib_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_wnn_jllib_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_wnn_jllib_h" >&5
+$as_echo "$ac_cv_header_wnn_jllib_h" >&6; }
+
+fi
+if test "x$ac_cv_header_wnn_jllib_h" = x""yes; then
+ :
else
with_wnn=no
fi
}
- test -z "$with_wnn" && { ac_fn_c_check_header_mongrel "$LINENO" "wnn/commonhd.h" "ac_cv_header_wnn_commonhd_h" "$ac_includes_default"
-if test "x$ac_cv_header_wnn_commonhd_h" = x""yes; then :
-
+ test -z "$with_wnn" && { if test "${ac_cv_header_wnn_commonhd_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for wnn/commonhd.h" >&5
+$as_echo_n "checking for wnn/commonhd.h... " >&6; }
+if test "${ac_cv_header_wnn_commonhd_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_wnn_commonhd_h" >&5
+$as_echo "$ac_cv_header_wnn_commonhd_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking wnn/commonhd.h usability" >&5
+$as_echo_n "checking wnn/commonhd.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <wnn/commonhd.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking wnn/commonhd.h presence" >&5
+$as_echo_n "checking wnn/commonhd.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <wnn/commonhd.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/commonhd.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: wnn/commonhd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/commonhd.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: wnn/commonhd.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/commonhd.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: wnn/commonhd.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/commonhd.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: wnn/commonhd.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/commonhd.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: wnn/commonhd.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/commonhd.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: wnn/commonhd.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/commonhd.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: wnn/commonhd.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: wnn/commonhd.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: wnn/commonhd.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for wnn/commonhd.h" >&5
+$as_echo_n "checking for wnn/commonhd.h... " >&6; }
+if test "${ac_cv_header_wnn_commonhd_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_wnn_commonhd_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_wnn_commonhd_h" >&5
+$as_echo "$ac_cv_header_wnn_commonhd_h" >&6; }
+
+fi
+if test "x$ac_cv_header_wnn_commonhd_h" = x""yes; then
+ :
else
with_wnn=no
fi
}
if test "$with_wnn" != "no"; then
- for ac_func in crypt
-do :
- ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
-if test "x$ac_cv_func_crypt" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_CRYPT 1
-_ACEOF
-
-fi
-done
-
- test "$ac_cv_func_crypt" != "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+
+for ac_func in crypt
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ test "$ac_cv_func_crypt" != "yes" && {
+{ $as_echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then :
+if test "${ac_cv_lib_crypt_crypt+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcrypt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17423,18 +29567,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_crypt_crypt=yes
else
- ac_cv_lib_crypt_crypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_crypt_crypt=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = x""yes; then :
+if test "x$ac_cv_lib_crypt_crypt" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
_ACEOF
@@ -17445,14 +29614,18 @@
}
fi
if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn" >&5
+ { $as_echo "$as_me:$LINENO: checking for jl_dic_list_e in -lwnn" >&5
$as_echo_n "checking for jl_dic_list_e in -lwnn... " >&6; }
-if test "${ac_cv_lib_wnn_jl_dic_list_e+set}" = set; then :
+if test "${ac_cv_lib_wnn_jl_dic_list_e+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lwnn $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17470,28 +29643,57 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_wnn_jl_dic_list_e=yes
else
- ac_cv_lib_wnn_jl_dic_list_e=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn_jl_dic_list_e" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_wnn_jl_dic_list_e=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_wnn_jl_dic_list_e" >&5
$as_echo "$ac_cv_lib_wnn_jl_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn_jl_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn_jl_dic_list_e" = x""yes; then
libwnn=wnn
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn4" >&5
+ { $as_echo "$as_me:$LINENO: checking for jl_dic_list_e in -lwnn4" >&5
$as_echo_n "checking for jl_dic_list_e in -lwnn4... " >&6; }
-if test "${ac_cv_lib_wnn4_jl_dic_list_e+set}" = set; then :
+if test "${ac_cv_lib_wnn4_jl_dic_list_e+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lwnn4 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17509,28 +29711,57 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_wnn4_jl_dic_list_e=yes
else
- ac_cv_lib_wnn4_jl_dic_list_e=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn4_jl_dic_list_e" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_wnn4_jl_dic_list_e=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_wnn4_jl_dic_list_e" >&5
$as_echo "$ac_cv_lib_wnn4_jl_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn4_jl_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn4_jl_dic_list_e" = x""yes; then
libwnn=wnn4
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_dic_list_e in -lwnn6" >&5
+ { $as_echo "$as_me:$LINENO: checking for jl_dic_list_e in -lwnn6" >&5
$as_echo_n "checking for jl_dic_list_e in -lwnn6... " >&6; }
-if test "${ac_cv_lib_wnn6_jl_dic_list_e+set}" = set; then :
+if test "${ac_cv_lib_wnn6_jl_dic_list_e+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lwnn6 $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17548,28 +29779,57 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_wnn6_jl_dic_list_e=yes
else
- ac_cv_lib_wnn6_jl_dic_list_e=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn6_jl_dic_list_e" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_wnn6_jl_dic_list_e=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_wnn6_jl_dic_list_e" >&5
$as_echo "$ac_cv_lib_wnn6_jl_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn6_jl_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn6_jl_dic_list_e" = x""yes; then
libwnn=wnn6
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dic_list_e in -lwnn6_fromsrc" >&5
+ { $as_echo "$as_me:$LINENO: checking for dic_list_e in -lwnn6_fromsrc" >&5
$as_echo_n "checking for dic_list_e in -lwnn6_fromsrc... " >&6; }
-if test "${ac_cv_lib_wnn6_fromsrc_dic_list_e+set}" = set; then :
+if test "${ac_cv_lib_wnn6_fromsrc_dic_list_e+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lwnn6_fromsrc $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17587,18 +29847,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_wnn6_fromsrc_dic_list_e=yes
else
- ac_cv_lib_wnn6_fromsrc_dic_list_e=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wnn6_fromsrc_dic_list_e" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_wnn6_fromsrc_dic_list_e=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_wnn6_fromsrc_dic_list_e" >&5
$as_echo "$ac_cv_lib_wnn6_fromsrc_dic_list_e" >&6; }
-if test "x$ac_cv_lib_wnn6_fromsrc_dic_list_e" = x""yes; then :
+if test "x$ac_cv_lib_wnn6_fromsrc_dic_list_e" = x""yes; then
libwnn=wnn6_fromsrc
else
with_wnn=no
@@ -17613,19 +29898,25 @@
fi
test -z "$with_wnn" && with_wnn=yes
if test "$with_wnn" = "yes"; then
- $as_echo "#define HAVE_WNN 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_WNN 1
+_ACEOF
libs_x="-l$libwnn $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-l$libwnn\" to \$libs_x"; fi
if test "$with_wnn6" != "no"; then
as_ac_Lib=`$as_echo "ac_cv_lib_$libwnn''_jl_fi_dic_list" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_fi_dic_list in -l$libwnn" >&5
+{ $as_echo "$as_me:$LINENO: checking for jl_fi_dic_list in -l$libwnn" >&5
$as_echo_n "checking for jl_fi_dic_list in -l$libwnn... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$libwnn $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17643,24 +29934,53 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
eval "$as_ac_Lib=yes"
else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
- if test "x$as_val" = x""yes; then :
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
with_wnn6=yes
fi
- test "$with_wnn6" = "yes" && $as_echo "#define WNN6 1" >>confdefs.h
+ test "$with_wnn6" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define WNN6 1
+_ACEOF
fi
fi
@@ -17676,10 +29996,272 @@
$as_unset ac_cv_header_canna_RK_h
# using $ac_header_compiler is a hack, but autoconf doesn't let us
# get at this information otherwise :-(
- ac_fn_c_check_header_mongrel "$LINENO" "canna/jrkanji.h" "ac_cv_header_canna_jrkanji_h" "$ac_includes_default"
-if test "x$ac_cv_header_canna_jrkanji_h" = x""yes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "canna/RK.h" "ac_cv_header_canna_RK_h" "$ac_includes_default"
-if test "x$ac_cv_header_canna_RK_h" = x""yes; then :
+ if test "${ac_cv_header_canna_jrkanji_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for canna/jrkanji.h" >&5
+$as_echo_n "checking for canna/jrkanji.h... " >&6; }
+if test "${ac_cv_header_canna_jrkanji_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_canna_jrkanji_h" >&5
+$as_echo "$ac_cv_header_canna_jrkanji_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking canna/jrkanji.h usability" >&5
+$as_echo_n "checking canna/jrkanji.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <canna/jrkanji.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking canna/jrkanji.h presence" >&5
+$as_echo_n "checking canna/jrkanji.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <canna/jrkanji.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: canna/jrkanji.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: canna/jrkanji.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: canna/jrkanji.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: canna/jrkanji.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: canna/jrkanji.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: canna/jrkanji.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: canna/jrkanji.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/jrkanji.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: canna/jrkanji.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for canna/jrkanji.h" >&5
+$as_echo_n "checking for canna/jrkanji.h... " >&6; }
+if test "${ac_cv_header_canna_jrkanji_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_canna_jrkanji_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_canna_jrkanji_h" >&5
+$as_echo "$ac_cv_header_canna_jrkanji_h" >&6; }
+
+fi
+if test "x$ac_cv_header_canna_jrkanji_h" = x""yes; then
+ if test "${ac_cv_header_canna_RK_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for canna/RK.h" >&5
+$as_echo_n "checking for canna/RK.h... " >&6; }
+if test "${ac_cv_header_canna_RK_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_canna_RK_h" >&5
+$as_echo "$ac_cv_header_canna_RK_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking canna/RK.h usability" >&5
+$as_echo_n "checking canna/RK.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <canna/RK.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking canna/RK.h presence" >&5
+$as_echo_n "checking canna/RK.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <canna/RK.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: canna/RK.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: canna/RK.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/RK.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: canna/RK.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: canna/RK.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: canna/RK.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/RK.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: canna/RK.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/RK.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: canna/RK.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/RK.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: canna/RK.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/RK.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: canna/RK.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: canna/RK.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: canna/RK.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for canna/RK.h" >&5
+$as_echo_n "checking for canna/RK.h... " >&6; }
+if test "${ac_cv_header_canna_RK_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_canna_RK_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_canna_RK_h" >&5
+$as_echo "$ac_cv_header_canna_RK_h" >&6; }
+
+fi
+if test "x$ac_cv_header_canna_RK_h" = x""yes; then
have_canna=$ac_header_compiler
fi
@@ -17688,7 +30270,7 @@
test "$have_canna" = "yes" && break
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You may ignore any *Present but not compiled* message
+ { $as_echo "$as_me:$LINENO: WARNING: You may ignore any *Present but not compiled* message
from autoconf. We detect that condition and recheck, but there
is no way to suppress autoconf's message." >&5
$as_echo "$as_me: WARNING: You may ignore any *Present but not compiled* message
@@ -17704,14 +30286,18 @@
fi
fi
- test "$have_canna" = "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RkBgnBun in -lRKC" >&5
+ test "$have_canna" = "yes" && { { $as_echo "$as_me:$LINENO: checking for RkBgnBun in -lRKC" >&5
$as_echo_n "checking for RkBgnBun in -lRKC... " >&6; }
-if test "${ac_cv_lib_RKC_RkBgnBun+set}" = set; then :
+if test "${ac_cv_lib_RKC_RkBgnBun+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lRKC $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17729,31 +30315,60 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_RKC_RkBgnBun=yes
else
- ac_cv_lib_RKC_RkBgnBun=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_RKC_RkBgnBun" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_RKC_RkBgnBun=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_RKC_RkBgnBun" >&5
$as_echo "$ac_cv_lib_RKC_RkBgnBun" >&6; }
-if test "x$ac_cv_lib_RKC_RkBgnBun" = x""yes; then :
+if test "x$ac_cv_lib_RKC_RkBgnBun" = x""yes; then
:
else
have_canna=no
fi
}
- test "$have_canna" = "yes" && { { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jrKanjiControl in -lcanna" >&5
+ test "$have_canna" = "yes" && { { $as_echo "$as_me:$LINENO: checking for jrKanjiControl in -lcanna" >&5
$as_echo_n "checking for jrKanjiControl in -lcanna... " >&6; }
-if test "${ac_cv_lib_canna_jrKanjiControl+set}" = set; then :
+if test "${ac_cv_lib_canna_jrKanjiControl+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcanna $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17771,27 +30386,56 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_canna_jrKanjiControl=yes
else
- ac_cv_lib_canna_jrKanjiControl=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_canna_jrKanjiControl" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_canna_jrKanjiControl=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_canna_jrKanjiControl" >&5
$as_echo "$ac_cv_lib_canna_jrKanjiControl" >&6; }
-if test "x$ac_cv_lib_canna_jrKanjiControl" = x""yes; then :
+if test "x$ac_cv_lib_canna_jrKanjiControl" = x""yes; then
:
else
have_canna=no
fi
}
if test "$have_canna" = "yes"; then
- $as_echo "#define HAVE_CANNA 1" >>confdefs.h
-
- test -n "$canna_wchar_aware" && $as_echo "#define CANNA_NEW_WCHAR_AWARE 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_CANNA 1
+_ACEOF
+
+ test -n "$canna_wchar_aware" && cat >>confdefs.h <<\_ACEOF
+#define CANNA_NEW_WCHAR_AWARE 1
+_ACEOF
MAKE_SUBDIR="$MAKE_SUBDIR modules/canna" && if test "$verbose" = "yes"; then echo " Appending \"modules/canna\" to \$MAKE_SUBDIR"; fi
need_modules_common=yes
@@ -17800,7 +30444,7 @@
fi
canna_libs="-lcanna -lRKC $canna_libs" && if test "$verbose" = "yes"; then echo " Prepending \"-lcanna -lRKC\" to \$canna_libs"; fi
elif test "$with_canna" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Canna configuration failed. If you expected success,
+ { $as_echo "$as_me:$LINENO: WARNING: Canna configuration failed. If you expected success,
maybe you need --with-site-prefixes=/usr/local/canna?" >&5
$as_echo "$as_me: WARNING: Canna configuration failed. If you expected success,
maybe you need --with-site-prefixes=/usr/local/canna?" >&2;}
@@ -17809,7 +30453,7 @@
else for feature in xim canna wnn; do
if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-${feature} ignored: Not valid without Mule support" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: --with-${feature} ignored: Not valid without Mule support" >&5
$as_echo "$as_me: WARNING: --with-${feature} ignored: Not valid without Mule support" >&2;}
fi
eval "with_${feature}=no"
@@ -17818,14 +30462,18 @@
if test "$need_motif" = "yes" ; then
libs_x="-lXm $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for layout_object_getvalue in -li18n" >&5
+ { $as_echo "$as_me:$LINENO: checking for layout_object_getvalue in -li18n" >&5
$as_echo_n "checking for layout_object_getvalue in -li18n... " >&6; }
-if test "${ac_cv_lib_i18n_layout_object_getvalue+set}" = set; then :
+if test "${ac_cv_lib_i18n_layout_object_getvalue+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-li18n $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -17843,18 +30491,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_i18n_layout_object_getvalue=yes
else
- ac_cv_lib_i18n_layout_object_getvalue=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_i18n_layout_object_getvalue" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_i18n_layout_object_getvalue=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_i18n_layout_object_getvalue" >&5
$as_echo "$ac_cv_lib_i18n_layout_object_getvalue" >&6; }
-if test "x$ac_cv_lib_i18n_layout_object_getvalue" = x""yes; then :
+if test "x$ac_cv_lib_i18n_layout_object_getvalue" = x""yes; then
libs_x="-li18n $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-li18n\" to \$libs_x"; fi
fi
@@ -17922,12 +30595,151 @@
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
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -17939,7 +30751,7 @@
if test "$ac_cv_func_getaddrinfo" != "no" ; then
case "$opsys" in
hpux11 )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Use of getaddrinfo is disabled for HP-UX 11.XX." >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Use of getaddrinfo is disabled for HP-UX 11.XX." >&5
$as_echo "$as_me: WARNING: Use of getaddrinfo is disabled for HP-UX 11.XX." >&2;}
ac_cv_func_getaddrinfo=no
;;
@@ -17947,32 +30759,398 @@
fi
if test "$check_vdb_posix" = "yes" ; then
- ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect"
-if test "x$ac_cv_func_mprotect" = x""yes; then :
- $as_echo "#define HAVE_MPROTECT 1" >>confdefs.h
+ { $as_echo "$as_me:$LINENO: checking for mprotect" >&5
+$as_echo_n "checking for mprotect... " >&6; }
+if test "${ac_cv_func_mprotect+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define mprotect to an innocuous variant, in case <limits.h> declares mprotect.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define mprotect innocuous_mprotect
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char mprotect (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef mprotect
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char mprotect ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_mprotect || defined __stub___mprotect
+choke me
+#endif
+
+int
+main ()
+{
+return mprotect ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_mprotect=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_mprotect=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mprotect" >&5
+$as_echo "$ac_cv_func_mprotect" >&6; }
+if test "x$ac_cv_func_mprotect" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_MPROTECT 1
+_ACEOF
have_vdb_mprotect=yes
fi
- ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
-if test "x$ac_cv_func_sigaction" = x""yes; then :
- $as_echo "#define HAVE_SIGACTION 1" >>confdefs.h
+ { $as_echo "$as_me:$LINENO: checking for sigaction" >&5
+$as_echo_n "checking for sigaction... " >&6; }
+if test "${ac_cv_func_sigaction+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define sigaction to an innocuous variant, in case <limits.h> declares sigaction.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define sigaction innocuous_sigaction
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char sigaction (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef sigaction
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sigaction ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_sigaction || defined __stub___sigaction
+choke me
+#endif
+
+int
+main ()
+{
+return sigaction ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_sigaction=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_sigaction=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_sigaction" >&5
+$as_echo "$ac_cv_func_sigaction" >&6; }
+if test "x$ac_cv_func_sigaction" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SIGACTION 1
+_ACEOF
have_vdb_sigaction=yes
else
have_vdb_sigaction=no
fi
- ac_fn_c_check_member "$LINENO" "struct siginfo" "si_addr" "ac_cv_member_struct_siginfo_si_addr" "#include <signal.h>
-"
-if test "x$ac_cv_member_struct_siginfo_si_addr" = x""yes; then :
- $as_echo "#define HAVE_STRUCT_SIGINFO_SI_ADDR 1" >>confdefs.h
+ { $as_echo "$as_me:$LINENO: checking for struct siginfo.si_addr" >&5
+$as_echo_n "checking for struct siginfo.si_addr... " >&6; }
+if test "${ac_cv_member_struct_siginfo_si_addr+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <signal.h>
+
+int
+main ()
+{
+static struct siginfo ac_aggr;
+if (ac_aggr.si_addr)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_siginfo_si_addr=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <signal.h>
+
+int
+main ()
+{
+static struct siginfo ac_aggr;
+if (sizeof ac_aggr.si_addr)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_siginfo_si_addr=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_member_struct_siginfo_si_addr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_siginfo_si_addr" >&5
+$as_echo "$ac_cv_member_struct_siginfo_si_addr" >&6; }
+if test "x$ac_cv_member_struct_siginfo_si_addr" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRUCT_SIGINFO_SI_ADDR 1
+_ACEOF
have_si_addr=yes
fi
- ac_fn_c_check_member "$LINENO" "siginfo_t" "si_addr" "ac_cv_member_siginfo_t_si_addr" "#include <signal.h>
-"
-if test "x$ac_cv_member_siginfo_t_si_addr" = x""yes; then :
- $as_echo "#define HAVE_SIGINFO_T_SI_ADDR 1" >>confdefs.h
+ { $as_echo "$as_me:$LINENO: checking for siginfo_t.si_addr" >&5
+$as_echo_n "checking for siginfo_t.si_addr... " >&6; }
+if test "${ac_cv_member_siginfo_t_si_addr+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <signal.h>
+
+int
+main ()
+{
+static siginfo_t ac_aggr;
+if (ac_aggr.si_addr)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_siginfo_t_si_addr=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <signal.h>
+
+int
+main ()
+{
+static siginfo_t ac_aggr;
+if (sizeof ac_aggr.si_addr)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_siginfo_t_si_addr=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_member_siginfo_t_si_addr=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_siginfo_t_si_addr" >&5
+$as_echo "$ac_cv_member_siginfo_t_si_addr" >&6; }
+if test "x$ac_cv_member_siginfo_t_si_addr" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SIGINFO_T_SI_ADDR 1
+_ACEOF
have_si_addr=yes
fi
@@ -17980,16 +31158,199 @@
have_vdb_sigaction=no
fi
- ac_fn_c_check_func "$LINENO" "signal" "ac_cv_func_signal"
-if test "x$ac_cv_func_signal" = x""yes; then :
- $as_echo "#define HAVE_SIGNAL 1" >>confdefs.h
+ { $as_echo "$as_me:$LINENO: checking for signal" >&5
+$as_echo_n "checking for signal... " >&6; }
+if test "${ac_cv_func_signal+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define signal to an innocuous variant, in case <limits.h> declares signal.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define signal innocuous_signal
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char signal (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef signal
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char signal ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_signal || defined __stub___signal
+choke me
+#endif
+
+int
+main ()
+{
+return signal ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_signal=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_signal=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_signal" >&5
+$as_echo "$ac_cv_func_signal" >&6; }
+if test "x$ac_cv_func_signal" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SIGNAL 1
+_ACEOF
have_vdb_signal=yes
fi
- ac_fn_c_check_member "$LINENO" "struct sigcontext" "cr2" "ac_cv_member_struct_sigcontext_cr2" "#include <signal.h>
-"
-if test "x$ac_cv_member_struct_sigcontext_cr2" = x""yes; then :
- $as_echo "#define HAVE_STRUCT_SIGCONTEXT_CR2 1" >>confdefs.h
+ { $as_echo "$as_me:$LINENO: checking for struct sigcontext.cr2" >&5
+$as_echo_n "checking for struct sigcontext.cr2... " >&6; }
+if test "${ac_cv_member_struct_sigcontext_cr2+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <signal.h>
+
+int
+main ()
+{
+static struct sigcontext ac_aggr;
+if (ac_aggr.cr2)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_sigcontext_cr2=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <signal.h>
+
+int
+main ()
+{
+static struct sigcontext ac_aggr;
+if (sizeof ac_aggr.cr2)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_sigcontext_cr2=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_member_struct_sigcontext_cr2=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigcontext_cr2" >&5
+$as_echo "$ac_cv_member_struct_sigcontext_cr2" >&6; }
+if test "x$ac_cv_member_struct_sigcontext_cr2" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRUCT_SIGCONTEXT_CR2 1
+_ACEOF
have_cr2=yes
fi
@@ -18015,12 +31376,106 @@
fi
+
+
+
+
+
+
+
for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -18029,19 +31484,107 @@
done
-ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty"
-if test "x$ac_cv_func_openpty" = x""yes; then :
+{ $as_echo "$as_me:$LINENO: checking for openpty" >&5
+$as_echo_n "checking for openpty... " >&6; }
+if test "${ac_cv_func_openpty+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define openpty to an innocuous variant, in case <limits.h> declares openpty.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define openpty innocuous_openpty
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char openpty (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef openpty
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char openpty ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_openpty || defined __stub___openpty
+choke me
+#endif
+
+int
+main ()
+{
+return openpty ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_openpty=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_openpty=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_openpty" >&5
+$as_echo "$ac_cv_func_openpty" >&6; }
+if test "x$ac_cv_func_openpty" = x""yes; then
have_openpty=yes
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
+ { $as_echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
$as_echo_n "checking for openpty in -lutil... " >&6; }
-if test "${ac_cv_lib_util_openpty+set}" = set; then :
+if test "${ac_cv_lib_util_openpty+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lutil $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -18059,32 +31602,197 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_util_openpty=yes
else
- ac_cv_lib_util_openpty=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_util_openpty=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_util_openpty" >&5
$as_echo "$ac_cv_lib_util_openpty" >&6; }
-if test "x$ac_cv_lib_util_openpty" = x""yes; then :
+if test "x$ac_cv_lib_util_openpty" = x""yes; then
have_openpty=yes need_libutil=yes
fi
fi
if test "$have_openpty" = "yes"; then
- $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
-
- for ac_header in libutil.h util.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_OPENPTY 1
+_ACEOF
+
+
+
+for ac_header in libutil.h util.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -18097,36 +31805,453 @@
fi
case "$opsys" in
- hpux*) for ac_header in sys/ptyio.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/ptyio.h" "ac_cv_header_sys_ptyio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ptyio_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_PTYIO_H 1
+ hpux*)
+for ac_header in sys/ptyio.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
;;
- *) for ac_header in pty.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "pty.h" "ac_cv_header_pty_h" "$ac_includes_default"
-if test "x$ac_cv_header_pty_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_PTY_H 1
-_ACEOF
-
-fi
-
-done
-
- test "$ac_cv_header_pty_h" = "no" && for ac_header in sys/pty.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/pty.h" "ac_cv_header_sys_pty_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_pty_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_PTY_H 1
+ *)
+for ac_header in pty.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+ test "$ac_cv_header_pty_h" = "no" &&
+for ac_header in sys/pty.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -18136,12 +32261,151 @@
;;
esac
+
for ac_header in stropts.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default"
-if test "x$ac_cv_header_stropts_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_STROPTS_H 1
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -18149,23 +32413,252 @@
done
if test "$ac_cv_header_stropts_h" = "yes"; then
- for ac_func in isastream
-do :
- ac_fn_c_check_func "$LINENO" "isastream" "ac_cv_func_isastream"
-if test "x$ac_cv_func_isastream" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_ISASTREAM 1
-_ACEOF
-
-fi
-done
-
- for ac_header in strtio.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "strtio.h" "ac_cv_header_strtio_h" "$ac_includes_default"
-if test "x$ac_cv_header_strtio_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_STRTIO_H 1
+
+for ac_func in isastream
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+for ac_header in strtio.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -18173,12 +32666,102 @@
done
fi
+
for ac_func in getloadavg
-do :
- ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
-if test "x$ac_cv_func_getloadavg" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_GETLOADAVG 1
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
@@ -18186,12 +32769,151 @@
if test "$ac_cv_func_getloadavg" = "yes"; then
- for ac_header in sys/loadavg.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_loadavg_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_LOADAVG_H 1
+
+for ac_header in sys/loadavg.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -18203,14 +32925,19 @@
echo " xemacs will be linked with \"getloadavg.o\""
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5
+
+{ $as_echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5
$as_echo_n "checking for kstat_open in -lkstat... " >&6; }
-if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then :
+if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lkstat $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -18228,18 +32955,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_kstat_kstat_open=yes
else
- ac_cv_lib_kstat_kstat_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_kstat_kstat_open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5
$as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
-if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then :
+if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKSTAT 1
_ACEOF
@@ -18248,27 +33000,171 @@
fi
- for ac_header in kstat.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "kstat.h" "ac_cv_header_kstat_h" "$ac_includes_default"
-if test "x$ac_cv_header_kstat_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_KSTAT_H 1
-_ACEOF
-
-fi
-
-done
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_read in -lkvm" >&5
+
+for ac_header in kstat.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for kvm_read in -lkvm" >&5
$as_echo_n "checking for kvm_read in -lkvm... " >&6; }
-if test "${ac_cv_lib_kvm_kvm_read+set}" = set; then :
+if test "${ac_cv_lib_kvm_kvm_read+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lkvm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -18286,18 +33182,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_kvm_kvm_read=yes
else
- ac_cv_lib_kvm_kvm_read=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_read" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_kvm_kvm_read=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_read" >&5
$as_echo "$ac_cv_lib_kvm_kvm_read" >&6; }
-if test "x$ac_cv_lib_kvm_kvm_read" = x""yes; then :
+if test "x$ac_cv_lib_kvm_kvm_read" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKVM 1
_ACEOF
@@ -18308,9 +33229,13 @@
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdb declares h_errno" >&5
+{ $as_echo "$as_me:$LINENO: checking whether netdb declares h_errno" >&5
$as_echo_n "checking whether netdb declares h_errno... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <netdb.h>
int
@@ -18321,21 +33246,52 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
- $as_echo "#define HAVE_H_ERRNO 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_H_ERRNO 1
+_ACEOF
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+{ $as_echo "$as_me:$LINENO: checking for sigsetjmp" >&5
$as_echo_n "checking for sigsetjmp... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <setjmp.h>
int
@@ -18346,28 +33302,55 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
- $as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SIGSETJMP 1
+_ACEOF
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:$LINENO: checking whether localtime caches TZ" >&5
$as_echo_n "checking whether localtime caches TZ... " >&6; }
-if test "${emacs_cv_localtime_cache+set}" = set; then :
+if test "${emacs_cv_localtime_cache+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test "$ac_cv_func_tzset" = "yes"; then
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes; then
# If we have tzset, assume the worst when cross-compiling.
emacs_cv_localtime_cache=yes
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <time.h>
#if STDC_HEADERS
@@ -18402,14 +33385,41 @@
exit (0);
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
emacs_cv_localtime_cache=no
else
- emacs_cv_localtime_cache=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+emacs_cv_localtime_cache=yes
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
else
# If we lack tzset, report that localtime does not cache TZ,
@@ -18417,17 +33427,23 @@
emacs_cv_localtime_cache=no
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_localtime_cache" >&5
+{ $as_echo "$as_me:$LINENO: result: $emacs_cv_localtime_cache" >&5
$as_echo "$emacs_cv_localtime_cache" >&6; }
if test $emacs_cv_localtime_cache = yes; then
- $as_echo "#define LOCALTIME_CACHE 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define LOCALTIME_CACHE 1
+_ACEOF
fi
if test "$HAVE_TIMEVAL" = "yes"; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday accepts one or two arguments" >&5
+{ $as_echo "$as_me:$LINENO: checking whether gettimeofday accepts one or two arguments" >&5
$as_echo_n "checking whether gettimeofday accepts one or two arguments... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
@@ -18452,28 +33468,59 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: two" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ { $as_echo "$as_me:$LINENO: result: two" >&5
$as_echo "two" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: one" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: one" >&5
$as_echo "one" >&6; }
- $as_echo "#define GETTIMEOFDAY_ONE_ARGUMENT 1" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define GETTIMEOFDAY_ONE_ARGUMENT 1
+_ACEOF
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for inline" >&5
$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
+if test "${ac_cv_c_inline+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
@@ -18482,17 +33529,41 @@
#endif
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_c_inline=$ac_kw
-fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
test "$ac_cv_c_inline" != no && break
done
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
$as_echo "$ac_cv_c_inline" >&6; }
+
case $ac_cv_c_inline in
inline | yes) ;;
*)
@@ -18512,28 +33583,78 @@
echo " xemacs will be linked with \"inline.o\""
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for typeof" >&5
+{ $as_echo "$as_me:$LINENO: checking for typeof" >&5
$as_echo_n "checking for typeof... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int i; __typeof__(i) j;
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
typeofname="__typeof__"
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int i; typeof(i) j;
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
typeofname="typeof"
else
- typeofname=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $typeofname" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ typeofname=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $typeofname" >&5
$as_echo "$typeofname" >&6; }
if test "$typeofname" != "no"; then
cat >>confdefs.h <<_ACEOF
@@ -18546,12 +33667,16 @@
if test "$__DECC" != "yes"; then
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
$as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_working_alloca_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <alloca.h>
int
@@ -18563,28 +33688,59 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_working_alloca_h=yes
else
- ac_cv_working_alloca_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_working_alloca_h=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
$as_echo "$ac_cv_working_alloca_h" >&6; }
if test $ac_cv_working_alloca_h = yes; then
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA_H 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
$as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_func_alloca_works+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef __GNUC__
# define alloca __builtin_alloca
@@ -18616,20 +33772,47 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_func_alloca_works=yes
else
- ac_cv_func_alloca_works=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_alloca_works=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
$as_echo "$ac_cv_func_alloca_works" >&6; }
if test $ac_cv_func_alloca_works = yes; then
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA 1
+_ACEOF
else
# The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -18639,15 +33822,21 @@
ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+cat >>confdefs.h <<\_ACEOF
+#define C_ALLOCA 1
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "${ac_cv_os_cray+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#if defined CRAY && ! defined CRAY2
webecray
@@ -18657,7 +33846,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "webecray" >/dev/null 2>&1; then :
+ $EGREP "webecray" >/dev/null 2>&1; then
ac_cv_os_cray=yes
else
ac_cv_os_cray=no
@@ -18665,14 +33854,101 @@
rm -f conftest*
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
$as_echo "$ac_cv_os_cray" >&6; }
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define CRAY_STACKSEG_END $ac_func
@@ -18684,15 +33960,19 @@
done
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
$as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
+if test "${ac_cv_c_stack_direction+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then
ac_cv_c_stack_direction=0
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
int
@@ -18715,18 +33995,46 @@
return find_stack_direction () < 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_c_stack_direction=1
else
- ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_stack_direction=-1
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
$as_echo "$ac_cv_c_stack_direction" >&6; }
+
cat >>confdefs.h <<_ACEOF
#define STACK_DIRECTION $ac_cv_c_stack_direction
_ACEOF
@@ -18739,15 +34047,22 @@
fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca in function calls" >&5
+{ $as_echo "$as_me:$LINENO: checking for working alloca in function calls" >&5
$as_echo_n "checking for working alloca in function calls... " >&6; }
-if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#if defined (__CYGWIN__)
@@ -18800,30 +34115,66 @@
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
working_alloca_in_function_calls=yes
else
- working_alloca_in_function_calls=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $working_alloca_in_function_calls" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+working_alloca_in_function_calls=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+{ $as_echo "$as_me:$LINENO: result: $working_alloca_in_function_calls" >&5
$as_echo "$working_alloca_in_function_calls" >&6; }
test "$working_alloca_in_function_calls" != "yes" && \
- $as_echo "#define BROKEN_ALLOCA_IN_FUNCTION_CALLS 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working scanf" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define BROKEN_ALLOCA_IN_FUNCTION_CALLS 1
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking for working scanf" >&5
$as_echo_n "checking for working scanf... " >&6; }
-if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
@@ -18838,30 +34189,63 @@
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
working_scanf=yes
else
- working_scanf=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $working_scanf" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+working_scanf=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+{ $as_echo "$as_me:$LINENO: result: $working_scanf" >&5
$as_echo "$working_scanf" >&6; }
test "$working_scanf" != "yes" && \
- $as_echo "#define CYGWIN_SCANF_BUG 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define CYGWIN_SCANF_BUG 1
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking for working strcoll" >&5
$as_echo_n "checking for working strcoll... " >&6; }
-if test "${ac_cv_func_strcoll_works+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
+if test "${ac_cv_func_strcoll_works+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then
ac_cv_func_strcoll_works=no
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
int
@@ -18874,43 +34258,166 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_func_strcoll_works=yes
else
- ac_cv_func_strcoll_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_func_strcoll_works=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
$as_echo "$ac_cv_func_strcoll_works" >&6; }
if test $ac_cv_func_strcoll_works = yes; then
-$as_echo "#define HAVE_STRCOLL 1" >>confdefs.h
-
-fi
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRCOLL 1
+_ACEOF
+
+fi
+
for ac_func in getpgrp
-do :
- ac_fn_c_check_func "$LINENO" "getpgrp" "ac_cv_func_getpgrp"
-if test "x$ac_cv_func_getpgrp" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_GETPGRP 1
-_ACEOF
-
-fi
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+{ $as_echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5
$as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
-if test "${ac_cv_func_getpgrp_void+set}" = set; then :
+if test "${ac_cv_func_getpgrp_void+set}" = set; then
$as_echo_n "(cached) " >&6
else
# Use it with a single arg.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
int
@@ -18921,33 +34428,62 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_func_getpgrp_void=no
else
- ac_cv_func_getpgrp_void=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getpgrp_void" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_getpgrp_void=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5
$as_echo "$ac_cv_func_getpgrp_void" >&6; }
if test $ac_cv_func_getpgrp_void = yes; then
-$as_echo "#define GETPGRP_VOID 1" >>confdefs.h
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+cat >>confdefs.h <<\_ACEOF
+#define GETPGRP_VOID 1
+_ACEOF
+
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5
$as_echo_n "checking for working mmap... " >&6; }
-case "$opsys" in ultrix* ) have_mmap=no ;; *)
-if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
#include <unistd.h>
@@ -18980,19 +34516,47 @@
return 1;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
have_mmap=yes
else
- have_mmap=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
- ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_mmap" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+have_mmap=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+{ $as_echo "$as_me:$LINENO: result: $have_mmap" >&5
$as_echo "$have_mmap" >&6; }
-test "$have_mmap" = "yes" && $as_echo "#define HAVE_MMAP 1" >>confdefs.h
+test "$have_mmap" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define HAVE_MMAP 1
+_ACEOF
case "$opsys" in cygwin*)
@@ -19001,9 +34565,13 @@
test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && with_rel_alloc=no
if test "$with_rel_alloc $have_mmap" = "default yes"; then
if test "$doug_lea_malloc" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for M_MMAP_THRESHOLD" >&5
+ { $as_echo "$as_me:$LINENO: checking for M_MMAP_THRESHOLD" >&5
$as_echo_n "checking for M_MMAP_THRESHOLD... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <malloc.h>
int
@@ -19019,54 +34587,699 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- with_rel_alloc=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ with_rel_alloc=no; { $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; };
else
- with_rel_alloc=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ with_rel_alloc=yes; { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; };
fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
with_rel_alloc=yes
fi
fi
-test "$with_rel_alloc" = "yes" && $as_echo "#define REL_ALLOC 1" >>confdefs.h
-
-
-ac_fn_c_check_header_mongrel "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default"
-if test "x$ac_cv_header_termios_h" = x""yes; then :
- $as_echo "#define HAVE_TERMIOS 1" >>confdefs.h
-
- $as_echo "#define SIGNALS_VIA_CHARACTERS 1" >>confdefs.h
-
- $as_echo "#define NO_TERMIO 1" >>confdefs.h
-
-else
- ac_fn_c_check_header_mongrel "$LINENO" "termio.h" "ac_cv_header_termio_h" "$ac_includes_default"
-if test "x$ac_cv_header_termio_h" = x""yes; then :
- $as_echo "#define HAVE_TERMIO 1" >>confdefs.h
-
-fi
-
-
-fi
-
-
-
-
-ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
-if test "x$ac_cv_func_socket" = x""yes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_in_h" = x""yes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
-if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
-
- $as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sun_len member in struct sockaddr_un" >&5
+test "$with_rel_alloc" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define REL_ALLOC 1
+_ACEOF
+
+
+if test "${ac_cv_header_termios_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for termios.h" >&5
+$as_echo_n "checking for termios.h... " >&6; }
+if test "${ac_cv_header_termios_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_termios_h" >&5
+$as_echo "$ac_cv_header_termios_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking termios.h usability" >&5
+$as_echo_n "checking termios.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <termios.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking termios.h presence" >&5
+$as_echo_n "checking termios.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <termios.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: termios.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: termios.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termios.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: termios.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: termios.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: termios.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termios.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: termios.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termios.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: termios.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termios.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: termios.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termios.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: termios.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termios.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: termios.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for termios.h" >&5
+$as_echo_n "checking for termios.h... " >&6; }
+if test "${ac_cv_header_termios_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_termios_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_termios_h" >&5
+$as_echo "$ac_cv_header_termios_h" >&6; }
+
+fi
+if test "x$ac_cv_header_termios_h" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_TERMIOS 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define SIGNALS_VIA_CHARACTERS 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define NO_TERMIO 1
+_ACEOF
+
+else
+ if test "${ac_cv_header_termio_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for termio.h" >&5
+$as_echo_n "checking for termio.h... " >&6; }
+if test "${ac_cv_header_termio_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_termio_h" >&5
+$as_echo "$ac_cv_header_termio_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking termio.h usability" >&5
+$as_echo_n "checking termio.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <termio.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking termio.h presence" >&5
+$as_echo_n "checking termio.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <termio.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: termio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: termio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termio.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: termio.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: termio.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: termio.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termio.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: termio.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termio.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: termio.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termio.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: termio.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termio.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: termio.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: termio.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: termio.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for termio.h" >&5
+$as_echo_n "checking for termio.h... " >&6; }
+if test "${ac_cv_header_termio_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_termio_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_termio_h" >&5
+$as_echo "$ac_cv_header_termio_h" >&6; }
+
+fi
+if test "x$ac_cv_header_termio_h" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_TERMIO 1
+_ACEOF
+
+fi
+
+
+fi
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for socket" >&5
+$as_echo_n "checking for socket... " >&6; }
+if test "${ac_cv_func_socket+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define socket to an innocuous variant, in case <limits.h> declares socket.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define socket innocuous_socket
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char socket (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef socket
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_socket || defined __stub___socket
+choke me
+#endif
+
+int
+main ()
+{
+return socket ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_socket=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_socket=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
+$as_echo "$ac_cv_func_socket" >&6; }
+if test "x$ac_cv_func_socket" = x""yes; then
+ if test "${ac_cv_header_netinet_in_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for netinet/in.h" >&5
+$as_echo_n "checking for netinet/in.h... " >&6; }
+if test "${ac_cv_header_netinet_in_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5
+$as_echo "$ac_cv_header_netinet_in_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking netinet/in.h usability" >&5
+$as_echo_n "checking netinet/in.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <netinet/in.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking netinet/in.h presence" >&5
+$as_echo_n "checking netinet/in.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <netinet/in.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: netinet/in.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for netinet/in.h" >&5
+$as_echo_n "checking for netinet/in.h... " >&6; }
+if test "${ac_cv_header_netinet_in_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_netinet_in_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5
+$as_echo "$ac_cv_header_netinet_in_h" >&6; }
+
+fi
+if test "x$ac_cv_header_netinet_in_h" = x""yes; then
+ if test "${ac_cv_header_arpa_inet_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for arpa/inet.h" >&5
+$as_echo_n "checking for arpa/inet.h... " >&6; }
+if test "${ac_cv_header_arpa_inet_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5
+$as_echo "$ac_cv_header_arpa_inet_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking arpa/inet.h usability" >&5
+$as_echo_n "checking arpa/inet.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <arpa/inet.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking arpa/inet.h presence" >&5
+$as_echo_n "checking arpa/inet.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <arpa/inet.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: arpa/inet.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: arpa/inet.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: arpa/inet.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for arpa/inet.h" >&5
+$as_echo_n "checking for arpa/inet.h... " >&6; }
+if test "${ac_cv_header_arpa_inet_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_arpa_inet_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5
+$as_echo "$ac_cv_header_arpa_inet_h" >&6; }
+
+fi
+if test "x$ac_cv_header_arpa_inet_h" = x""yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SOCKETS 1
+_ACEOF
+
+ { $as_echo "$as_me:$LINENO: checking for sun_len member in struct sockaddr_un" >&5
$as_echo_n "checking for sun_len member in struct sockaddr_un... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
@@ -19081,19 +35294,50 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_SOCKADDR_SUN_LEN 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ip_mreq struct in netinet/in.h" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+#define HAVE_SOCKADDR_SUN_LEN 1
+_ACEOF
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ { $as_echo "$as_me:$LINENO: checking for ip_mreq struct in netinet/in.h" >&5
$as_echo_n "checking for ip_mreq struct in netinet/in.h... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
@@ -19107,79 +35351,984 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }; $as_echo "#define HAVE_MULTICAST 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-
-fi
-
-
-fi
-
-
-ac_fn_c_check_func "$LINENO" "msgget" "ac_cv_func_msgget"
-if test "x$ac_cv_func_msgget" = x""yes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ipc_h" = x""yes; then :
- ac_fn_c_check_header_mongrel "$LINENO" "sys/msg.h" "ac_cv_header_sys_msg_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_msg_h" = x""yes; then :
- $as_echo "#define HAVE_SYSVIPC 1" >>confdefs.h
-
-fi
-
-
-fi
-
-
-fi
-
-
-ac_fn_c_check_header_mongrel "$LINENO" "dirent.h" "ac_cv_header_dirent_h" "$ac_includes_default"
-if test "x$ac_cv_header_dirent_h" = x""yes; then :
- $as_echo "#define SYSV_SYSTEM_DIR 1" >>confdefs.h
-
-else
- ac_fn_c_check_header_mongrel "$LINENO" "sys/dir.h" "ac_cv_header_sys_dir_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_dir_h" = x""yes; then :
-
-else
- $as_echo "#define NONSYSTEM_DIR_LIBRARY 1" >>confdefs.h
-
-fi
-
-
-fi
-
-
-
-ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default"
-if test "x$ac_cv_header_nlist_h" = x""yes; then :
- $as_echo "#define NLIST_STRUCT 1" >>confdefs.h
-
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sound support" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }; cat >>confdefs.h <<\_ACEOF
+#define HAVE_MULTICAST 1
+_ACEOF
+
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+fi
+
+
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for msgget" >&5
+$as_echo_n "checking for msgget... " >&6; }
+if test "${ac_cv_func_msgget+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define msgget to an innocuous variant, in case <limits.h> declares msgget.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define msgget innocuous_msgget
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char msgget (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef msgget
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char msgget ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_msgget || defined __stub___msgget
+choke me
+#endif
+
+int
+main ()
+{
+return msgget ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_msgget=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_msgget=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_msgget" >&5
+$as_echo "$ac_cv_func_msgget" >&6; }
+if test "x$ac_cv_func_msgget" = x""yes; then
+ if test "${ac_cv_header_sys_ipc_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5
+$as_echo_n "checking for sys/ipc.h... " >&6; }
+if test "${ac_cv_header_sys_ipc_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5
+$as_echo "$ac_cv_header_sys_ipc_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5
+$as_echo_n "checking sys/ipc.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <sys/ipc.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5
+$as_echo_n "checking sys/ipc.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/ipc.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5
+$as_echo_n "checking for sys/ipc.h... " >&6; }
+if test "${ac_cv_header_sys_ipc_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_sys_ipc_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5
+$as_echo "$ac_cv_header_sys_ipc_h" >&6; }
+
+fi
+if test "x$ac_cv_header_sys_ipc_h" = x""yes; then
+ if test "${ac_cv_header_sys_msg_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for sys/msg.h" >&5
+$as_echo_n "checking for sys/msg.h... " >&6; }
+if test "${ac_cv_header_sys_msg_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_msg_h" >&5
+$as_echo "$ac_cv_header_sys_msg_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking sys/msg.h usability" >&5
+$as_echo_n "checking sys/msg.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <sys/msg.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking sys/msg.h presence" >&5
+$as_echo_n "checking sys/msg.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/msg.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: sys/msg.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: sys/msg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/msg.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: sys/msg.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: sys/msg.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: sys/msg.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/msg.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: sys/msg.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/msg.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: sys/msg.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/msg.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: sys/msg.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/msg.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: sys/msg.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/msg.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: sys/msg.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for sys/msg.h" >&5
+$as_echo_n "checking for sys/msg.h... " >&6; }
+if test "${ac_cv_header_sys_msg_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_sys_msg_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_msg_h" >&5
+$as_echo "$ac_cv_header_sys_msg_h" >&6; }
+
+fi
+if test "x$ac_cv_header_sys_msg_h" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SYSVIPC 1
+_ACEOF
+
+fi
+
+
+fi
+
+
+fi
+
+
+if test "${ac_cv_header_dirent_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for dirent.h" >&5
+$as_echo_n "checking for dirent.h... " >&6; }
+if test "${ac_cv_header_dirent_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dirent_h" >&5
+$as_echo "$ac_cv_header_dirent_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking dirent.h usability" >&5
+$as_echo_n "checking dirent.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <dirent.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking dirent.h presence" >&5
+$as_echo_n "checking dirent.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <dirent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: dirent.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: dirent.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dirent.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: dirent.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: dirent.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: dirent.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dirent.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: dirent.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dirent.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: dirent.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dirent.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: dirent.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dirent.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: dirent.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: dirent.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: dirent.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for dirent.h" >&5
+$as_echo_n "checking for dirent.h... " >&6; }
+if test "${ac_cv_header_dirent_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_dirent_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_dirent_h" >&5
+$as_echo "$ac_cv_header_dirent_h" >&6; }
+
+fi
+if test "x$ac_cv_header_dirent_h" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define SYSV_SYSTEM_DIR 1
+_ACEOF
+
+else
+ if test "${ac_cv_header_sys_dir_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for sys/dir.h" >&5
+$as_echo_n "checking for sys/dir.h... " >&6; }
+if test "${ac_cv_header_sys_dir_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_dir_h" >&5
+$as_echo "$ac_cv_header_sys_dir_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking sys/dir.h usability" >&5
+$as_echo_n "checking sys/dir.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <sys/dir.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking sys/dir.h presence" >&5
+$as_echo_n "checking sys/dir.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/dir.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: sys/dir.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: sys/dir.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/dir.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: sys/dir.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: sys/dir.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: sys/dir.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/dir.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: sys/dir.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/dir.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: sys/dir.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/dir.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: sys/dir.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/dir.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: sys/dir.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/dir.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: sys/dir.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for sys/dir.h" >&5
+$as_echo_n "checking for sys/dir.h... " >&6; }
+if test "${ac_cv_header_sys_dir_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_sys_dir_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_dir_h" >&5
+$as_echo "$ac_cv_header_sys_dir_h" >&6; }
+
+fi
+if test "x$ac_cv_header_sys_dir_h" = x""yes; then
+ :
+else
+ cat >>confdefs.h <<\_ACEOF
+#define NONSYSTEM_DIR_LIBRARY 1
+_ACEOF
+
+fi
+
+
+fi
+
+
+
+if test "${ac_cv_header_nlist_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for nlist.h" >&5
+$as_echo_n "checking for nlist.h... " >&6; }
+if test "${ac_cv_header_nlist_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_nlist_h" >&5
+$as_echo "$ac_cv_header_nlist_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking nlist.h usability" >&5
+$as_echo_n "checking nlist.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <nlist.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking nlist.h presence" >&5
+$as_echo_n "checking nlist.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <nlist.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: nlist.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: nlist.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: nlist.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: nlist.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: nlist.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: nlist.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: nlist.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: nlist.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: nlist.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: nlist.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: nlist.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: nlist.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: nlist.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: nlist.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: nlist.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: nlist.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for nlist.h" >&5
+$as_echo_n "checking for nlist.h... " >&6; }
+if test "${ac_cv_header_nlist_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_nlist_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_nlist_h" >&5
+$as_echo "$ac_cv_header_nlist_h" >&6; }
+
+fi
+if test "x$ac_cv_header_nlist_h" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define NLIST_STRUCT 1
+_ACEOF
+
+fi
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for sound support" >&5
$as_echo_n "checking for sound support... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+{ $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
test -n "$with_native_sound_lib" && enable_sound_native=yes
if test "$enable_sound_native" != "no"; then
if test -n "$with_native_sound_lib"; then
- ac_fn_c_check_header_mongrel "$LINENO" "multimedia/audio_device.h" "ac_cv_header_multimedia_audio_device_h" "$ac_includes_default"
-if test "x$ac_cv_header_multimedia_audio_device_h" = x""yes; then :
+ if test "${ac_cv_header_multimedia_audio_device_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for multimedia/audio_device.h" >&5
+$as_echo_n "checking for multimedia/audio_device.h... " >&6; }
+if test "${ac_cv_header_multimedia_audio_device_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_multimedia_audio_device_h" >&5
+$as_echo "$ac_cv_header_multimedia_audio_device_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking multimedia/audio_device.h usability" >&5
+$as_echo_n "checking multimedia/audio_device.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <multimedia/audio_device.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking multimedia/audio_device.h presence" >&5
+$as_echo_n "checking multimedia/audio_device.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <multimedia/audio_device.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: multimedia/audio_device.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: multimedia/audio_device.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: multimedia/audio_device.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: multimedia/audio_device.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: multimedia/audio_device.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: multimedia/audio_device.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: multimedia/audio_device.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: multimedia/audio_device.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: multimedia/audio_device.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: multimedia/audio_device.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: multimedia/audio_device.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: multimedia/audio_device.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: multimedia/audio_device.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: multimedia/audio_device.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: multimedia/audio_device.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: multimedia/audio_device.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for multimedia/audio_device.h" >&5
+$as_echo_n "checking for multimedia/audio_device.h... " >&6; }
+if test "${ac_cv_header_multimedia_audio_device_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_multimedia_audio_device_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_multimedia_audio_device_h" >&5
+$as_echo "$ac_cv_header_multimedia_audio_device_h" >&6; }
+
+fi
+if test "x$ac_cv_header_multimedia_audio_device_h" = x""yes; then
sound_found=yes sound_cflags=""
extra_objs="$extra_objs sunplay.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"sunplay.o\""
@@ -19218,14 +36367,18 @@
case "$ac_cv_build" in
*-sgi-* )
if test -z "$with_native_sound_lib"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALopenport in -laudio" >&5
+ { $as_echo "$as_me:$LINENO: checking for ALopenport in -laudio" >&5
$as_echo_n "checking for ALopenport in -laudio... " >&6; }
-if test "${ac_cv_lib_audio_ALopenport+set}" = set; then :
+if test "${ac_cv_lib_audio_ALopenport+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-laudio $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -19243,18 +36396,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_audio_ALopenport=yes
else
- ac_cv_lib_audio_ALopenport=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_ALopenport" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_audio_ALopenport=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_audio_ALopenport" >&5
$as_echo "$ac_cv_lib_audio_ALopenport" >&6; }
-if test "x$ac_cv_lib_audio_ALopenport" = x""yes; then :
+if test "x$ac_cv_lib_audio_ALopenport" = x""yes; then
with_native_sound_lib="-laudio"
fi
@@ -19267,14 +36445,18 @@
fi ;;
hppa*-hp-hpux* )
if test -z "$with_native_sound_lib"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AOpenAudio in -lAlib" >&5
+ { $as_echo "$as_me:$LINENO: checking for AOpenAudio in -lAlib" >&5
$as_echo_n "checking for AOpenAudio in -lAlib... " >&6; }
-if test "${ac_cv_lib_Alib_AOpenAudio+set}" = set; then :
+if test "${ac_cv_lib_Alib_AOpenAudio+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lAlib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -19292,18 +36474,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_Alib_AOpenAudio=yes
else
- ac_cv_lib_Alib_AOpenAudio=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Alib_AOpenAudio" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_Alib_AOpenAudio=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Alib_AOpenAudio" >&5
$as_echo "$ac_cv_lib_Alib_AOpenAudio" >&6; }
-if test "x$ac_cv_lib_Alib_AOpenAudio" = x""yes; then :
+if test "x$ac_cv_lib_Alib_AOpenAudio" = x""yes; then
with_native_sound_lib="-lAlib"
fi
@@ -19335,9 +36542,145 @@
if test -z "$sound_found"; then
for dir in "machine" "sys" "linux"; do
as_ac_Header=`$as_echo "ac_cv_header_${dir}/soundcard.h" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "${dir}/soundcard.h" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for ${dir}/soundcard.h" >&5
+$as_echo_n "checking for ${dir}/soundcard.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking ${dir}/soundcard.h usability" >&5
+$as_echo_n "checking ${dir}/soundcard.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <${dir}/soundcard.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking ${dir}/soundcard.h presence" >&5
+$as_echo_n "checking ${dir}/soundcard.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <${dir}/soundcard.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: ${dir}/soundcard.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}/soundcard.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: ${dir}/soundcard.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}/soundcard.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: ${dir}/soundcard.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}/soundcard.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: ${dir}/soundcard.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}/soundcard.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: ${dir}/soundcard.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}/soundcard.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: ${dir}/soundcard.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}/soundcard.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: ${dir}/soundcard.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ${dir}/soundcard.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: ${dir}/soundcard.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for ${dir}/soundcard.h" >&5
+$as_echo_n "checking for ${dir}/soundcard.h... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
sound_found=yes
case "${ac_cv_build}" in
@@ -19346,14 +36689,18 @@
# we should port to native NetBSD stuff
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5
+ { $as_echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
$as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; }
-if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then :
+if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lossaudio $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -19371,20 +36718,45 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_ossaudio__oss_ioctl=yes
else
- ac_cv_lib_ossaudio__oss_ioctl=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ossaudio__oss_ioctl=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
$as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
-if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then :
+if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then
with_native_sound_lib=-lossaudio
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Using NetBSD-deprecated -lossaudio" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: Using NetBSD-deprecated -lossaudio" >&5
$as_echo "$as_me: WARNING: Using NetBSD-deprecated -lossaudio" >&2;}
else
sound_found=no
@@ -19414,7 +36786,7 @@
enable_sound_native=yes
else
if test "$enable_sound_native" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No native libraries found. Disabling native sound support." >&5
+ { $as_echo "$as_me:$LINENO: WARNING: No native libraries found. Disabling native sound support." >&5
$as_echo "$as_me: WARNING: No native libraries found. Disabling native sound support." >&2;}
fi
enable_sound_native=no
@@ -19422,23 +36794,160 @@
fi
if test "$enable_sound_native" = "yes"; then
- $as_echo "#define HAVE_NATIVE_SOUND 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_NATIVE_SOUND 1
+_ACEOF
test -n "$with_native_sound_lib" && LIBS="$with_native_sound_lib $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$with_native_sound_lib\" to \$LIBS"; fi
fi
if test "$enable_sound_alsa" != "no"; then
- ac_fn_c_check_header_mongrel "$LINENO" "alsa/input.h" "ac_cv_header_alsa_input_h" "$ac_includes_default"
-if test "x$ac_cv_header_alsa_input_h" = x""yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
+ if test "${ac_cv_header_alsa_input_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for alsa/input.h" >&5
+$as_echo_n "checking for alsa/input.h... " >&6; }
+if test "${ac_cv_header_alsa_input_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_alsa_input_h" >&5
+$as_echo "$ac_cv_header_alsa_input_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking alsa/input.h usability" >&5
+$as_echo_n "checking alsa/input.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <alsa/input.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking alsa/input.h presence" >&5
+$as_echo_n "checking alsa/input.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <alsa/input.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: alsa/input.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: alsa/input.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: alsa/input.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: alsa/input.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: alsa/input.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: alsa/input.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: alsa/input.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: alsa/input.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: alsa/input.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: alsa/input.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: alsa/input.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: alsa/input.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: alsa/input.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: alsa/input.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: alsa/input.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: alsa/input.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for alsa/input.h" >&5
+$as_echo_n "checking for alsa/input.h... " >&6; }
+if test "${ac_cv_header_alsa_input_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_alsa_input_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_alsa_input_h" >&5
+$as_echo "$ac_cv_header_alsa_input_h" >&6; }
+
+fi
+if test "x$ac_cv_header_alsa_input_h" = x""yes; then
+
+ { $as_echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
-if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then :
+if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lasound $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -19456,18 +36965,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_asound_snd_pcm_open=yes
else
- ac_cv_lib_asound_snd_pcm_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_asound_snd_pcm_open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then :
+if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then
have_alsa_sound=yes
fi
@@ -19476,7 +37010,9 @@
if test "$have_alsa_sound" = "yes"; then
enable_sound_alsa=yes
- $as_echo "#define HAVE_ALSA_SOUND 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALSA_SOUND 1
+_ACEOF
extra_objs="$extra_objs alsaplay.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"alsaplay.o\""
@@ -19490,17 +37026,152 @@
fi
if test "$enable_sound_nas" != "no"; then
- ac_fn_c_check_header_mongrel "$LINENO" "audio/audiolib.h" "ac_cv_header_audio_audiolib_h" "$ac_includes_default"
-if test "x$ac_cv_header_audio_audiolib_h" = x""yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AuOpenServer in -laudio" >&5
+ if test "${ac_cv_header_audio_audiolib_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for audio/audiolib.h" >&5
+$as_echo_n "checking for audio/audiolib.h... " >&6; }
+if test "${ac_cv_header_audio_audiolib_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
+$as_echo "$ac_cv_header_audio_audiolib_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking audio/audiolib.h usability" >&5
+$as_echo_n "checking audio/audiolib.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <audio/audiolib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking audio/audiolib.h presence" >&5
+$as_echo_n "checking audio/audiolib.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <audio/audiolib.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: audio/audiolib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: audio/audiolib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: audio/audiolib.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: audio/audiolib.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: audio/audiolib.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: audio/audiolib.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: audio/audiolib.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: audio/audiolib.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: audio/audiolib.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: audio/audiolib.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: audio/audiolib.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: audio/audiolib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: audio/audiolib.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: audio/audiolib.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: audio/audiolib.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: audio/audiolib.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for audio/audiolib.h" >&5
+$as_echo_n "checking for audio/audiolib.h... " >&6; }
+if test "${ac_cv_header_audio_audiolib_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_audio_audiolib_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
+$as_echo "$ac_cv_header_audio_audiolib_h" >&6; }
+
+fi
+if test "x$ac_cv_header_audio_audiolib_h" = x""yes; then
+
+ { $as_echo "$as_me:$LINENO: checking for AuOpenServer in -laudio" >&5
$as_echo_n "checking for AuOpenServer in -laudio... " >&6; }
-if test "${ac_cv_lib_audio_AuOpenServer+set}" = set; then :
+if test "${ac_cv_lib_audio_AuOpenServer+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-laudio $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -19518,18 +37189,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_audio_AuOpenServer=yes
else
- ac_cv_lib_audio_AuOpenServer=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_AuOpenServer" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_audio_AuOpenServer=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_audio_AuOpenServer" >&5
$as_echo "$ac_cv_lib_audio_AuOpenServer" >&6; }
-if test "x$ac_cv_lib_audio_AuOpenServer" = x""yes; then :
+if test "x$ac_cv_lib_audio_AuOpenServer" = x""yes; then
have_nas_sound=yes
fi
@@ -19538,22 +37234,30 @@
if test "$have_nas_sound" = "yes"; then
enable_sound_nas=yes
- $as_echo "#define HAVE_NAS_SOUND 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_NAS_SOUND 1
+_ACEOF
extra_objs="$extra_objs nas.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"nas.o\""
fi
libs_x="-laudio $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <audio/Xtutil.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "AuXtErrorJump" >/dev/null 2>&1; then :
-
-else
- old_nas=yes; $as_echo "#define NAS_NO_ERROR_JUMP 1" >>confdefs.h
+ $EGREP "AuXtErrorJump" >/dev/null 2>&1; then
+ :
+else
+ old_nas=yes; cat >>confdefs.h <<\_ACEOF
+#define NAS_NO_ERROR_JUMP 1
+_ACEOF
fi
rm -f conftest*
@@ -19568,9 +37272,9 @@
if test "$enable_sound_esd" != "no"; then
# Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_have_esd_config+set}" = set; then :
+if test "${ac_cv_prog_have_esd_config+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$have_esd_config"; then
@@ -19581,14 +37285,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_have_esd_config="yes"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
- done
+done
IFS=$as_save_IFS
test -z "$ac_cv_prog_have_esd_config" && ac_cv_prog_have_esd_config="no"
@@ -19596,10 +37300,10 @@
fi
have_esd_config=$ac_cv_prog_have_esd_config
if test -n "$have_esd_config"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_esd_config" >&5
+ { $as_echo "$as_me:$LINENO: result: $have_esd_config" >&5
$as_echo "$have_esd_config" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -19608,8 +37312,92 @@
save_c_switch_site="$c_switch_site" save_LIBS="$LIBS"
c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
LIBS="`esd-config --libs` $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi
- ac_fn_c_check_func "$LINENO" "esd_play_stream" "ac_cv_func_esd_play_stream"
-if test "x$ac_cv_func_esd_play_stream" = x""yes; then :
+ { $as_echo "$as_me:$LINENO: checking for esd_play_stream" >&5
+$as_echo_n "checking for esd_play_stream... " >&6; }
+if test "${ac_cv_func_esd_play_stream+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define esd_play_stream to an innocuous variant, in case <limits.h> declares esd_play_stream.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define esd_play_stream innocuous_esd_play_stream
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char esd_play_stream (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef esd_play_stream
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char esd_play_stream ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_esd_play_stream || defined __stub___esd_play_stream
+choke me
+#endif
+
+int
+main ()
+{
+return esd_play_stream ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_esd_play_stream=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_esd_play_stream=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_esd_play_stream" >&5
+$as_echo "$ac_cv_func_esd_play_stream" >&6; }
+if test "x$ac_cv_func_esd_play_stream" = x""yes; then
have_esd_sound=yes
else
c_switch_site="$save_c_switch_site" LIBS="$save_LIBS"
@@ -19623,7 +37411,9 @@
extra_objs="$extra_objs esd.o" && if test "$verbose" = "yes"; then
echo " xemacs will be linked with \"esd.o\""
fi
- $as_echo "#define HAVE_ESD_SOUND 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_ESD_SOUND 1
+_ACEOF
else
test "$enable_sound_esd" = "yes" && \
@@ -19640,22 +37430,28 @@
test -z "$with_tty" && with_tty=yes
if test "$with_tty" = "yes" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TTY-related features" >&5
+ { $as_echo "$as_me:$LINENO: checking for TTY-related features" >&5
$as_echo_n "checking for TTY-related features... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ { $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
- $as_echo "#define HAVE_TTY 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_TTY 1
+_ACEOF
if test -z "$with_ncurses"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+ { $as_echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then :
+if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lncurses $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -19673,18 +37469,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_ncurses_tgetent=yes
else
- ac_cv_lib_ncurses_tgetent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_ncurses_tgetent=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then :
+if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then
with_ncurses=yes
else
with_ncurses=no
@@ -19692,16 +37513,280 @@
fi
if test "$with_ncurses" = "yes"; then
- $as_echo "#define HAVE_NCURSES 1" >>confdefs.h
-
- ac_fn_c_check_header_mongrel "$LINENO" "ncurses/curses.h" "ac_cv_header_ncurses_curses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_curses_h" = x""yes; then :
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_NCURSES 1
+_ACEOF
+
+ if test "${ac_cv_header_ncurses_curses_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for ncurses/curses.h" >&5
+$as_echo_n "checking for ncurses/curses.h... " >&6; }
+if test "${ac_cv_header_ncurses_curses_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_curses_h" >&5
+$as_echo "$ac_cv_header_ncurses_curses_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking ncurses/curses.h usability" >&5
+$as_echo_n "checking ncurses/curses.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <ncurses/curses.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking ncurses/curses.h presence" >&5
+$as_echo_n "checking ncurses/curses.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ncurses/curses.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for ncurses/curses.h" >&5
+$as_echo_n "checking for ncurses/curses.h... " >&6; }
+if test "${ac_cv_header_ncurses_curses_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_ncurses_curses_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_curses_h" >&5
+$as_echo "$ac_cv_header_ncurses_curses_h" >&6; }
+
+fi
+if test "x$ac_cv_header_ncurses_curses_h" = x""yes; then
curses_h_file=ncurses/curses.h
fi
- ac_fn_c_check_header_mongrel "$LINENO" "ncurses/term.h" "ac_cv_header_ncurses_term_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_term_h" = x""yes; then :
+ if test "${ac_cv_header_ncurses_term_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for ncurses/term.h" >&5
+$as_echo_n "checking for ncurses/term.h... " >&6; }
+if test "${ac_cv_header_ncurses_term_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_term_h" >&5
+$as_echo "$ac_cv_header_ncurses_term_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking ncurses/term.h usability" >&5
+$as_echo_n "checking ncurses/term.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <ncurses/term.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking ncurses/term.h presence" >&5
+$as_echo_n "checking ncurses/term.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ncurses/term.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/term.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: ncurses/term.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/term.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: ncurses/term.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/term.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: ncurses/term.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/term.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: ncurses/term.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/term.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: ncurses/term.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/term.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: ncurses/term.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/term.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: ncurses/term.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/term.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: ncurses/term.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for ncurses/term.h" >&5
+$as_echo_n "checking for ncurses/term.h... " >&6; }
+if test "${ac_cv_header_ncurses_term_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_ncurses_term_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_term_h" >&5
+$as_echo "$ac_cv_header_ncurses_term_h" >&6; }
+
+fi
+if test "x$ac_cv_header_ncurses_term_h" = x""yes; then
term_h_file=ncurses/term.h
fi
@@ -19714,14 +37799,145 @@
if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
save_c_switch_site="$c_switch_site"
c_switch_site="$c_switch_site -I/usr/include/ncurses"
- ac_fn_c_check_header_mongrel "$LINENO" "ncurses/curses.h" "ac_cv_header_ncurses_curses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_curses_h" = x""yes; then :
+ if test "${ac_cv_header_ncurses_curses_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for ncurses/curses.h" >&5
+$as_echo_n "checking for ncurses/curses.h... " >&6; }
+if test "${ac_cv_header_ncurses_curses_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_curses_h" >&5
+$as_echo "$ac_cv_header_ncurses_curses_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking ncurses/curses.h usability" >&5
+$as_echo_n "checking ncurses/curses.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <ncurses/curses.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking ncurses/curses.h presence" >&5
+$as_echo_n "checking ncurses/curses.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ncurses/curses.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: ncurses/curses.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: ncurses/curses.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for ncurses/curses.h" >&5
+$as_echo_n "checking for ncurses/curses.h... " >&6; }
+if test "${ac_cv_header_ncurses_curses_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_ncurses_curses_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ncurses_curses_h" >&5
+$as_echo "$ac_cv_header_ncurses_curses_h" >&6; }
+
+fi
+if test "x$ac_cv_header_ncurses_curses_h" = x""yes; then
curses_h_file=ncurses/curses.h
fi
if test "$ac_cv_header_ncurses_curses_h" = "yes"
- then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your system has the bogus ncurses include bug." >&5
+ then { $as_echo "$as_me:$LINENO: WARNING: Your system has the bogus ncurses include bug." >&5
$as_echo "$as_me: WARNING: Your system has the bogus ncurses include bug." >&2;}
else c_switch_site="$save_c_switch_site"
fi
@@ -19735,14 +37951,100 @@
else
for lib in curses termlib termcap; do
as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_tgetent" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l$lib" >&5
+{ $as_echo "$as_me:$LINENO: checking for tgetent in -l$lib" >&5
$as_echo_n "checking for tgetent in -l$lib... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$lib $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent ();
+int
+main ()
+{
+return tgetent ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_Lib=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ LIBS="-l${lib} $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-l${lib}\" to \$LIBS"; fi; break
+fi
+
+ done
+ fi
+ else extra_objs="$extra_objs tparam.o" && if test "$verbose" = "yes"; then
+ echo " xemacs will be linked with \"tparam.o\""
+ fi
+ case "$opsys" in *-hp-hpux* ) libs_termcap="-ltermcap" ;; esac
+ if test -n "$libs_termcap"; then
+ LIBS="$libs_termcap $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$libs_termcap\" to \$LIBS"; fi
+ else
+ { $as_echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5
+$as_echo_n "checking for tgetent in -lcurses... " >&6; }
+if test "${ac_cv_lib_curses_tgetent+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcurses $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -19760,40 +38062,57 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
- if test "x$as_val" = x""yes; then :
- LIBS="-l${lib} $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-l${lib}\" to \$LIBS"; fi; break
-fi
-
- done
- fi
- else extra_objs="$extra_objs tparam.o" && if test "$verbose" = "yes"; then
- echo " xemacs will be linked with \"tparam.o\""
- fi
- case "$opsys" in *-hp-hpux* ) libs_termcap="-ltermcap" ;; esac
- if test -n "$libs_termcap"; then
- LIBS="$libs_termcap $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$libs_termcap\" to \$LIBS"; fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
-$as_echo_n "checking for tgetent in -lcurses... " >&6; }
-if test "${ac_cv_lib_curses_tgetent+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurses $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_lib_curses_tgetent=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_curses_tgetent=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5
+$as_echo "$ac_cv_lib_curses_tgetent" >&6; }
+if test "x$ac_cv_lib_curses_tgetent" = x""yes; then
+ LIBS="-lcurses $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lcurses\" to \$LIBS"; fi
+else
+ { $as_echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
+if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltermcap $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -19811,57 +38130,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_curses_tgetent=yes
-else
- ac_cv_lib_curses_tgetent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5
-$as_echo "$ac_cv_lib_curses_tgetent" >&6; }
-if test "x$ac_cv_lib_curses_tgetent" = x""yes; then :
- LIBS="-lcurses $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lcurses\" to \$LIBS"; fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltermcap $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char tgetent ();
-int
-main ()
-{
-return tgetent ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_termcap_tgetent=yes
else
- ac_cv_lib_termcap_tgetent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_termcap_tgetent=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then :
+if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then
LIBS="-ltermcap $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-ltermcap\" to \$LIBS"; fi
else
extra_objs="$extra_objs termcap.o" && if test "$verbose" = "yes"; then
@@ -19884,17 +38189,152 @@
if test "$with_gpm" != "no"; then
- ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default"
-if test "x$ac_cv_header_gpm_h" = x""yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gpm_Open in -lgpm" >&5
+ if test "${ac_cv_header_gpm_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for gpm.h" >&5
+$as_echo_n "checking for gpm.h... " >&6; }
+if test "${ac_cv_header_gpm_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gpm_h" >&5
+$as_echo "$ac_cv_header_gpm_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking gpm.h usability" >&5
+$as_echo_n "checking gpm.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <gpm.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking gpm.h presence" >&5
+$as_echo_n "checking gpm.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <gpm.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: gpm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: gpm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gpm.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: gpm.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: gpm.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: gpm.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gpm.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: gpm.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gpm.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: gpm.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gpm.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: gpm.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gpm.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: gpm.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gpm.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: gpm.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for gpm.h" >&5
+$as_echo_n "checking for gpm.h... " >&6; }
+if test "${ac_cv_header_gpm_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_gpm_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gpm_h" >&5
+$as_echo "$ac_cv_header_gpm_h" >&6; }
+
+fi
+if test "x$ac_cv_header_gpm_h" = x""yes; then
+
+ { $as_echo "$as_me:$LINENO: checking for Gpm_Open in -lgpm" >&5
$as_echo_n "checking for Gpm_Open in -lgpm... " >&6; }
-if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then :
+if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -19912,18 +38352,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_gpm_Gpm_Open=yes
else
- ac_cv_lib_gpm_Gpm_Open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gpm_Gpm_Open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gpm_Gpm_Open" >&5
$as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; }
-if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then :
+if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then
have_gpm=yes
fi
@@ -19932,7 +38397,9 @@
if test "$have_gpm" = "yes"; then
with_gpm=yes
- $as_echo "#define HAVE_GPM 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GPM 1
+_ACEOF
LIBS="-lgpm $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lgpm\" to \$LIBS"; fi
elif test "$with_gpm" = "yes"; then
@@ -19944,7 +38411,7 @@
else for feature in ncurses gpm; do
if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-${feature} ignored: Not valid without TTY support" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: --with-${feature} ignored: Not valid without TTY support" >&5
$as_echo "$as_me: WARNING: --with-${feature} ignored: Not valid without TTY support" >&2;}
fi
eval "with_${feature}=no"
@@ -19952,19 +38419,157 @@
fi
test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \
- != "no no no" && { $as_echo "$as_me:${as_lineno-$LINENO}: checking for database support" >&5
+ != "no no no" && { $as_echo "$as_me:$LINENO: checking for database support" >&5
$as_echo_n "checking for database support... " >&6; } && \
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ { $as_echo "$as_me:$LINENO: result: " >&5
$as_echo "" >&6; }
if test "$enable_database_gdbm $enable_database_dbm" != "no no"; then
ndbm_h_file=""
- for ac_header in ndbm.h gdbm/ndbm.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
- if test "x$as_val" = x""yes; then :
+
+
+for ac_header in ndbm.h gdbm/ndbm.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -19982,14 +38587,18 @@
fi
if test "$enable_database_gdbm" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm" >&5
+ { $as_echo "$as_me:$LINENO: checking for dbm_open in -lgdbm" >&5
$as_echo_n "checking for dbm_open in -lgdbm... " >&6; }
-if test "${ac_cv_lib_gdbm_dbm_open+set}" = set; then :
+if test "${ac_cv_lib_gdbm_dbm_open+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgdbm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20007,30 +38616,59 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_gdbm_dbm_open=yes
else
- ac_cv_lib_gdbm_dbm_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_dbm_open" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gdbm_dbm_open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_dbm_open" >&5
$as_echo "$ac_cv_lib_gdbm_dbm_open" >&6; }
-if test "x$ac_cv_lib_gdbm_dbm_open" = x""yes; then :
+if test "x$ac_cv_lib_gdbm_dbm_open" = x""yes; then
enable_database_gdbm=yes enable_database_dbm=no libdbm=-lgdbm
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm_compat" >&5
+ { $as_echo "$as_me:$LINENO: checking for dbm_open in -lgdbm_compat" >&5
$as_echo_n "checking for dbm_open in -lgdbm_compat... " >&6; }
-if test "${ac_cv_lib_gdbm_compat_dbm_open+set}" = set; then :
+if test "${ac_cv_lib_gdbm_compat_dbm_open+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgdbm_compat -lgdbm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20048,18 +38686,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_gdbm_compat_dbm_open=yes
else
- ac_cv_lib_gdbm_compat_dbm_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_compat_dbm_open" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gdbm_compat_dbm_open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_compat_dbm_open" >&5
$as_echo "$ac_cv_lib_gdbm_compat_dbm_open" >&6; }
-if test "x$ac_cv_lib_gdbm_compat_dbm_open" = x""yes; then :
+if test "x$ac_cv_lib_gdbm_compat_dbm_open" = x""yes; then
enable_database_gdbm=yes enable_database_dbm=no libdbm="-lgdbm_compat -lgdbm"
else
@@ -20076,19 +38739,107 @@
fi
if test "$enable_database_dbm" != "no"; then
- ac_fn_c_check_func "$LINENO" "dbm_open" "ac_cv_func_dbm_open"
-if test "x$ac_cv_func_dbm_open" = x""yes; then :
+ { $as_echo "$as_me:$LINENO: checking for dbm_open" >&5
+$as_echo_n "checking for dbm_open... " >&6; }
+if test "${ac_cv_func_dbm_open+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define dbm_open to an innocuous variant, in case <limits.h> declares dbm_open.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define dbm_open innocuous_dbm_open
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char dbm_open (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef dbm_open
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dbm_open ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_dbm_open || defined __stub___dbm_open
+choke me
+#endif
+
+int
+main ()
+{
+return dbm_open ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_dbm_open=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_dbm_open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dbm_open" >&5
+$as_echo "$ac_cv_func_dbm_open" >&6; }
+if test "x$ac_cv_func_dbm_open" = x""yes; then
enable_database_dbm=yes libdbm=
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -ldbm" >&5
+ { $as_echo "$as_me:$LINENO: checking for dbm_open in -ldbm" >&5
$as_echo_n "checking for dbm_open in -ldbm... " >&6; }
-if test "${ac_cv_lib_dbm_dbm_open+set}" = set; then :
+if test "${ac_cv_lib_dbm_dbm_open+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldbm $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20106,18 +38857,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_dbm_dbm_open=yes
else
- ac_cv_lib_dbm_dbm_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbm_dbm_open" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_dbm_dbm_open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dbm_dbm_open" >&5
$as_echo "$ac_cv_lib_dbm_dbm_open" >&6; }
-if test "x$ac_cv_lib_dbm_dbm_open" = x""yes; then :
+if test "x$ac_cv_lib_dbm_dbm_open" = x""yes; then
enable_database_dbm=yes libdbm=-ldbm
else
@@ -20137,13 +38913,108 @@
#define NDBM_H_FILE "$ndbm_h_file"
_ACEOF
- $as_echo "#define HAVE_DBM 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_DBM 1
+_ACEOF
$as_unset ndbm_h_file
fi
-ac_fn_c_check_type "$LINENO" "u_int8_t" "ac_cv_type_u_int8_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int8_t" = x""yes; then :
+{ $as_echo "$as_me:$LINENO: checking for u_int8_t" >&5
+$as_echo_n "checking for u_int8_t... " >&6; }
+if test "${ac_cv_type_u_int8_t+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_u_int8_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (u_int8_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((u_int8_t)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_u_int8_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int8_t" >&5
+$as_echo "$ac_cv_type_u_int8_t" >&6; }
+if test "x$ac_cv_type_u_int8_t" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_U_INT8_T 1
@@ -20151,8 +39022,101 @@
fi
-ac_fn_c_check_type "$LINENO" "u_int16_t" "ac_cv_type_u_int16_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int16_t" = x""yes; then :
+{ $as_echo "$as_me:$LINENO: checking for u_int16_t" >&5
+$as_echo_n "checking for u_int16_t... " >&6; }
+if test "${ac_cv_type_u_int16_t+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_u_int16_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (u_int16_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((u_int16_t)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_u_int16_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5
+$as_echo "$ac_cv_type_u_int16_t" >&6; }
+if test "x$ac_cv_type_u_int16_t" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_U_INT16_T 1
@@ -20160,8 +39124,101 @@
fi
-ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int32_t" = x""yes; then :
+{ $as_echo "$as_me:$LINENO: checking for u_int32_t" >&5
+$as_echo_n "checking for u_int32_t... " >&6; }
+if test "${ac_cv_type_u_int32_t+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_type_u_int32_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (u_int32_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((u_int32_t)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_u_int32_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
+$as_echo "$ac_cv_type_u_int32_t" >&6; }
+if test "x$ac_cv_type_u_int32_t" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_U_INT32_T 1
@@ -20172,10 +39229,14 @@
if test "$enable_database_berkdb" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley db.h" >&5
+ { $as_echo "$as_me:$LINENO: checking for Berkeley db.h" >&5
$as_echo_n "checking for Berkeley db.h... " >&6; }
for header in "db/db.h" "db.h"; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdlib.h>
@@ -20202,22 +39263,49 @@
#include <$header>
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
db_h_file="$header"; break
-fi
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
if test -z "$db_h_file"
- then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ then { $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }; enable_database_berkdb=no
- else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $db_h_file" >&5
+ else { $as_echo "$as_me:$LINENO: result: $db_h_file" >&5
$as_echo "$db_h_file" >&6; }
fi
if test "$enable_database_berkdb" != "no"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB version" >&5
+ { $as_echo "$as_me:$LINENO: checking for Berkeley DB version" >&5
$as_echo_n "checking for Berkeley DB version... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$db_h_file>
#if DB_VERSION_MAJOR > 1
@@ -20226,8 +39314,12 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ $EGREP "yes" >/dev/null 2>&1; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$db_h_file>
#if DB_VERSION_MAJOR > 2
@@ -20236,8 +39328,12 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ $EGREP "yes" >/dev/null 2>&1; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$db_h_file>
#if DB_VERSION_MAJOR > 3
@@ -20246,46 +39342,137 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: 4" >&5
+ $EGREP "yes" >/dev/null 2>&1; then
+ { $as_echo "$as_me:$LINENO: result: 4" >&5
$as_echo "4" >&6; }; dbfunc=db_create; dbver=4
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3" >&5
+ { $as_echo "$as_me:$LINENO: result: 3" >&5
$as_echo "3" >&6; }; dbfunc=db_create; dbver=3
fi
rm -f conftest*
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2" >&5
+ { $as_echo "$as_me:$LINENO: result: 2" >&5
$as_echo "2" >&6; }; dbfunc=db_open; dbver=2
fi
rm -f conftest*
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1" >&5
+ { $as_echo "$as_me:$LINENO: result: 1" >&5
$as_echo "1" >&6; }; dbfunc=dbopen; dbver=1
fi
rm -f conftest*
as_ac_var=`$as_echo "ac_cv_func_$dbfunc" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$dbfunc" "$as_ac_var"
-eval as_val=\$$as_ac_var
- if test "x$as_val" = x""yes; then :
+{ $as_echo "$as_me:$LINENO: checking for $dbfunc" >&5
+$as_echo_n "checking for $dbfunc... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $dbfunc to an innocuous variant, in case <limits.h> declares $dbfunc.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $dbfunc innocuous_$dbfunc
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $dbfunc (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $dbfunc
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $dbfunc ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$dbfunc || defined __stub___$dbfunc
+choke me
+#endif
+
+int
+main ()
+{
+return $dbfunc ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ eval "$as_ac_var=yes"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
enable_database_berkdb=yes need_libdb=no
else
as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dbfunc in -ldb" >&5
+{ $as_echo "$as_me:$LINENO: checking for $dbfunc in -ldb" >&5
$as_echo_n "checking for $dbfunc in -ldb... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldb $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20303,20 +39490,47 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
eval "$as_ac_Lib=yes"
else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
- if test "x$as_val" = x""yes; then :
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
enable_database_berkdb=yes need_libdb=yes
fi
@@ -20331,17 +39545,21 @@
eval `$CPP -Isrc $tempcname \
| sed -n -e "s/[ TAB]*=[ TAB\"]*/='/" -e "s/[ TAB\"]*\$/'/" -e "s/^configure___//p"`
rm -f $tempcname
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"db_create is really $dbfunc\"" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: \"db_create is really $dbfunc\"" >&5
$as_echo "$as_me: WARNING: \"db_create is really $dbfunc\"" >&2;}
as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dbfunc in -ldb" >&5
+{ $as_echo "$as_me:$LINENO: checking for $dbfunc in -ldb" >&5
$as_echo_n "checking for $dbfunc in -ldb... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldb $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20359,20 +39577,47 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
eval "$as_ac_Lib=yes"
else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
- if test "x$as_val" = x""yes; then :
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
enable_database_berkdb=yes need_libdb=yes
fi
@@ -20383,7 +39628,9 @@
#define DB_H_FILE "$db_h_file"
_ACEOF
- $as_echo "#define HAVE_BERKELEY_DB 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_BERKELEY_DB 1
+_ACEOF
test "$need_libdb" = "yes" && LIBS="-ldb $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-ldb\" to \$LIBS"; fi
else enable_database_berkdb=no
@@ -20392,19 +39639,26 @@
if test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \
!= "no no no"; then
- $as_echo "#define HAVE_DATABASE 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_DATABASE 1
+_ACEOF
fi
if test "$with_socks" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOCKSinit in -lsocks" >&5
+
+{ $as_echo "$as_me:$LINENO: checking for SOCKSinit in -lsocks" >&5
$as_echo_n "checking for SOCKSinit in -lsocks... " >&6; }
-if test "${ac_cv_lib_socks_SOCKSinit+set}" = set; then :
+if test "${ac_cv_lib_socks_SOCKSinit+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocks $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20422,18 +39676,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_socks_SOCKSinit=yes
else
- ac_cv_lib_socks_SOCKSinit=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socks_SOCKSinit" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_socks_SOCKSinit=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socks_SOCKSinit" >&5
$as_echo "$ac_cv_lib_socks_SOCKSinit" >&6; }
-if test "x$ac_cv_lib_socks_SOCKSinit" = x""yes; then :
+if test "x$ac_cv_lib_socks_SOCKSinit" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSOCKS 1
_ACEOF
@@ -20442,28 +39721,167 @@
fi
- test -n "$ac_cv_lib_socks_SOCKSinit" && $as_echo "#define HAVE_SOCKS 1" >>confdefs.h
+ test -n "$ac_cv_lib_socks_SOCKSinit" && cat >>confdefs.h <<\_ACEOF
+#define HAVE_SOCKS 1
+_ACEOF
fi
if test "$usage_tracking" = "yes"; then
- $as_echo "#define USAGE_TRACKING 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define USAGE_TRACKING 1
+_ACEOF
LIBS="-Bstatic -lut -Bdynamic $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
fi
if test "$enable_bignum" = "gmp"; then
- ac_fn_c_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"
-if test "x$ac_cv_header_gmp_h" = x""yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_init in -lgmp" >&5
+ if test "${ac_cv_header_gmp_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for gmp.h" >&5
+$as_echo_n "checking for gmp.h... " >&6; }
+if test "${ac_cv_header_gmp_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gmp_h" >&5
+$as_echo "$ac_cv_header_gmp_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking gmp.h usability" >&5
+$as_echo_n "checking gmp.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <gmp.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking gmp.h presence" >&5
+$as_echo_n "checking gmp.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <gmp.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: gmp.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: gmp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gmp.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: gmp.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: gmp.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: gmp.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gmp.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: gmp.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gmp.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: gmp.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gmp.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: gmp.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gmp.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: gmp.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: gmp.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: gmp.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for gmp.h" >&5
+$as_echo_n "checking for gmp.h... " >&6; }
+if test "${ac_cv_header_gmp_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_gmp_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gmp_h" >&5
+$as_echo "$ac_cv_header_gmp_h" >&6; }
+
+fi
+if test "x$ac_cv_header_gmp_h" = x""yes; then
+
+ { $as_echo "$as_me:$LINENO: checking for __gmpz_init in -lgmp" >&5
$as_echo_n "checking for __gmpz_init in -lgmp... " >&6; }
-if test "${ac_cv_lib_gmp___gmpz_init+set}" = set; then :
+if test "${ac_cv_lib_gmp___gmpz_init+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgmp $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20481,18 +39899,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_gmp___gmpz_init=yes
else
- ac_cv_lib_gmp___gmpz_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_init" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_gmp___gmpz_init=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gmp___gmpz_init" >&5
$as_echo "$ac_cv_lib_gmp___gmpz_init" >&6; }
-if test "x$ac_cv_lib_gmp___gmpz_init" = x""yes; then :
+if test "x$ac_cv_lib_gmp___gmpz_init" = x""yes; then
have_mpz_init=yes
fi
@@ -20500,9 +39943,13 @@
if test "$have_mpz_init" = "yes"; then
- $as_echo "#define WITH_NUMBER_TYPES 1" >>confdefs.h
-
- $as_echo "#define WITH_GMP 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define WITH_NUMBER_TYPES 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define WITH_GMP 1
+_ACEOF
LIBS="-lgmp $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lgmp\" to \$LIBS"; fi
else
@@ -20510,17 +39957,152 @@
fi
elif test "$enable_bignum" = "mp"; then
for library in "" "-lcrypto"; do
- ac_fn_c_check_header_mongrel "$LINENO" "mp.h" "ac_cv_header_mp_h" "$ac_includes_default"
-if test "x$ac_cv_header_mp_h" = x""yes; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mp_mfree in -lmp" >&5
+ if test "${ac_cv_header_mp_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for mp.h" >&5
+$as_echo_n "checking for mp.h... " >&6; }
+if test "${ac_cv_header_mp_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mp_h" >&5
+$as_echo "$ac_cv_header_mp_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking mp.h usability" >&5
+$as_echo_n "checking mp.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <mp.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking mp.h presence" >&5
+$as_echo_n "checking mp.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <mp.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: mp.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: mp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: mp.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: mp.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: mp.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: mp.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: mp.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: mp.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: mp.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: mp.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: mp.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: mp.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: mp.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: mp.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: mp.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: mp.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------- ##
+## Report this to xemacs-beta@xemacs.org ##
+## ------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for mp.h" >&5
+$as_echo_n "checking for mp.h... " >&6; }
+if test "${ac_cv_header_mp_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_mp_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mp_h" >&5
+$as_echo "$ac_cv_header_mp_h" >&6; }
+
+fi
+if test "x$ac_cv_header_mp_h" = x""yes; then
+
+ { $as_echo "$as_me:$LINENO: checking for mp_mfree in -lmp" >&5
$as_echo_n "checking for mp_mfree in -lmp... " >&6; }
-if test "${ac_cv_lib_mp_mp_mfree+set}" = set; then :
+if test "${ac_cv_lib_mp_mp_mfree+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmp $library $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20538,29 +40120,58 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_mp_mp_mfree=yes
else
- ac_cv_lib_mp_mp_mfree=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp_mp_mfree" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_mp_mp_mfree=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mp_mp_mfree" >&5
$as_echo "$ac_cv_lib_mp_mp_mfree" >&6; }
-if test "x$ac_cv_lib_mp_mp_mfree" = x""yes; then :
+if test "x$ac_cv_lib_mp_mp_mfree" = x""yes; then
have_mp_mfree=yes; break
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mfree in -lmp" >&5
+ { $as_echo "$as_me:$LINENO: checking for mfree in -lmp" >&5
$as_echo_n "checking for mfree in -lmp... " >&6; }
-if test "${ac_cv_lib_mp_mfree+set}" = set; then :
+if test "${ac_cv_lib_mp_mfree+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmp $library $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -20578,18 +40189,43 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
ac_cv_lib_mp_mfree=yes
else
- ac_cv_lib_mp_mfree=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp_mfree" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_mp_mfree=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mp_mfree" >&5
$as_echo "$ac_cv_lib_mp_mfree" >&6; }
-if test "x$ac_cv_lib_mp_mfree" = x""yes; then :
+if test "x$ac_cv_lib_mp_mfree" = x""yes; then
have_mfree=yes; break
fi
@@ -20600,15 +40236,103 @@
done
if test "$have_mp_mfree" = "yes"; then
- $as_echo "#define MP_PREFIX 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define MP_PREFIX 1
+_ACEOF
LIBS="$LIBS -lmp" && if test "$verbose" = "yes"; then echo " Appending \"-lmp\" to \$LIBS"; fi
if test "$library" != ""; then
LIBS="$LIBS $library" && if test "$verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
fi
- ac_fn_c_check_func "$LINENO" "mp_move" "ac_cv_func_mp_move"
-if test "x$ac_cv_func_mp_move" = x""yes; then :
- $as_echo "#define HAVE_MP_MOVE 1" >>confdefs.h
+ { $as_echo "$as_me:$LINENO: checking for mp_move" >&5
+$as_echo_n "checking for mp_move... " >&6; }
+if test "${ac_cv_func_mp_move+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define mp_move to an innocuous variant, in case <limits.h> declares mp_move.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define mp_move innocuous_mp_move
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char mp_move (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef mp_move
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char mp_move ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_mp_move || defined __stub___mp_move
+choke me
+#endif
+
+int
+main ()
+{
+return mp_move ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_mp_move=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_mp_move=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mp_move" >&5
+$as_echo "$ac_cv_func_mp_move" >&6; }
+if test "x$ac_cv_func_mp_move" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_MP_MOVE 1
+_ACEOF
fi
@@ -20617,34 +40341,157 @@
if test "$library" != ""; then
LIBS="$LIBS $library" && if test "$verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
fi
- ac_fn_c_check_func "$LINENO" "move" "ac_cv_func_move"
-if test "x$ac_cv_func_move" = x""yes; then :
- $as_echo "#define HAVE_MP_MOVE 1" >>confdefs.h
+ { $as_echo "$as_me:$LINENO: checking for move" >&5
+$as_echo_n "checking for move... " >&6; }
+if test "${ac_cv_func_move+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define move to an innocuous variant, in case <limits.h> declares move.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define move innocuous_move
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char move (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef move
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char move ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_move || defined __stub___move
+choke me
+#endif
+
+int
+main ()
+{
+return move ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ ac_cv_func_move=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_func_move=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_move" >&5
+$as_echo "$ac_cv_func_move" >&6; }
+if test "x$ac_cv_func_move" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_MP_MOVE 1
+_ACEOF
fi
else
{ echo "Error:" "Required MP numeric support cannot be provided." >&2; exit 1; }
fi
- $as_echo "#define WITH_NUMBER_TYPES 1" >>confdefs.h
-
- $as_echo "#define WITH_MP 1" >>confdefs.h
-
-fi
-
-if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ cat >>confdefs.h <<\_ACEOF
+#define WITH_NUMBER_TYPES 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define WITH_MP 1
+_ACEOF
+
+fi
+
+if test "$cross_compiling" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int main(int c,char **v){return 0;}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- :
-else
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
echo ""
echo "*** PANIC *** The C compiler can no longer build working executables."
@@ -20662,13 +40509,16 @@
echo "*** PANIC *** on your system. Don't do that."
exit 1
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
if test "$win32_processes" != "yes"; then
- $as_echo "#define HAVE_UNIX_PROCESSES 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_UNIX_PROCESSES 1
+_ACEOF
fi
@@ -21042,18 +40892,23 @@
-
if test "$with_prefix" = "yes"; then
- $as_echo "#define PREFIX_USER_DEFINED 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define PREFIX_USER_DEFINED 1
+_ACEOF
fi
if test "$with_site_lisp" = "no"; then
- $as_echo "#define INHIBIT_SITE_LISP 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define INHIBIT_SITE_LISP 1
+_ACEOF
fi
if test "$with_site_modules" = "no"; then
- $as_echo "#define INHIBIT_SITE_MODULES 1" >>confdefs.h
+ cat >>confdefs.h <<\_ACEOF
+#define INHIBIT_SITE_MODULES 1
+_ACEOF
fi
@@ -21096,44 +40951,82 @@
-if test "$with_system_malloc" = "yes"; then $as_echo "#define USE_SYSTEM_MALLOC 1" >>confdefs.h
-
-elif test "$with_debug_malloc" = "yes"; then $as_echo "#define USE_DEBUG_MALLOC 1" >>confdefs.h
-
- $as_echo "#define USE_SYSTEM_MALLOC 1" >>confdefs.h
-
-fi
-test "$GCC" = "yes" && $as_echo "#define USE_GCC 1" >>confdefs.h
-
-test "$enable_external_widget" = "yes" && $as_echo "#define EXTERNAL_WIDGET 1" >>confdefs.h
-
-test "$enable_kkcc" = "yes" && $as_echo "#define USE_KKCC 1" >>confdefs.h
-
-test "$enable_newgc" = "yes" && $as_echo "#define NEW_GC 1" >>confdefs.h
-
-test "$have_vdb_posix" = "yes" && $as_echo "#define VDB_POSIX 1" >>confdefs.h
-
-test "$have_vdb_fake" = "yes" && $as_echo "#define VDB_FAKE 1" >>confdefs.h
-
-test "$enable_quick_build" = "yes" && $as_echo "#define QUICK_BUILD 1" >>confdefs.h
-
-test "$with_purify" = "yes" && $as_echo "#define PURIFY 1" >>confdefs.h
-
-test "$with_quantify" = "yes" && $as_echo "#define QUANTIFY 1" >>confdefs.h
-
-test "$with_pop" = "yes" && $as_echo "#define MAIL_USE_POP 1" >>confdefs.h
-
-test "$with_kerberos" = "yes" && $as_echo "#define KERBEROS 1" >>confdefs.h
-
-test "$with_hesiod" = "yes" && $as_echo "#define HESIOD 1" >>confdefs.h
-
-test "$enable_union_type" = "yes" && $as_echo "#define USE_UNION_TYPE 1" >>confdefs.h
-
-test "$enable_pdump" = "yes" && $as_echo "#define PDUMP 1" >>confdefs.h
-
-test "$enable_dump_in_exec" = "yes" && $as_echo "#define DUMP_IN_EXEC 1" >>confdefs.h
-
-test "$with_ipv6_cname" = "yes" && $as_echo "#define IPV6_CANONICALIZE 1" >>confdefs.h
+if test "$with_system_malloc" = "yes"; then cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_MALLOC 1
+_ACEOF
+
+elif test "$with_debug_malloc" = "yes"; then cat >>confdefs.h <<\_ACEOF
+#define USE_DEBUG_MALLOC 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define USE_SYSTEM_MALLOC 1
+_ACEOF
+
+fi
+test "$GCC" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define USE_GCC 1
+_ACEOF
+
+test "$enable_external_widget" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define EXTERNAL_WIDGET 1
+_ACEOF
+
+test "$enable_kkcc" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define USE_KKCC 1
+_ACEOF
+
+test "$enable_newgc" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define NEW_GC 1
+_ACEOF
+
+test "$have_vdb_posix" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define VDB_POSIX 1
+_ACEOF
+
+test "$have_vdb_fake" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define VDB_FAKE 1
+_ACEOF
+
+test "$enable_quick_build" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define QUICK_BUILD 1
+_ACEOF
+
+test "$with_purify" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define PURIFY 1
+_ACEOF
+
+test "$with_quantify" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define QUANTIFY 1
+_ACEOF
+
+test "$with_pop" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define MAIL_USE_POP 1
+_ACEOF
+
+test "$with_kerberos" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define KERBEROS 1
+_ACEOF
+
+test "$with_hesiod" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define HESIOD 1
+_ACEOF
+
+test "$enable_union_type" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define USE_UNION_TYPE 1
+_ACEOF
+
+test "$enable_pdump" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define PDUMP 1
+_ACEOF
+
+test "$enable_dump_in_exec" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define DUMP_IN_EXEC 1
+_ACEOF
+
+test "$with_ipv6_cname" = "yes" && cat >>confdefs.h <<\_ACEOF
+#define IPV6_CANONICALIZE 1
+_ACEOF
@@ -21506,13 +41399,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) { eval $ac_var=; unset $ac_var;} ;;
+ *) $as_unset $ac_var ;;
esac ;;
esac
done
@@ -21520,8 +41413,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \.
+ # `set' does not quote correctly, so add quotes (double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \).
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -21544,11 +41437,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
@@ -21568,8 +41461,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
- as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -21582,10 +41475,9 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -21595,18 +41487,17 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-
SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization. ##
+## --------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -21614,14 +41505,22 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in #(
- *posix*) :
- set -o posix ;; #(
- *) :
- ;;
-esac
-fi
-
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
as_nl='
'
@@ -21630,13 +41529,7 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -21647,7 +41540,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in #(
+ case $arg in
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -21670,6 +41563,13 @@
}
fi
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
+fi
+
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
@@ -21679,15 +41579,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in #((
+case $0 in
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
IFS=$as_save_IFS
;;
@@ -21699,16 +41599,12 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+ { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
done
PS1='$ '
PS2='> '
@@ -21720,89 +41616,7 @@
LANGUAGE=C
export LANGUAGE
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
- as_status=$?; test $as_status -eq 0 && as_status=1
- if test "$3"; then
- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
- fi
- $as_echo "$as_me: error: $1" >&2
- as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
- return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
- set +e
- as_fn_set_status $1
- exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
- { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
- eval 'as_fn_append ()
- {
- eval $1+=\$2
- }'
-else
- as_fn_append ()
- {
- eval $1=\$$1\$2
- }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
- eval 'as_fn_arith ()
- {
- as_val=$(( $* ))
- }'
-else
- as_fn_arith ()
- {
- as_val=`expr "$@" || test $? -eq 1`
- }
-fi # as_fn_arith
-
-
+# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -21816,12 +41630,8 @@
as_basename=false
fi
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
+
+# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
@@ -21841,25 +41651,76 @@
}
s/.*/./; q'`
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# CDPATH.
+$as_unset CDPATH
+
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+ # line-number line after each line using $LINENO; the second 'sed'
+ # does the real work. The second script uses 'N' to pair each
+ # line-number line with the line containing $LINENO, and appends
+ # trailing '-' during substitution so that $LINENO is not a special
+ # case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+ # scripts with optimization help from Paolo Bonzini. Blame Lee
+ # E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
+ sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
+ N
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ t loop
+ s/-\n.*//
+ ' >$as_me.lineno &&
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
+ # Exit status is that of the last command.
+ exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
-n*)
- case `echo 'xy\c'` in
+ case `echo 'x\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- xy) ECHO_C='\c';;
- *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
- ECHO_T=' ';;
+ *) ECHO_C='\c';;
esac;;
*)
ECHO_N='-n';;
esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
+else
+ as_expr=false
+fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -21888,56 +41749,8 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || eval $as_mkdir_p || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p "$as_dir"'
+ as_mkdir_p=:
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -21956,10 +41769,10 @@
if test -d "$1"; then
test -d "$1/.";
else
- case $1 in #(
+ case $1 in
-*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -21974,19 +41787,13 @@
exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
+
+# Save the log message, to keep $[0] and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by XEmacs $as_me 21.5, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -22018,11 +41825,10 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration. Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTION]... [FILE]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
@@ -22044,16 +41850,16 @@
Configuration commands:
$config_commands
-Report bugs to <xemacs-beta@xemacs.org>."
+Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
XEmacs config.status 21.5
-configured by $0, generated by GNU Autoconf 2.64,
+configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -22094,19 +41900,20 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
- as_fn_append CONFIG_FILES " '$ac_optarg'"
+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
- as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+ CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
- as_fn_error "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
+ { $as_echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; };;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -22114,10 +41921,11 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
- *) as_fn_append ac_config_targets " $1"
+ -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; } ;;
+
+ *) ac_config_targets="$ac_config_targets $1"
ac_need_defaults=false ;;
esac
@@ -22179,7 +41987,9 @@
"lib-src/ellcc.h") CONFIG_FILES="$CONFIG_FILES lib-src/ellcc.h" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
esac
done
@@ -22206,7 +42016,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
- trap 'as_fn_exit 1' 1 2 13 15
+ trap '{ (exit 1); exit 1; }' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
@@ -22217,7 +42027,11 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} ||
+{
+ $as_echo "$as_me: cannot create a temporary directory in ." >&2
+ { (exit 1); exit 1; }
+}
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -22225,16 +42039,10 @@
if test -n "$CONFIG_FILES"; then
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
- eval ac_cr=\$\'\\r\'
-fi
+ac_cr='
'
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\r'
+ ac_cs_awk_cr='\\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -22248,18 +42056,24 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -22348,7 +42162,9 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error "could not setup config files machinery" "$LINENO" 5
+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+ { (exit 1); exit 1; }; }
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -22389,7 +42205,9 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+ { (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -22474,7 +42292,9 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- as_fn_error "could not setup config headers machinery" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+ { (exit 1); exit 1; }; }
fi # test -n "$CONFIG_HEADERS"
@@ -22487,7 +42307,9 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+ { (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -22515,10 +42337,12 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { (exit 1); exit 1; }; };;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- as_fn_append ac_file_inputs " '$ac_f'"
+ ac_file_inputs="$ac_file_inputs '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -22529,7 +42353,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
@@ -22542,7 +42366,9 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
;;
esac
@@ -22570,7 +42396,47 @@
q
}
s/.*/./; q'`
- as_dir="$ac_dir"; as_fn_mkdir_p
+ { as_dir="$ac_dir"
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ { (exit 1); exit 1; }; }; }
ac_builddir=.
case "$ac_dir" in
@@ -22622,6 +42488,7 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
+
ac_sed_dataroot='
/datarootdir/ {
p
@@ -22631,11 +42498,12 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p'
+/@mandir@/p
+'
case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -22645,7 +42513,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
+ s&\\\${datarootdir}&$datarootdir&g' ;;
esac
_ACEOF
@@ -22673,12 +42541,14 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
@@ -22688,7 +42558,9 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
;;
:H)
#
@@ -22699,23 +42571,29 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
mv "$tmp/config.h" "$ac_file" \
- || as_fn_error "could not create $ac_file" "$LINENO" 5
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
fi
else
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- || as_fn_error "could not create -" "$LINENO" 5
+ || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+ { (exit 1); exit 1; }; }
fi
;;
- :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
@@ -22873,12 +42751,15 @@
done # for ac_tag
-as_fn_exit 0
-_ACEOF
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
# configure is writing to config.log, and then calls config.status.
@@ -22899,10 +42780,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit $?
+ $ac_cs_success || { (exit 1); exit 1; }
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
diff -r 75975fd0b7fc -r aa5ed11f473b configure.ac
--- a/configure.ac Wed Nov 18 22:44:28 2009 +0900
+++ b/configure.ac Wed Nov 18 08:49:14 2009 -0700
@@ -1294,63 +1294,26 @@
case "$ac_cv_build" in
sparc-*-* ) machine=sparc ;;
alpha*-*-* ) machine=alpha ;;
- vax-*-* ) machine=vax ;;
- mips-dec-* ) machine=pmax ;;
- mips-sgi-irix6* ) machine=iris6d ;;
- mips-sgi-* ) machine=iris4d ;;
mips*-linux ) machine=mips ;;
- romp-ibm-* ) machine=ibmrt ;;
rs6000-ibm-aix* ) machine=ibmrs6000 ;;
powerpc-ibm-aix* ) machine=ibmrs6000 ;;
powerpc*-* ) machine=powerpc ;;
hppa-*-* ) machine=hp800 ;;
- m88k-dg-* ) machine=aviion ;;
- m68*-sony-* ) machine=news ;;
- mips-sony-* ) machine=news-risc ;;
- clipper-* ) machine=clipper ;;
arm* ) machine=arm ;;
- ns32k-* ) machine=ns32000 ;;
esac
dnl Straightforward OS determination
case "$ac_cv_build" in
- *-*-linux* ) opsys=linux ;;
*-*-netbsd* ) opsys=netbsd ;;
*-*-openbsd* ) opsys=openbsd ;;
- *-*-nextstep* ) opsys=nextstep ;;
- *-*-vms ) opsys=vms ;;
-
- dnl DEC OSF
- *-dec-osf1.3 | *-dec-osf2* ) opsys=decosf1-3 ;;
- *-dec-osf1.2 | *-dec-osf1* ) opsys=decosf1-2 ;;
- *-dec-osf3.[[2-9]] ) opsys=decosf3-2 ;;
- *-dec-osf3* ) opsys=decosf3-1 ;;
- *-dec-osf[[4-9]]* ) opsys=decosf4-0 ;;
-
- dnl DEC Ultrix
- *-*-ultrix[[0-3]].* | *-*-ultrix4.0* ) opsys=bsd4-2 ;;
- *-*-ultrix4.[[12]]* ) opsys=bsd4-3 ;;
- *-*-ultrix* ) opsys=ultrix4-3 ;;
dnl AIX
- *-*-aix3.1* ) opsys=aix3-1 ;;
- *-*-aix3.2.5 ) opsys=aix3-2-5 ;;
- *-*-aix3* ) opsys=aix3-2 ;;
- *-*-aix4.0* ) opsys=aix4 ;;
- *-*-aix4.1* ) opsys=aix4-1 ;;
*-*-aix[[4-9]]* ) opsys=aix4-2 ;;
dnl Other generic OSes
*-gnu* ) opsys=gnu ;;
- *-*-bsd4.[[01]] ) opsys=bsd4-1 ;;
- *-*-bsd4.2 ) opsys=bsd4-2 ;;
*-*-bsd4.3 ) opsys=bsd4-3 ;;
- *-*-aos4.2 ) opsys=bsd4-2 ;;
*-*-aos* ) opsys=bsd4-3 ;;
- *-*-sysv0 | *-*-sysvr0 ) opsys=usg5-0 ;;
- *-*-sysv2 | *-*-sysvr2 ) opsys=usg5-2 ;;
- *-*-sysv2.2 | *-*-sysvr2.2 ) opsys=usg5-2-2 ;;
- *-*-sysv3* | *-*-sysvr3* ) opsys=usg5-3 ;;
*-*-sysv4.1* | *-*-sysvr4.1* )opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;;
*-*-sysv4.[[2-9]]* | *-sysvr4.[[2-9]]* )
if test -z "$NON_GNU_CPP" ; then
@@ -1369,11 +1332,6 @@
*-*-netbsd* )
case "${ac_cv_build}" in
i[[3-9]]86-*-netbsd*) machine=intel386 ;;
- hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* )
- dnl Yes, this is somewhat bogus.
- machine=hp9000s300 ;;
- pc532-*-netbsd* | ns32k-*-netbsd* ) machine=ns32000 ;;
- pmax-*-netbsd* | mips-*-netbsd* ) machine=pmax ;;
esac
;;
@@ -1381,53 +1339,9 @@
*-*-openbsd* )
case "${ac_cv_build}" in
i386-*-openbsd*) machine=intel386 ;;
- m68k-*-openbsd*) machine=hp9000s300 ;;
- mipsel-*-openbsd*) machine=pmax ;;
esac
;;
- dnl Acorn RISCiX:
- arm-acorn-riscix1.1* ) machine=acorn opsys=riscix1-1 ;;
- arm-acorn-riscix1.2* | arm-acorn-riscix ) machine=acorn opsys=riscix1-2 ;;
-
- dnl Alliant machines
- fx80-alliant-* ) machine=alliant4 opsys=bsd4-2 ;;
- i860-alliant-* ) machine=alliant-2800 opsys=bsd4-3 ;;
-
- dnl Altos 3068
- m68*-altos-sysv* ) machine=altos opsys=usg5-2 ;;
-
- dnl Amdahl UTS
- 580-amdahl-sysv* ) machine=amdahl opsys=usg5-2-2 ;;
-
- dnl Apollo, Domain/OS
- m68*-apollo-* ) machine=apollo opsys=bsd4-3 ;;
-
- dnl AT&T 3b2, 3b5, 3b15, 3b20
- we32k-att-sysv* ) machine=att3b opsys=usg5-2-2 ;;
-
- dnl AT&T 3b1 - The Mighty Unix PC!
- m68*-att-sysv* ) machine=7300 opsys=usg5-2-2 ;;
-
- dnl Bull machines
- rs6000-bull-bosx* ) machine=ibmrs6000 opsys=aix3-2 ;; # dpx20
- m68*-bull-sysv3* ) machine=dpx2 opsys=usg5-3 ;; # dpx2
- m68*-bull-sysv2* ) machine=sps7 opsys=usg5-2 ;; # sps7
-
- dnl CCI 5/32, 6/32 -- see "Tahoe".
-
- dnl Celerity
- celerity-celerity-bsd* ) machine=celerity opsys=bsd4-2 ;;
-
- dnl Convex
- *-convex-bsd* | *-convex-convexos* )
- machine=convex opsys=bsd4-3
- NON_GNU_CPP="cc -E -P"
- ;;
-
- dnl Cubix QBx/386
- i[[3-9]]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;;
-
dnl Darwin, a.k.a. MacOS X (based on Mach and Freebsd)
*-*-darwin*)
opsys=darwin
@@ -1435,213 +1349,28 @@
AC_DEFINE(USE_PARAM_H)
;;
- dnl Data General AViiON Machines
- i586-dg-dgux*R4* | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
- m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) opsys=dgux5-4r3 ;;
- m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) opsys=dgux5-4r2 ;;
- m88k-dg-dgux* ) opsys=dgux ;;
-
- dnl Motorola Delta machines
- m68k-motorola-sysv* | m68000-motorola-sysv* ) machine=delta opsys=usg5-3 ;;
- m88k-motorola-sysv4* )
- dnl jbotte@bnr.ca says that UNIX_System_V <hostName> 4.0 R40V4.3 m88k mc88110
- dnl needs POSIX_SIGNALS and therefore needs usg5-4-2.
- dnl I hope there are not other 4.0 versions for this machine
- dnl which really need usg5-4 instead.
- machine=delta88k opsys=usg5-4-2
- ;;
- m88k-motorola-sysv* | m88k-motorola-m88kbcs* ) machine=delta88k opsys=usg5-3 ;;
-
- dnl Dual machines
- m68*-dual-sysv* ) machine=dual opsys=usg5-2 ;;
- m68*-dual-uniplus* ) machine=dual opsys=unipl5-2 ;;
-
- dnl Encore machines
- ns16k-encore-bsd* ) machine=ns16000 opsys=umax ;;
-
- dnl Gould Power Node and NP1
- pn-gould-bsd4.2* ) machine=gould opsys=bsd4-2 ;;
- pn-gould-bsd4.3* ) machine=gould opsys=bsd4-3 ;;
- np1-gould-bsd* ) machine=gould-np1 opsys=bsd4-3 ;;
-
- dnl Harris Night Hawk machines running CX/UX (a 5000 looks just like a 4000
- dnl as far as XEmacs is concerned).
- m88k-harris-cxux* )
- dnl Build needs to be different on 7.0 and later releases
- case "`uname -r`" in
- [[56]].[[0-9]] ) machine=nh4000 opsys=cxux ;;
- [[7]].[[0-9]] ) machine=nh4000 opsys=cxux7 ;;
- esac
- NON_GNU_CPP="/lib/cpp"
- ;;
- dnl Harris ecx or gcx running CX/UX (Series 1200, Series 3000)
- m68k-harris-cxux* ) machine=nh3000 opsys=cxux ;;
- dnl Harris power pc NightHawk running Power UNIX (Series 6000)
- powerpc-harris-powerunix ) machine=nh6000 opsys=powerunix NON_GNU_CPP="cc -Xo -E -P" ;;
-
- dnl Honeywell XPS100
- xps*-honeywell-sysv* ) machine=xps100 opsys=usg5-2 ;;
-
- dnl HP 9000 series 200 or 300
- m68*-hp-bsd* ) machine=hp9000s300 opsys=bsd4-3 ;;
-
dnl HP-UX
- *-hp-hpux* )
- dnl Figure out machine and opsys orthogonally
- case "$ac_cv_build" in
- m68* ) machine=hp9000s300 ;;
- hppa* ) machine=hp800 ;;
- esac
-
- case "$ac_cv_build" in
- *-hp-hpux7* ) opsys=hpux ;;
- *-hp-hpux8* ) opsys=hpux8 ;;
- *-hp-hpux9* ) opsys=hpux9 ;;
- *-hp-hpux10* ) opsys=hpux10 ;;
- *-hp-hpux11* ) opsys=hpux11 ;;
- * ) opsys=hpux ;;
- esac
-
- dnl HP has a broken "strcat"
- case "$opsys" in hpux9 | hpux10 ) XE_ADD_OBJS(strcat.o) ;; esac
-
- if test "$opsys" = "hpux10" -o "$opsys" = "hpux11"; then \
- ansi_flag="-Ae"; else ansi_flag="-Aa"; fi
- NON_GNU_CC="cc $ansi_flag" NON_GNU_CPP="cc $ansi_flag -E"
+ *-hp-hpux* ) machine=hp800 opsys=hpux11
+ NON_GNU_CC="cc -Ae" NON_GNU_CPP="cc -Ae -E"
case "$ac_cv_build" in *-hp-hpux*shr* ) opsys="${opsys}-shr" ;; esac
;;
- dnl Orion machines
- orion-orion-bsd* ) machine=orion opsys=bsd4-2 ;;
- clipper-orion-bsd* ) machine=orion105 opsys=bsd4-2 ;;
-
- dnl IBM machines
- i[[3-9]]86-ibm-aix1.1* ) machine=ibmps2-aix opsys=usg5-2-2 ;;
- i[[3-9]]86-ibm-aix1.[[23]]* | i[[3-9]]86-ibm-aix* ) machine=ibmps2-aix opsys=usg5-3 ;;
- i370-ibm-aix*) machine=ibm370aix opsys=usg5-3 ;;
- romp-ibm-aos* ) opsys=bsd4-3 ;;
- romp-ibm-bsd* ) opsys=bsd4-3 ;;
- romp-ibm-mach* ) opsys=mach-bsd4-3 ;;
-
- dnl Integrated Solutions "Optimum V"
- m68*-isi-bsd4.2* ) machine=isi-ov opsys=bsd4-2 ;;
- m68*-isi-bsd4.3* ) machine=isi-ov opsys=bsd4-3 ;;
-
- dnl Intel 386 machines where we do care about the manufacturer
- i[[3-9]]86-intsys-sysv* ) machine=is386 opsys=usg5-2-2 ;;
-
- dnl Prime EXL
- i[[3-9]]86-prime-sysv* ) machine=i386 opsys=usg5-3 ;;
-
- dnl Sequent Symmetry running Dynix
- i[[3-9]]86-sequent-bsd* ) machine=symmetry opsys=bsd4-3 ;;
-
- dnl Sequent Symmetry running DYNIX/ptx
- i[[3-9]]86-sequent-ptx* ) machine=sequent-ptx opsys=ptx NON_GNU_CPP="/lib/cpp" ;;
-
- dnl Unspecified sysv on an ncr machine defaults to svr4.2.
- dnl (Plain usg5-4 does not turn on POSIX signals, which we need.)
- i[[3-9]]86-ncr-sysv* ) machine=ncr386 opsys=usg5-4-2 ;;
-
- dnl Intel Paragon OSF/1
- i860-intel-osf1* ) machine=paragon opsys=osf1 NON_GNU_CPP=/usr/mach/lib/cpp ;;
-
- dnl Intel 860
- i860-*-sysv4* ) machine=i860 opsys=usg5-4 NON_GNU_CC="/bin/cc" NON_GNU_CPP="/usr/ccs/lib/cpp" ;;
-
- dnl Masscomp machines
- m68*-masscomp-rtu* ) machine=masscomp opsys=rtu ;;
-
- dnl Megatest machines
- m68*-megatest-bsd* ) machine=mega68 opsys=bsd4-2 ;;
-
dnl Workstations sold by MIPS
dnl This is not necessarily all workstations using the MIPS processor -
dnl Irises are produced by SGI, and DECstations by DEC.
- mips-mips-usg* ) machine=mips4 ;;
- mips-mips-riscos4 )
- machine=mips4
- NON_GNU_CC="cc -systype bsd43"
- NON_GNU_CPP="cc -systype bsd43 -E"
- case "$ac_cv_build" in
- mips-mips-riscos4* ) opsys=bsd4-3 ;;
- mips-mips-riscos5* ) opsys=riscos5 ;;
- esac
- ;;
mips-mips-bsd* ) machine=mips opsys=bsd4-3 ;;
- mips-mips-* ) machine=mips opsys=usg5-2-2 ;;
-
- dnl NeXT
- m68*-next-* | m68k-*-nextstep* ) machine=m68k opsys=nextstep ;;
-
- dnl The complete machine from National Semiconductor
- ns32k-ns-genix* ) machine=ns32000 opsys=usg5-2 ;;
-
- dnl NCR machines
- m68*-ncr-sysv2* | m68*-ncr-sysvr2* ) machine=tower32 opsys=usg5-2-2 ;;
- m68*-ncr-sysv3* | m68*-ncr-sysvr3* ) machine=tower32v3 opsys=usg5-3 ;;
-
- dnl Nixdorf Targon 31
- m68*-nixdorf-sysv* ) machine=targon31 opsys=usg5-2-2 ;;
-
- dnl Nu (TI or LMI)
- m68*-nu-sysv* ) machine=nu opsys=usg5-2 ;;
-
- dnl Plexus
- m68*-plexus-sysv* ) machine=plexus opsys=usg5-2 ;;
-
- dnl Pyramid machines
- pyramid-pyramid-bsd* ) machine=pyramid opsys=bsd4-2 ;;
-
- dnl Sequent Balance
- ns32k-sequent-bsd4.2* ) machine=sequent opsys=bsd4-2 ;;
- ns32k-sequent-bsd4.3* ) machine=sequent opsys=bsd4-3 ;;
-
- dnl Siemens Nixdorf
- mips-siemens-sysv* | mips-sni-sysv*)
- machine=mips-siemens opsys=usg5-4
- NON_GNU_CC=/usr/ccs/bin/cc
- NON_GNU_CPP=/usr/ccs/lib/cpp
- ;;
-
- dnl NEC
- mips-nec-sysv*)
- machine=mips-nec
- NON_GNU_CC=/usr/ccs/bin/cc
- NON_GNU_CPP=/usr/ccs/lib/cpp
- ;;
+ mips-mips-* ) machine=mips opsys=usg5-4-2 ;;
dnl Silicon Graphics machines
- dnl Iris 2500 and Iris 2500 Turbo (aka the Iris 3030)
- m68*-sgi-iris3.5* ) machine=irist opsys=iris3-5 ;;
- m68*-sgi-iris3.6* | m68*-sgi-iris*) machine=irist opsys=iris3-6 ;;
dnl Iris 4D
- mips-sgi-irix3.* ) opsys=irix3-3 ;;
- mips-sgi-irix4.* ) opsys=irix4-0 ;;
mips-sgi-irix6* ) opsys=irix6-0 ;;
- mips-sgi-irix5.1* ) opsys=irix5-1 ;;
- mips-sgi-irix5.2* ) opsys=irix5-2 ;;
- mips-sgi-irix5.* ) opsys=irix5-3 ;;
- mips-sgi-irix* ) opsys=irix5-0 ;;
-
- dnl SONY machines
- *-sony-newsos[[34]]* | *-sony-news[[34]]* ) opsys=bsd4-3 ;;
- *-sony-news* ) opsys=newsos5 ;;
-
- dnl Stride
- m68*-stride-sysv* ) machine=stride opsys=usg5-2 ;;
dnl Suns
- *-*-solaris* | *-*-sunos* | *-sun-mach* | *-sun-bsd* )
+ *-*-solaris* | *-sun-mach* | *-sun-bsd* )
dnl Hardware type
case "$ac_cv_build" in
- m68*-sunos1* ) machine=sun1 ;;
- m68*-sunos2* ) machine=sun2 ;;
- m68* ) machine=sun3 ;;
- i*86*-sun-sunos[[34]]* ) machine=sun386 ;;
i*86-*-* ) machine=intel386 ;;
- rs6000* ) machine=rs6000 ;;
esac
dnl Make $canonical even more so.
@@ -1649,14 +1378,7 @@
ac_cv_build=`echo $ac_cv_build | sed -e s/sunos5/solaris2/`;;
esac
- dnl On SunOS 4, use /usr/lib/cpp, sans dynodump, /bin/ranlib
- dnl On SunOS 5, use cc -E, need dynodump, RANLIB not needed
- dnl But, SunOS 5.6 no longer needs dynodump because it has a similar
- dnl function integrated.
case "$ac_cv_build" in
- *-sunos4* )
- #test -f /usr/lib/cpp && NON_GNU_CPP=/usr/lib/cpp ;;
- : ;;
*-solaris2* )
#test -f /usr/ccs/lib/cpp && NON_GNU_CPP=/usr/ccs/lib/cpp
RANLIB=':' ;;
@@ -1673,90 +1395,21 @@
os_release="${os_release_major}${os_release_minor}"
AC_DEFINE_UNQUOTED(OS_RELEASE, $os_release) ;;
- dnl The last Sun386 ran 4.0.
- i*86-*-sunos4* ) opsys=sunos4-0 ;;
- *-sunos4.0* ) opsys=sunos4-0 ;;
- *-sunos4.1.2* ) opsys=sunos4-1-2 ;;
- *-sunos4.1.3* ) opsys=sunos4-1-3 ;;
- *-sunos4.1.[[4-9]]* ) opsys=sunos4-1-4 ;;
- *-sunos4* | *-sunos ) opsys=sunos4-1 ;;
*-mach* ) opsys=mach-bsd4-3 ;;
- * ) opsys=bsd4-2 ;;
+ * ) opsys=bsd4-3 ;;
esac
- case "$ac_cv_build" in *-sunos4*shr* ) opsys="${opsys}-shr" ;; esac
-
dnl Watch out for a compiler guaranteed not to work.
test "$opsys $CC" = "sol2 /usr/ucb/cc" && CC=""
;;
- dnl Tadpole 68k
- m68*-tadpole-sysv* ) machine=tad68k opsys=usg5-3 ;;
-
- dnl Tahoe machines
- tahoe-tahoe-bsd4.2* ) machine=tahoe opsys=bsd4-2 ;;
- tahoe-tahoe-bsd4.3* ) machine=tahoe opsys=bsd4-3 ;;
-
- dnl Tandem Integrity S2
- mips-tandem-sysv* ) machine=tandem-s2 opsys=usg5-3 ;;
-
- dnl Tektronix XD88
- m88k-tektronix-sysv3* ) machine=tekxd88 opsys=usg5-3 ;;
-
- dnl Tektronix 16000 box (6130?)
- ns16k-tektronix-bsd* ) machine=ns16000 opsys=bsd4-2 ;;
- dnl Tektronix 4300
- dnl src/m/tek4300.h hints that this is a m68k machine.
- m68*-tektronix-bsd* ) machine=tek4300 opsys=bsd4-3 ;;
-
- dnl Titan P2 or P3
- titan-titan-sysv* ) machine=titan opsys=usg5-3 ;;
-
- dnl Ustation E30 (SS5E)
- m68*-unisys-uniplus* ) machine=ustation opsystem=unipl5-2 ;;
-
- dnl Vaxen.
- vax-dec-* )
- case "$ac_cv_build" in
- *-sysv[[01]]* | *-sysvr[[01]]* ) opsys=usg5-0 ;;
- *-sysv2* | *-sysvr2* ) opsys=usg5-2 ;;
- *-mach* ) opsys=mach-bsd4-3 ;;
- esac
- ;;
-
- dnl Whitechapel MG1
- ns16k-whitechapel-* ) machine=mg1 ;;
-
- dnl Wicat
- m68*-wicat-sysv* ) machine=wicat opsys=usg5-2 ;;
-
dnl Intel 386 machines where we do not care about the manufacturer
i[[3-9]]86-*-* )
machine=intel386
case "$ac_cv_build" in
- *-isc1.* | *-isc2.[[01]]* ) opsys=386-ix ;;
- *-isc2.2* ) opsys=isc2-2 ;;
- *-isc4.0* ) opsys=isc4-0 ;;
- *-isc4.* ) opsys=isc4-1
- GCC_TEST_OPTIONS=-posix
- NON_GCC_TEST_OPTIONS=-Xp
- ;;
- *-isc* ) opsys=isc3-0 ;;
- *-esix5* ) opsys=esix5r4 NON_GNU_CPP=/usr/lib/cpp ;;
- *-esix* ) opsys=esix ;;
*-mach* ) opsys=mach-bsd4-3 ;;
- *-xenix* ) opsys=xenix ;;
- *-sco3.2v4* ) opsys=sco4 NON_GNU_CPP=/lib/cpp ;;
- *-bsd386* | *-bsdi1* ) opsys=bsd386 ;;
- *-bsdi4* ) opsys=bsdos4 ;;
- *-bsdi3* ) opsys=bsdos3 ;;
- *-bsdi2.1* ) opsys=bsdos2-1 ;;
- *-bsdi2* ) opsys=bsdos2 ;;
- *-sco3.2v5* ) opsys=sco5 ;;
*-sysv5* ) opsys=sco7 ;;
- *-386bsd* ) opsys=386bsd ;;
*-freebsd* ) opsys=freebsd ;;
- *-nextstep* ) opsys=nextstep ;;
*-pc-cygwin* ) opsys=cygwin32 ;;
*-pc-mingw* ) opsys=mingw32 ;
test -z "$with_tty" && with_tty="no";;
@@ -1764,9 +1417,6 @@
esac
;;
- dnl Linux/68k
- m68k-*-linux* ) machine=m68k opsys=linux ;;
-
esac
dnl Initialize machine from $canonical if not in our database above.
@@ -1832,14 +1482,13 @@
if test -z "$with_dynamic"; then
case "$opsys" in
- hpux* | sunos4* ) with_dynamic=no ;;
+ hpux* ) with_dynamic=no ;;
*) with_dynamic=yes ;;
esac
fi
if test "$with_dynamic" = "yes"; then
case "$opsys" in
- hpux* | sunos4* | sco5 ) opsys="${opsys}-shr" ;;
- decosf* ) ld_call_shared="-call_shared" ;;
+ hpux* ) opsys="${opsys}-shr" ;;
darwin ) AC_DEFINE(DLSYM_NEEDS_UNDERSCORE) ;;
esac
else dnl "$with_dynamic" = "no"
@@ -1849,7 +1498,6 @@
echo "Rerun configure without specifying --without-dynamic."
exit 1 ;;
linux ) ld_call_shared="-Bstatic" ;;
- decosf* ) ld_call_shared="-non_shared" ;;
esac
fi
@@ -2104,15 +1752,11 @@
#ifdef ORDINARY_LINK
#define LD ORDINARY_LD
#else /* no ORDINARY LINK */
-#ifdef COFF_ENCAPSULATE
-#define LD "\$(CC) -nostdlib"
-#else /* not COFF_ENCAPSULATE */
#ifdef LINKER
#define LD LINKER
#else /* ! defined (LINKER) */
#define LD "ld"
#endif /* ! defined (LINKER) */
-#endif /* ! defined (COFF_ENCAPSULATE) */
#endif /* not ORDINARY_LINK */
configure___ ld=LD
@@ -2121,11 +1765,7 @@
#if ! defined (ORDINARY_LINK) && !defined (START_FILES)
#ifdef NO_REMAP
-#ifdef COFF_ENCAPSULATE
-#define START_FILES "pre-crt0.o /usr/local/lib/gcc-crt0.o"
-#else /* ! defined (COFF_ENCAPSULATE) */
#define START_FILES "pre-crt0.o /lib/crt0.o"
-#endif /* ! defined (COFF_ENCAPSULATE) */
#else /* ! defined (NO_REMAP) */
#define START_FILES "ecrt0.o"
#endif /* ! defined (NO_REMAP) */
@@ -2287,9 +1927,6 @@
fi
fi
-
-dnl #### We should be checking C_OPTIMIZE_SWITCH in m/*, s/*.
-
AC_MSG_CHECKING([for preferred optimization flags])
if test "$with_optimization" = "yes" ; then
if test "$cflags_optimization_specified" = "no"; then
@@ -2300,7 +1937,6 @@
elif test "$__SUNPRO_C" = "yes"; then
case "$opsys" in
sol2 ) with_cflags_optimization="-xO4" ;;
- sunos4* ) with_cflags_optimization="-xO2" ;;
esac
elif test "$__DECC" = "yes"; then
with_cflags_optimization="-O3"
@@ -2320,8 +1956,6 @@
AC_MSG_RESULT([${with_cflags_optimization}])
-dnl #### We should be checking C_DEBUG_SWITCH in m/*, s/*.
-
AC_MSG_CHECKING([for preferred debugging flags])
if test "$cflags_debugging_specified" = "no"; then
dnl ### Add optimal debugging support for other compilers HERE!
@@ -2522,22 +2156,6 @@
test -n "$unexec" && test ! "$enable_pdump" = "yes" && XE_ADD_OBJS($unexec)
test "$enable_pdump" = "yes" && XE_ADD_OBJS(dumper.o)
-dnl Dynodump (Solaris 2.x, x<6)
-AC_MSG_CHECKING(for dynodump)
-if test "$unexec" != "unexsol2.o"; then
- AC_MSG_RESULT(no)
-else
- AC_MSG_RESULT(yes)
- AC_DEFINE(DYNODUMP)
- XE_APPEND(dynodump, MAKE_SUBDIR)
- XE_APPEND(dynodump, SRC_SUBDIR_DEPS)
- case "$machine" in
- sparc ) dynodump_arch=sparc ;;
- *86* ) dynodump_arch=i386 ;;
- powerpc ) dynodump_arch=ppc ;;
- esac
-fi
-
dnl Feed s&m crud to src/Makefile
dnl Linux/powerpc needs the following magic for some reason
@@ -2792,7 +2410,7 @@
elif test "$with_dynamic" = "no"; then add_runtime_path=no
elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes
else case "$opsys" in
- sol2 | irix* | *bsd* | decosf* ) add_runtime_path=yes ;;
+ sol2 | irix* | *bsd* ) add_runtime_path=yes ;;
* ) add_runtime_path=no ;;
esac
fi
@@ -2803,7 +2421,7 @@
AC_MSG_CHECKING([for runtime libraries flag])
case "$opsys" in
sol2 ) dash_r="-R" ;;
- decosf* | linux* | irix*) dash_r="-rpath " ;;
+ linux* | irix*) dash_r="-rpath " ;;
*)
dash_r=""
for try_dash_r in "-R" "-R " "-rpath "; do
@@ -3097,12 +2715,6 @@
test "$with_mail_locking" = "locking" -a "$ac_cv_func_locking" != "yes" && \
XE_DIE("locking mail locking requested but not available.")
-case "$opsys" in decosf*)
- AC_CHECK_LIB(pthreads, cma_open)
- test "$ac_cv_lib_pthreads_cma_open" = "yes" && \
- c_switch_site="$c_switch_site -threads" ;;
-esac
-
dnl ----------------------------------------------------------------
dnl Miscellaneous flags
dnl ----------------------------------------------------------------
@@ -3358,11 +2970,6 @@
fi
done
- dnl Avoid version mismatch for shared library libXm.so on osf4
- case "$opsys" in
- decosf*) if test "$GCC" = yes -a -d /usr/shlib; then XE_APPEND(-L/usr/shlib, X_LIBS); fi ;;
- esac
-
ld_switch_x_site="$X_LIBS"
XE_COMPUTE_RUNPATH()
@@ -3683,11 +3290,6 @@
none ) HAVE_X_WINDOWS=no ; echo " Using no window system." ;;
esac
-case "$x_libraries" in *X11R4* )
- test "$opsys" = "hpux9" && opsysfile="s/hpux9-x11r4.h"
- test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h"
-esac
-
dnl Enable or disable proper handling of WM_COMMAND
AC_MSG_CHECKING([for WM_COMMAND option])
dnl if test "$with_wmcommand" = "yes"; then
@@ -5046,7 +4648,6 @@
dnl We used to call AC_FUNC_MMAP here
dnl Instead we now use following, suggested by Neal Becker
AC_MSG_CHECKING(for working mmap)
-case "$opsys" in ultrix* ) have_mmap=no ;; *)
AC_RUN_IFELSE([AC_LANG_SOURCE([#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
@@ -5076,8 +4677,7 @@
return 0;
perror ("conftest: mmap failed");
return 1;
-}])], have_mmap=yes, have_mmap=no) ;;
-esac
+}])], have_mmap=yes, have_mmap=no)
AC_MSG_RESULT($have_mmap)
test "$have_mmap" = "yes" && AC_DEFINE(HAVE_MMAP)
@@ -5879,7 +5479,6 @@
AC_SUBST(native_sound_lib,$with_native_sound_lib)
AC_SUBST(sound_cflags)
AC_SUBST(RANLIB)
-AC_SUBST(dynodump_arch)
AC_SUBST(XEMACS_CC)
AC_SUBST(XE_CFLAGS)
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/Makefile.in.in
--- a/dynodump/Makefile.in.in Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-## Makefile for dynodump subdirectory in XEmacs
-## Copyright (C) 1995 Board of Trustees, University of Illinois
-## Copyright (C) 1996, 1997 Sun Microsystems, Inc.
-## Copyright (C) 2005 Ben Wing.
-
-## This file is part of XEmacs.
-
-## XEmacs is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
-
-## XEmacs is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-## for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with XEmacs; see the file COPYING. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
-
-## Synched up with: Not synched with FSF.
-
-## For performance and consistency, no built-in rules.
-.SUFFIXES:
-.SUFFIXES: .c .o .i .h
-
-@SET_MAKE@
-SHELL = /bin/sh
-RM = rm -f
-
-## ==================== Things "configure" will edit ====================
-
-CC=@CC@
-CFLAGS=@CFLAGS@
-ARCH=@dynodump_arch@
-
-srcdir=@srcdir@
-
-## ========================= start of cpp stuff =========================
-
-#define NO_SHORTNAMES
-#define NOT_C_CODE
-#include "../src/config.h"
-
-#ifdef USE_GNU_MAKE
-vpath %.c @srcdir@
-vpath %.h @srcdir@
-#else
-VPATH=@srcdir@
-#endif
-
-#ifdef USE_GCC
-pic_arg = -fpic
-#else
-pic_arg = -K pic
-#endif
-
-INCLUDES = -I${srcdir} -I${srcdir}/$(ARCH)
-ALL_CFLAGS = ${CFLAGS} ${pic_arg} ${INCLUDES}
-OBJS = _relocate.o dynodump.o syms.o uninit.o
-
-%.o : %.c
- $(CC) -c $(ALL_CFLAGS) $<
-
-all:: dynodump.so
-
-dynodump.so: ${srcdir}/_dynodump.h $(OBJS)
- PATH=/usr/ccs/bin:/bin:$$PATH ld -o dynodump.so -G $(OBJS) -lelf -lmapmalloc
-
-_relocate.o: ${srcdir}/$(ARCH)/_relocate.c
- $(CC) -c $(ALL_CFLAGS) ${srcdir}/$(ARCH)/_relocate.c
-
-uninit.o: ${srcdir}/$(ARCH)/uninit.c
- $(CC) -c $(ALL_CFLAGS) ${srcdir}/$(ARCH)/uninit.c
-
-.PHONY: mostlyclean clean distclean realclean extraclean
-.PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig
-mostlyclean:
- -$(RM) *.o *.i core
-clean: mostlyclean
- -$(RM) *.so *.so.1
-distclean-noconfig: clean
- -$(RM) TAGS
-## This is used in making a distribution.
-## Do not use it on development directories!
-distclean: distclean-noconfig
- -$(RM) GNUmakefile Makefile Makefile.in
-realclean-noconfig: distclean-noconfig
-realclean: distclean
-extraclean-noconfig: realclean-noconfig
- -$(RM) *~ \#*
-extraclean: realclean
- -$(RM) *~ \#*
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/README
--- a/dynodump/README Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
- DYNODUMP
- --------
-
-Dynodump, not to be confused with DinoTurd (as seen in Jurassic Park),
-is a shared object that provides one function:
-
- int dynodump(char *new_file);
-
-dynodump(), called from a running program will write a new executable
-in new_file a la unexec() in GNU Emacs. The difference lies in the
-relocations.
-
-dynodump() will create an image with any relocations (which were
-performed by the run-time dynamic linker) undone. This allows the new
-image to be run in a different environment. There is, however, one
-potentially major caveat. If a symbol reference gets updated during
-the running of the calling program, its updated value will be lost.
-An example (with additional blank lines for legibility):
-
- $ cat lib.c
- char _foo[] = "hello";
- char _bar[] = "world";
-
- $ cc -G -o lib.so lib.c
-
- $ cat prog.c
- extern char _foo, _bar;
-
- int beenhere = 0;
- char * foo = &_foo;
- char * bar = &_bar;
-
- int
- main(void)
- {
- (void) printf("%d: foo = %x\n", beenhere, foo);
- (void) printf("%d: bar = %x, ", beenhere, bar);
-
- if (!beenhere) {
- beenhere = 1;
- bar++;
- dynodump("newfile");
- }
- (void) printf("%x\n", bar);
- }
-
- $ cc -o prog prog.c -R. lib.so dynodump.so
-
- $ ./prog
- 0: foo = ef7503cc
- 0: bar = ef7503d2, ef7503d3
-
- $ ./newfile
- 1: foo = ef7503cc
- 1: bar = ef7503d2, ef7503d2
-
-Notice that in the run of newfile, bar points at "world" instead of
-the perhaps expected "orld".
-
-Dynodump supports sparc, intel, and power pc architectures.
-
-Dynodump is buildable with GNU make and gcc. If it works for you
-with these tools, let me know.
-
-unexec()
---------
-
-Also supplied is an unexsol2.c which belongs in the XEmacs src
-directory with the other unex*.c files. The src/s/sol2.h should be
-have the following added to it:
-
- #ifdef UNEXEC
- #undef UNEXEC
- #endif
- #define UNEXEC unexsol2.o
-
-This unexec() will attempt to dlopen() the dynodump.so to find the
-dynodump function. The default is "../dynodump/dynodump.so" which
-should be appropriate for the typical XEmacs build (unless you used
-configure to set up separate build and source trees). You may change
-it by setting the DYNODUMP environment variable to the full path of
-the dynodump shared object.
-
-Other notes:
-
-If you're using the 4.0 C compiler from Sun, you should arrange to
-shut off the incremental linker. This is done with the -xildoff
-option to the compiler. The common.mk and testsuite/Makefile files
-have commentary and ready made lines for uncommenting for this
-purpose.
-
-If you're interested in playing with the UltraSPARC specific options
-to the aforementioned compiler, then the same makefiles have some
-commentary and flags settings to point you in that direction.
-
-Questions:
-
-dynodump() was developed by Rod.Evans@Eng.Sun.COM and
-Georg.Nikodym@Canada.Sun.COM. If you have questions, feel free to ask
-them but be aware that Rod, "don't know jack about emacs."
-
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/_dynodump.h
--- a/dynodump/_dynodump.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-#pragma ident "@(#) $Id: _dynodump.h,v 1.3 1997/05/29 04:22:29 steve Exp $ - SMI"
-
-#ifndef _DYNODUMP_DOT_H
-#define _DYNODUMP_DOT_H
-
-#include <libelf.h>
-#include "machdep.h"
-
-/* General rounding macro */
-#define S_ROUND(x, a) (((int)(x) + (((int)(a) ? (int)(a) : 1) - 1)) & \
- ~(((int)(a) ? (int)(a) : 1) - 1))
-
-/*
- * Define a cache structure that is used to retain all elf section information.
- */
-typedef struct cache {
- Elf_Scn *c_scn;
- Shdr *c_shdr;
- Elf_Data *c_data;
- char *c_name;
-} Cache;
-
-/*
- * Define any local prototypes.
- */
-extern void update_dynamic(Cache *);
-extern void update_reloc(Cache *, Cache *, Cache *, Cache *, Half shnum);
-extern void update_sym(Cache *, Cache *, Addr);
-extern void dynodump_uninit(void);
-
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/dynodump.c
--- a/dynodump/dynodump.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,560 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-/*
- * dynodump(3x) dumps a running executable into a specified ELF file. The new
- * file consists of the memory contents of the original file together with any
- * heap. This heap is assigned to a new `.heap' section within the new file.
- *
- * The new file may be re-executed, and will contain any data modifications
- * made to the original image up until the time dynodump(3x) was called.
- *
- * The original image may have undergone relocations (performed by ld.so.1)
- * prior to control being transferred to the image. These relocations will
- * reside as the data copied from the image. To prevent subsequent executions
- * of the new image from undergoing the same relocations, any relocation entries
- * (besides copy or jump slot relocations) are nulled out. Note that copy
- * relocations such as required for __iob must be reinitialized each time the
- * process starts, so it is not sufficient to simply null out the .dynamic
- * sections relocation information. The effect of this is that if the new
- * image was bound to definitions in any shared object dependencies, then these
- * dependencies *must* reside in the same location as when dynodump(3x) was
- * called. Any changes to the shared object dependencies of the new image, or
- * uses of such things as LD_PRELOAD, may result in the bindings encoded in the
- * image becoming invalid.
- *
- * The following flags modify the data of the image created:
- *
- * RTLD_SAVREL save the original relocation data. Under this option any
- * relocation offset is reset to contain the same data as was
- * found in the images original file.
- *
- * This option allows relocation information to be retained in the
- * new image so that it may be re-executed when the new image is
- * run. This allows far greater flexibility as the new image can
- * now take advantage of new shared objects.
- *
- * Note. under this mechanism, any data item that undergoes
- * relocation and is then further modified during the execution of
- * the image before dynodump(3x) is called will lose the
- * modification that occurred during the applications execution.
- *
- * N.B. The above commentary is not quite correct in the flags have been hardwired
- * to RTLD_SAVREL.
- */
-#pragma ident "@(#) $Id: dynodump.c,v 1.9 2001/04/13 09:11:20 michaels Exp $ - SMI"
-
-#define __EXTENSIONS__ 1
-
-#include <sys/param.h>
-#include <sys/procfs.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <libelf.h>
-#include <link.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <malloc.h>
-#include "machdep.h"
-#include "_dynodump.h"
-
-/*
- * Generic elf error message generator
- */
-static int
-elferr(const char * str)
-{
- fprintf(stderr, "%s: %s\n", str, elf_errmsg(elf_errno()));
- return (1);
-}
-
-int dynodump (const char * file);
-int
-dynodump(const char * file)
-{
- Elf *ielf, *oelf;
- Ehdr *iehdr, *oehdr;
- Phdr *iphdr, *ophdr, *data_phdr = 0;
- Cache *icache, *ocache, *_icache, *_ocache;
- Cache *data_cache = 0, *shstr_cache = 0;
- Cache *heap_cache = 0;
- Word heap_sz = 0;
- Elf_Scn *scn;
- Shdr *shdr;
- Elf_Data *data, rundata;
- Half ndx, _ndx;
- int fd, _fd;
- Addr edata, _addr;
- char *istrs, *ostrs, *_ostrs, proc[16];
- const char heap[] = ".heap";
- prstatus_t pstat;
-
- /* make a call to the processor specific un-init stuff */
- dynodump_uninit();
-
- /*
- * Obtain a file descriptor for this process,
- * for the executable and get a prstatus_t
- * structure.
- */
- sprintf(proc, "/proc/%ld", getpid());
- if (((_fd = open(proc, O_RDONLY, 0)) == -1) ||
- ((fd = ioctl(_fd, PIOCOPENM, (void *)0)) == -1) ||
- (ioctl(_fd, PIOCSTATUS, &pstat) == -1)) {
- fprintf(stderr, "/proc: initialization error: %s\n",
- strerror(errno));
- close(_fd);
- return (1);
- }
- close(_fd);
-
- /*
- * Initialize with the ELF library and make sure this is an executable
- * ELF file we're dealing with.
- */
- elf_version(EV_CURRENT);
- if ((ielf = elf_begin(fd, ELF_C_READ, NULL)) == NULL) {
- close(fd);
- return (elferr("elf_begin"));
- }
- close(fd);
-
- if ((elf_kind(ielf) != ELF_K_ELF) ||
- ((iehdr = elf_getehdr(ielf)) == NULL) ||
- (iehdr->e_type != ET_EXEC)) {
- fprintf(stderr, "image is not an ELF executable\n");
- elf_end(ielf);
- return (1);
- }
- /*
- * Elf_elf_header(iehdr);
- */
-
- /*
- * Create the new output file.
- */
- if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0777)) == -1) {
- fprintf(stderr, "%s: open failed: %s\n", file,
- strerror(errno));
- elf_end(ielf);
- return (1);
- }
- if ((oelf = elf_begin(fd, ELF_C_WRITE, NULL)) == NULL) {
- elf_end(ielf);
- close(fd);
- return (elferr("elf_begin"));
- }
-
- /*
- * Obtain the input program headers. Remember the data segments
- * program header entry as this will be updated later to reflect the
- * new .heap sections size.
- */
- if ((iphdr = elf_getphdr(ielf)) == NULL)
- return (elferr("elf_getphdr"));
-
- for (ndx = 0, ophdr = iphdr; ndx != iehdr->e_phnum; ndx++, ophdr++) {
- /*
- * Save the program header that contains the NOBITS section, or
- * the last loadable program header if no NOBITS exists.
- * A NOBITS section translates to a memory size requirement that
- * is greater than the file data it is mapped from.
- */
- if (ophdr->p_type == PT_LOAD) {
- if (ophdr->p_filesz != ophdr->p_memsz)
- data_phdr = ophdr;
- else if (data_phdr) {
- if (data_phdr->p_vaddr < ophdr->p_vaddr)
- data_phdr = ophdr;
- } else
- data_phdr = ophdr;
- }
- }
- if (data_phdr == 0) {
- fprintf(stderr, "no data segment found!\n");
- return (0);
- }
-
- /*
- * Obtain the input files section header string table.
- */
- if ((scn = elf_getscn(ielf, iehdr->e_shstrndx)) == NULL)
- return (elferr("elf_getscn"));
- if ((data = elf_getdata(scn, NULL)) == NULL)
- return (elferr("elf_getdata"));
- istrs = (char *) data->d_buf;
-
- /*
- * Construct a cache to maintain the input files section information.
- */
- if ((icache = (Cache *) malloc(iehdr->e_shnum * sizeof (Cache))) == 0) {
- fprintf(stderr, "malloc failed: %s\n", strerror(errno));
- return (1);
- }
- _icache = icache;
- _icache++;
-
- /*
- * Traverse each section from the input file.
- */
- for (ndx = 1, scn = 0;
- (_icache->c_scn = elf_nextscn(ielf, scn));
- ndx++, scn = _icache->c_scn, _icache++) {
-
- if ((_icache->c_shdr = shdr = elf_getshdr(_icache->c_scn)) == NULL)
- return (elferr("elf_getshdr"));
-
- if ((_icache->c_data = elf_getdata(_icache->c_scn, NULL)) == NULL)
- return (elferr("elf_getdata"));
-
- _icache->c_name = istrs + (size_t)(shdr->sh_name);
-
- /*
- * For each section that has a virtual address reestablish the
- * data buffer to point to the memory image.
- *
- * if (shdr->sh_addr)
- * _icache->c_data->d_buf = (void *)shdr->sh_addr;
- */
-
- /*
- * Remember the last section of the data segment, the new .heap
- * section will be added after this section.
- * If we already have one, then set data_cache to the previous
- * section and set heap_cache to this one.
- */
- if ((shdr->sh_addr + shdr->sh_size)
- == (data_phdr->p_vaddr + data_phdr->p_memsz)) {
- if (strcmp(_icache->c_name, heap) == 0) {
-#ifdef DEBUG
- printf("Found a previous .heap section\n");
-#endif
- data_cache = _icache - 1;
- heap_cache = _icache;
- heap_sz = shdr->sh_size;
- } else {
- data_cache = _icache;
- }
- }
-
- /*
- * Remember the section header string table as this will be
- * rewritten with the new .heap name.
- */
- if ((shdr->sh_type == SHT_STRTAB) &&
- ((strcmp(_icache->c_name, ".shstrtab")) == 0))
- shstr_cache = _icache;
- }
- if (data_cache == 0) {
- fprintf(stderr, "final data section not found!\n");
- return (0);
- }
-
- /*
- * Determine the new .heap section to create.
- */
- rundata.d_buf = (void *)(data_cache->c_shdr->sh_addr +
- data_cache->c_shdr->sh_size);
- rundata.d_size = (int)sbrk(0) - (int)rundata.d_buf;
- rundata.d_type = ELF_T_BYTE;
- rundata.d_off = 0;
- rundata.d_align = 1;
- rundata.d_version = EV_CURRENT;
-
- /*
- * From the new data buffer determine the new value for _end and _edata.
- * This will also be used to update the data segment program header.
- *
- * If we had a .heap section, then its size is part of the program
- * headers notion of data size. Because we're only going to output one
- * heap section (ignoring the one in the running binary) we need to
- * subtract the size of that which we're ignoring.
- */
- if (heap_cache) {
- edata = S_ROUND((data_phdr->p_vaddr
- + data_phdr->p_memsz
- - heap_sz), rundata.d_align) + rundata.d_size;
- } else {
- edata = S_ROUND((data_phdr->p_vaddr + data_phdr->p_memsz),
- rundata.d_align) + rundata.d_size;
- }
-
- /*
- * We're now ready to construct the new elf image.
- *
- * Obtain a new elf header and initialize it with any basic information
- * that isn't calculated as part of elf_update(). Bump the section
- * header string table index to account for the .heap section we'll be
- * adding.
- */
- if ((oehdr = elf_newehdr(oelf)) == NULL)
- return (elferr("elf_newehdr"));
-
- oehdr->e_entry = iehdr->e_entry;
- oehdr->e_machine = iehdr->e_machine;
- oehdr->e_type = iehdr->e_type;
- oehdr->e_flags = iehdr->e_flags;
- /*
- * If we already have a heap section, we don't need any adjustment
- */
- if (heap_cache)
- oehdr->e_shstrndx = iehdr->e_shstrndx;
- else
- oehdr->e_shstrndx = iehdr->e_shstrndx + 1;
-
-#ifdef DEBUG
- printf("iehdr->e_flags = %x\n", iehdr->e_flags);
- printf("iehdr->e_entry = %x\n", iehdr->e_entry);
- printf("iehdr->e_shstrndx= %d\n", iehdr->e_shstrndx);
- printf("iehdr->e_machine = %d\n", iehdr->e_machine);
- printf("iehdr->e_type = 0x%x\n", iehdr->e_type);
- printf("oehdr->e_machine = %d\n", oehdr->e_machine);
- printf("oehdr->e_type = 0x%x\n", oehdr->e_type);
-#endif
-
- /*
- * Obtain a new set of program headers. Initialize these with the same
- * information as the input program headers and update the data segment
- * to reflect the new .heap section.
- */
- if ((ophdr = elf_newphdr(oelf, iehdr->e_phnum)) == NULL)
- return (elferr("elf_newphdr"));
-
- for (ndx = 0; ndx != iehdr->e_phnum; ndx++, iphdr++, ophdr++) {
- *ophdr = *iphdr;
- if (data_phdr == iphdr)
- ophdr->p_filesz = ophdr->p_memsz = edata - ophdr->p_vaddr;
- }
-
- /*
- * Obtain a new set of sections.
- */
- _icache = icache;
- _icache++;
- for (ndx = 1; ndx != iehdr->e_shnum; ndx++, _icache++) {
- /*
- * Skip the heap section of the running executable
- */
- if (_icache == heap_cache)
- continue;
- /*
- * Create a matching section header in the output file.
- */
- if ((scn = elf_newscn(oelf)) == NULL)
- return (elferr("elf_newscn"));
- if ((shdr = elf_getshdr(scn)) == NULL)
- return (elferr("elf_getshdr"));
- *shdr = *_icache->c_shdr;
-
- /*
- * Create a matching data buffer for this section.
- */
- if ((data = elf_newdata(scn)) == NULL)
- return (elferr("elf_newdata"));
- *data = *_icache->c_data;
-
- /*
- * For each section that has a virtual address reestablish the
- * data buffer to point to the memory image. Note, we skip
- * the plt section.
- */
- if ((shdr->sh_addr) && (!((shdr->sh_type == SHT_PROGBITS)
- && (strcmp(_icache->c_name, ".plt") == 0))))
- data->d_buf = (void *)shdr->sh_addr;
-
- /*
- * Update any NOBITS section to indicate that it now contains
- * data.
- */
- if (shdr->sh_type == SHT_NOBITS)
- shdr->sh_type = SHT_PROGBITS;
-
- /*
- * Add the new .heap section after the last section of the
- * present data segment. If we had a heap section, then
- * this is the section preceding it.
- */
- if (data_cache == _icache) {
- if ((scn = elf_newscn(oelf)) == NULL)
- return (elferr("elf_newscn"));
- if ((shdr = elf_getshdr(scn)) == NULL)
- return (elferr("elf_getshdr"));
- shdr->sh_type = SHT_PROGBITS;
- shdr->sh_flags = SHF_ALLOC | SHF_WRITE;
-
- if ((data = elf_newdata(scn)) == NULL)
- return (elferr("elf_newdata"));
- *data = rundata;
- }
-
- /*
- * Update the section header string table size to reflect the
- * new section name (only if we didn't already have a heap).
- */
- if (!heap_cache) {
- if (shstr_cache && (shstr_cache == _icache)) {
- data->d_size += sizeof (heap);
- }
- }
- }
-
- /*
- * Write out the new image, and obtain a new elf descriptor that will
- * allow us to write to the new image.
- */
- if (elf_update(oelf, ELF_C_WRITE) == -1)
- return (elferr("elf_update"));
- elf_end(oelf);
- if ((oelf = elf_begin(fd, ELF_C_RDWR, NULL)) == NULL)
- return (elferr("elf_begin"));
- if ((oehdr = elf_getehdr(oelf)) == NULL)
- return (elferr("elf_getehdr"));
-
- /*
- * Obtain the output files section header string table.
- */
- if ((scn = elf_getscn(oelf, oehdr->e_shstrndx)) == NULL)
- return (elferr("elf_getscn"));
- if ((data = elf_getdata(scn, NULL)) == NULL)
- return (elferr("elf_getdata"));
- ostrs = _ostrs = (char *) data->d_buf;
- *_ostrs++ = '\0';
-
- /*
- * Construct a cache to maintain the output files section information.
- */
- if ((ocache = (Cache *)malloc(oehdr->e_shnum * sizeof (Cache))) == 0) {
- fprintf(stderr, "malloc failed: %s\n", strerror(errno));
- return (1);
- }
- _ocache = ocache;
- _ocache++;
- _icache = icache;
- _icache++;
-
- /*
- * Traverse each section from the input file rebuilding the section
- * header string table as we go.
- */
- _ndx = _addr = 0;
- for (ndx = 1, scn = 0;
- (_ocache->c_scn = elf_nextscn(oelf, scn));
- ndx++, scn = _ocache->c_scn, _ocache++, _icache++) {
-
- const char *strs;
-
- if (_icache == heap_cache) {
-#ifdef DEBUG
- printf("ignoring .heap section in input\n");
-#endif
- _icache++;
- }
-
- if ((_ocache->c_shdr = shdr =
- elf_getshdr(_ocache->c_scn)) == NULL)
- return (elferr("elf_getshdr"));
- if ((_ocache->c_data =
- elf_getdata(_ocache->c_scn, NULL)) == NULL)
- return (elferr("elf_getdata"));
-
- /*
- * If were inserting the new .heap section, insert the new
- * section name and initialize its virtual address.
- */
- if (_addr) {
- strs = heap;
- shdr->sh_addr = S_ROUND(_addr, shdr->sh_addralign);
- _addr = 0;
- } else {
- strs = istrs + (size_t)(_icache->c_shdr->sh_name);
- }
-
- strcpy(_ostrs, strs);
- shdr->sh_name = _ostrs - ostrs;
- _ocache->c_name = _ostrs;
- _ostrs += strlen(strs) + 1;
-
- /*
- * If we've inserted a new section any later section may need
- * their sh_link fields updated.
- * If we already had a heap section, then this is not required.
- */
- if (!heap_cache) {
- if (_ndx) {
- if (_ocache->c_shdr->sh_link >= _ndx)
- _ocache->c_shdr->sh_link++;
- }
- }
-
- /*
- * If this is the last section of the original data segment
- * determine sufficient information to initialize the new .heap
- * section which will be obtained next.
- */
- if (data_cache == _icache) {
- _ndx = ndx + 1;
- _addr = shdr->sh_addr + shdr->sh_size;
- _icache--;
- data_cache = 0;
- }
- }
-
- /*
- * Now that we have a complete description of the new image update any
- * sections that are required.
- *
- * o update the value of _edata and _end.
- *
- * o reset any relocation entries if necessary.
- */
- _ocache = &ocache[1];
- _icache = &icache[1];
- for (ndx = 1; ndx < oehdr->e_shnum; ndx++, _ocache++, _icache++) {
- if ((_ocache->c_shdr->sh_type == SHT_SYMTAB) ||
- (_ocache->c_shdr->sh_type == SHT_DYNSYM))
- update_sym(ocache, _ocache, edata);
-
- if (_ocache->c_shdr->sh_type == M_REL_SHT_TYPE)
- update_reloc(ocache, _ocache, icache, _icache, oehdr->e_shnum);
- }
-
- if (elf_update(oelf, ELF_C_WRITE) == -1)
- return (elferr("elf_update"));
-
- elf_end(oelf);
- elf_end(ielf);
- return (0);
-}
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/i386/_relocate.c
--- a/dynodump/i386/_relocate.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-#pragma ident "@(#) $Id: _relocate.c,v 1.3 1997/05/29 04:23:02 steve Exp $ - SMI"
-
-/* LINTLIBRARY */
-
-#include <libelf.h>
-#include <string.h>
-#include <machdep.h>
-#include "_dynodump.h"
-
-void
-update_reloc(Cache *ocache, Cache *_ocache,
- Cache *icache, Cache *_icache,
- Half shnum)
-{
- Shdr *shdr;
- Rel *rels;
- int reln, cnt;
- Cache *orcache, *ircache;
-
- /*
- * Set up to readh the output relocation table.
- */
- shdr = _ocache->c_shdr;
- rels = (Rel *) _ocache->c_data->d_buf;
- reln = shdr->sh_size / shdr->sh_entsize;
-
- /*
- * Determine the section that is being relocated.
- */
- orcache = &ocache[shdr->sh_info];
- shdr = _icache->c_shdr;
- ircache = &icache[shdr->sh_info];
-
- /*
- * Determine the section that is being relocated. Note that for this
- * stupid architecture the .rel.plt actually contains offsets into the
- * .got.
- */
- if (strcmp(_ocache->c_name, ".rel.plt")) {
- orcache = &ocache[shdr->sh_info];
- shdr = _icache->c_shdr;
- ircache = &icache[shdr->sh_info];
- } else {
- Half ndx;
- Cache * __ocache = ocache;
-
- for (__ocache++, ndx = 1; ndx != shnum; ndx++, __ocache++) {
- if (strcmp(__ocache->c_name, ".got") == 0) {
- orcache = __ocache;
- ircache = &icache[ndx];
- break;
- }
- }
- }
-
- /*
- * Loop through the relocation table.
- */
- for (cnt = 0; cnt < reln; cnt++, rels++) {
- unsigned char *iaddr, *oaddr;
- Addr off;
- unsigned char type = ELF_R_TYPE(rels->r_info);
-
- /*
- * Ignore some relocations as these can be safely carried out
- * twice (they simply override any existing data). In fact,
- * some relocations like __iob's copy relocation must be carried
- * out each time the process restarts, otherwise stdio blows up.
- */
- if ((type == R_386_COPY) || (type == R_386_NONE))
- continue;
-
- /*
- * If we are required to restore the relocation location
- * to its value prior to relocation, then read the
- * location's original contents from the input image and
- * copy it to the output image.
- */
- off = rels->r_offset - ircache->c_shdr->sh_addr;
- iaddr = (unsigned char *) ircache->c_data->d_buf + off;
- oaddr = (unsigned char *) orcache->c_data->d_buf + off;
- *(unsigned long *) oaddr = *(unsigned long *) iaddr;
- }
-}
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/i386/machdep.h
--- a/dynodump/i386/machdep.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-#pragma ident "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:02 steve Exp $ - SMI"
-
-/*
- * Global include file for all sgs Intel machine dependent macros, constants
- * and declarations.
- */
-#ifndef MACHDEP_DOT_H
-#define MACHDEP_DOT_H
-
-#include <link.h>
-#include <sys/elf_386.h>
-
-/*
- * Make machine class dependent data types transparent to the common code
- */
-#define Word Elf32_Word
-#define Sword Elf32_Sword
-#define Half Elf32_Half
-#define Addr Elf32_Addr
-#define Off Elf32_Off
-#define Byte unsigned char
-
-#define Ehdr Elf32_Ehdr
-#define Shdr Elf32_Shdr
-#define Sym Elf32_Sym
-#define Rel Elf32_Rel
-#define Phdr Elf32_Phdr
-#define Dyn Elf32_Dyn
-#define Boot Elf32_Boot
-#define Verdef Elf32_Verdef
-#define Verdaux Elf32_Verdaux
-#define Verneed Elf32_Verneed
-#define Vernaux Elf32_Vernaux
-#define Versym Elf32_Versym
-
-/*
- * Make machine class dependent functions transparent to the common code
- */
-#define ELF_R_TYPE ELF32_R_TYPE
-#define ELF_R_INFO ELF32_R_INFO
-#define ELF_R_SYM ELF32_R_SYM
-#define ELF_ST_BIND ELF32_ST_BIND
-#define ELF_ST_TYPE ELF32_ST_TYPE
-#define ELF_ST_INFO ELF32_ST_INFO
-#define elf_fsize elf32_fsize
-#define elf_getehdr elf32_getehdr
-#define elf_getphdr elf32_getphdr
-#define elf_newehdr elf32_newehdr
-#define elf_newphdr elf32_newphdr
-#define elf_getshdr elf32_getshdr
-#define elf_xlatetof elf32_xlatetof
-#define elf_xlatetom elf32_xlatetom
-
-/*
- * Make relocation types transparent to the common code
- */
-#define M_REL_SHT_TYPE SHT_REL /* section header type */
-
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/i386/uninit.c
--- a/dynodump/i386/uninit.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-/*
- * This is where you put processor specific un-initialization things
- * to deal with "initialization idempotency issues".
- */
-
-void
-dynodump_uninit(void)
-{
- return;
-}
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/ppc/_relocate.c
--- a/dynodump/ppc/_relocate.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-#pragma ident "@(#) $Id: _relocate.c,v 1.4 1998/03/31 20:10:55 steve Exp $ - SMI"
-
-/* LINTLIBRARY */
-
-#include <string.h>
-#include <sys/elf_ppc.h>
-#include "_dynodump.h"
-
-
-/*
- * NOTE: These macros will work reliably only on 32-bit 2's
- * complement machines. The type of P in all cases should
- * by unsigned char *
- */
-#if defined(_BIG_ENDIAN)
-
-#define GET4(P) ((long)(((unsigned long)(P)[0] << 24) | \
- ((unsigned long)(P)[1] << 16) | \
- ((unsigned long)(P)[2] << 8) | \
- (unsigned long)(P)[3]))
-#define PUT4(V, P) { \
- (P)[0] = (unsigned char)((V) >> 24); \
- (P)[1] = (unsigned char)((V) >> 16); \
- (P)[2] = (unsigned char)((V) >> 8); \
- (P)[3] = (unsigned char)(V); \
- }
-#define GEThalf(P) ((long) (((unsigned long) (P)[0] << 8) | \
- ((unsigned long) (P)[1])))
-#define GETword(P) GET4(P)
-#define PUThalf(V, P) { \
- (P)[0] = ((V) >> 8); \
- (P)[1] = ((V)); \
- }
-#define PUTword(V, P) PUT4(V, P)
-
-#elif defined(_LITTLE_ENDIAN)
-
-#define GET4(P) ((long)(((unsigned long)(P)[0]) | \
- ((unsigned long)(P)[1] << 8) | \
- ((unsigned long)(P)[2] << 16) | \
- ((unsigned long)(P)[3]) << 24))
-#define PUT4(V, P) { \
- (P)[0] = (unsigned char)(V); \
- (P)[1] = (unsigned char)((V) >> 8); \
- (P)[2] = (unsigned char)((V) >> 16); \
- (P)[3] = (unsigned char)((V) >> 24); \
- }
-#define GEThalf(P) ((long) (((unsigned long) (P)[0]) | \
- ((unsigned long) (P)[1] << 8)))
-#define GETword(P) GET4(P)
-#define PUThalf(V, P) { \
- (P)[0] = (V); \
- (P)[1] = ((V) >> 8); \
- }
-#define PUTword(V, P) PUT4(V, P)
-
-#endif /* defined(_LITTLE_ENDIAN) */
-
-/*
- * NAME VALUE FIELD CALCULATION
- *
- * R_PPC_NONE 0 none none
- * R_PPC_ADDR32 1 word32 S + A
- * R_PPC_ADDR24 2 low24 (S + A) >> 2
- * R_PPC_ADDR16 3 half16 S + A
- * R_PPC_ADDR16_LO 4 half16 #lo(S + A)
- * R_PPC_ADDR16_HI 5 half16 #hi(S + A)
- * R_PPC_ADDR16_HA 6 half16 #ha(S + A)
- * R_PPC_ADDR14 7 low14 (S + A) >> 2
- * R_PPC_ADDR14_BRTAKEN 8 low14 (S + A) >> 2
- * R_PPC_ADDR14_BRNTAKEN 9 low14 (S + A) >> 2
- * R_PPC_REL24 10 low24 (S + A - P) >> 2
- * R_PPC_REL14 11 low14 (S + A - P) >> 2
- * R_PPC_REL14_BRTAKEN 12 low14 (S + A - P) >> 2
- * R_PPC_REL14_BRNTAKEN 13 low14 (S + A - P) >> 2
- * R_PPC_GOT16 14 half16 G + A
- * R_PPC_GOT16_LO 15 half16 #lo(G + A)
- * R_PPC_GOT16_HI 16 half16 #hi(G + A)
- * R_PPC_GOT16_HA 17 half16 #ha(G + A)
- * R_PPC_PLT24 18 low24 (L + A - P) >> 2
- * R_PPC_COPY 19 none none
- * R_PPC_GLOB_DAT 20 word32 S + A
- * R_PPC_JMP_SLOT 21 none see below
- * R_PPC_RELATIVE 22 word32 B + A
- * R_PPC_LOCAL24PC 23 low24 see below
- * R_PPC_UADDR32 24 word32 S + A
- * R_PPC_UADDR16 25 half16 S + A
- *
- * This is Figure 4-3: Relocation Types from the Draft Copy of
- * the ABI, Printed on 7/25/94.
- *
- * The field column specifies how much of the data
- * at the reference address is to be used. The data are assumed to be
- * right-justified with the least significant bit at the right.
- * In the case of plt24 addresses, the reference address is
- * assumed to be that of a 6-word PLT entry. The address is the right-
- * most 24 bits of the third word.
- */
-static void
-move_reloc(unsigned char *iaddr, unsigned char *oaddr, unsigned char type)
-{
- switch(type) {
- case R_PPC_NONE:
- break;
-
- case R_PPC_ADDR32:
- case R_PPC_UADDR32:
- PUTword(GETword(iaddr), oaddr);
- break;
-
- case R_PPC_ADDR24:
- case R_PPC_REL24:
- case R_PPC_PLT24:
- case R_PPC_LOCAL24PC:
- /* XXX - big assumption here that the original contents were masked
- * properly. If this assumption proves correct, then these 24bit
- * cases can be folded into the above 32bit cases.
- */
- PUTword(GETword(iaddr), oaddr);
- break;
-
- case R_PPC_ADDR16:
- case R_PPC_UADDR16:
- case R_PPC_GOT16:
- PUThalf(GEThalf(iaddr), oaddr);
- break;
-
- case R_PPC_ADDR16_LO:
- case R_PPC_GOT16_LO:
- /* XXX - more assumptions which if proved correct, we can
- * do some folding with above cases
- */
- PUThalf(GEThalf(iaddr), oaddr);
- break;
-
- case R_PPC_ADDR16_HI:
- case R_PPC_GOT16_HI:
- /* XXX - more assumptions which if proved correct, we can
- * do some folding with above cases
- */
- PUThalf(GEThalf(iaddr), oaddr);
- break;
-
- case R_PPC_ADDR16_HA:
- case R_PPC_GOT16_HA:
- /* XXX - more assumptions which if proved correct, we can
- * do some folding with above cases
- */
- PUThalf(GEThalf(iaddr), oaddr);
- break;
-
- case R_PPC_ADDR14:
- case R_PPC_ADDR14_BRTAKEN:
- case R_PPC_ADDR14_BRNTAKEN:
- case R_PPC_REL14:
- case R_PPC_REL14_BRTAKEN:
- case R_PPC_REL14_BRNTAKEN:
- /* XXX - big assumption here that the original contents were masked
- * properly. If this assumption proves correct, then these 14bit
- * cases can be folded into the above 32bit cases.
- */
- PUTword(GETword(iaddr), oaddr);
- break;
-
- case R_PPC_COPY:
- break;
-
- case R_PPC_GLOB_DAT:
- case R_PPC_RELATIVE:
- PUTword(GETword(iaddr), oaddr);
- break;
-
- case R_PPC_JMP_SLOT:
- break;
-
- default:
- break;
- }
-}
-
-void
-update_reloc(Cache *ocache, Cache *_ocache, Cache *icache, Cache *_icache, Half shnum)
-{
- Shdr *shdr;
- Rel *rels;
- int reln, cnt;
- Cache *orcache, * ircache;
-
- /*
- * Set up to read the output relocation table.
- */
- shdr = _ocache->c_shdr;
- rels = (Rel *)_ocache->c_data->d_buf;
- reln = shdr->sh_size / shdr->sh_entsize;
-
- /*
- * Determine the section that is being relocated.
- */
- orcache = &ocache[shdr->sh_info];
- shdr = _icache->c_shdr;
- ircache = &icache[shdr->sh_info];
-
- /*
- * Loop through the relocation table.
- */
- for (cnt = 0; cnt < reln; cnt++, rels++) {
- unsigned char type = ELF_R_TYPE(rels->r_info);
-
- /*
- * Ignore some relocations as these can safely be carried out
- * twice (they simply override any existing data). In fact,
- * some relocations like __iob's copy relocation must be carried
- * out each time the process restarts otherwise stdio blows up.
- */
- if ((type == R_PPC_COPY) || (type == R_PPC_JMP_SLOT) ||
- (type == R_PPC_NONE))
- continue;
-
- {
- unsigned char *iaddr, *oaddr;
- Addr off;
-
- /*
- * If we are required to restore the relocation location
- * to its value prior to relocation, then read the
- * locations original contents from the input image and
- * copy it to the output image.
- */
- off = rels->r_offset - ircache->c_shdr->sh_addr;
- iaddr = (unsigned char *)ircache->c_data->d_buf + off;
- oaddr = (unsigned char *)orcache->c_data->d_buf + off;
- move_reloc(iaddr, oaddr, type);
- }
- }
-}
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/ppc/machdep.h
--- a/dynodump/ppc/machdep.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-#pragma ident "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:20 steve Exp $ - SMI"
-
-/*
- * Global include file for all sgs PowerPC machine dependent macros, constants
- * and declarations.
- */
-#ifndef MACHDEP_DOT_H
-#define MACHDEP_DOT_H
-
-#include <link.h>
-#include <sys/elf_ppc.h>
-
-/*
- * Make machine class dependent data types transparent to the common code
- */
-#define Word Elf32_Word
-#define Sword Elf32_Sword
-#define Half Elf32_Half
-#define Addr Elf32_Addr
-#define Off Elf32_Off
-#define Byte unsigned char
-
-#define Ehdr Elf32_Ehdr
-#define Shdr Elf32_Shdr
-#define Sym Elf32_Sym
-#define Rel Elf32_Rela
-#define Phdr Elf32_Phdr
-#define Dyn Elf32_Dyn
-#define Boot Elf32_Boot
-#define Verdef Elf32_Verdef
-#define Verdaux Elf32_Verdaux
-#define Verneed Elf32_Verneed
-#define Vernaux Elf32_Vernaux
-#define Versym Elf32_Versym
-
-/*
- * Make machine class dependent functions transparent to the common code
- */
-#define ELF_R_TYPE ELF32_R_TYPE
-#define ELF_R_INFO ELF32_R_INFO
-#define ELF_R_SYM ELF32_R_SYM
-#define ELF_ST_BIND ELF32_ST_BIND
-#define ELF_ST_TYPE ELF32_ST_TYPE
-#define ELF_ST_INFO ELF32_ST_INFO
-#define elf_fsize elf32_fsize
-#define elf_getehdr elf32_getehdr
-#define elf_getphdr elf32_getphdr
-#define elf_newehdr elf32_newehdr
-#define elf_newphdr elf32_newphdr
-#define elf_getshdr elf32_getshdr
-
-#define M_REL_SHT_TYPE SHT_RELA /* section header type */
-
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/ppc/uninit.c
--- a/dynodump/ppc/uninit.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-/*
- * This is where you put processor specific un-initialization things
- * to deal with "initialization idempotency issues".
- */
-
-extern void __delete_all_module_tags(void);
-extern void __exithandle(void);
-
-void
-dynodump_uninit(void)
-{
- /* There are 2 possible ways to do this. It is not clear which way
- will be blessed by the Sun Gods. Both appear to work. */
-
- /* _exithandle has recently been blessed. */
-
- /* __delete_all_module_tags(); */
- _exithandle();
-
- return;
-}
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/sparc/_relocate.c
--- a/dynodump/sparc/_relocate.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,294 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-/*
- * Update the value of the `_edata' and `_end' symbols.
- */
-#pragma ident "@(#) $Id: _relocate.c,v 1.4 1998/03/31 20:10:55 steve Exp $ - SMI"
-
-#include <libelf.h>
-#include <string.h>
-#include "machdep.h"
-#include "_dynodump.h"
-
-
-#define GETbyte(P) ((long)((unsigned long)(P)[0]))
-#define GEThalf(P) ((long)(((unsigned long)(P)[0] << 8) | \
- ((unsigned long)(P)[1])))
-#define GETword(P) ((long)(((unsigned long)(P)[0] << 24) | \
- ((unsigned long)(P)[1] << 16) | \
- ((unsigned long)(P)[2] << 8) | \
- (unsigned long)(P)[3]))
-#define GETdisp30(P) (GETword(P) & 0x3fffffff)
-#define GETdisp22(P) (GETword(P) & 0x3fffff)
-#define GETdisp16(P) (((GETword(P) & 0x300000) >> 6) | \
- (GETword(P) & 0x3fff))
-#define GETdisp19(P) (GETword(P) & 0x7ffff)
-#define GETimm22(P) (GETword(P) & 0x3fffff)
-#define GETimm5(P) (GEThalf((P)+2) & 0x1f)
-#define GETimm6(P) (GEThalf((P)+2) & 0x2f)
-#define GETimm7(P) (GEThalf((P)+2) & 0x3f)
-#define GETsimm13(P) (GEThalf((P)+2) & 0x1fff)
-#define GETsimm10(P) (GEThalf((P)+2) & 0x3ff)
-#define GETsimm11(P) (GEThalf((P)+2) & 0x7ff)
-#define GETplt22(P) (GETword((P)+8) & 0x3fffff)
-
-#define PUTbyte(V, P) (P)[0] = (V)
-#define PUThalf(V, P) (P)[0] = ((V) >> 8); \
- (P)[1] = ((V))
-#define PUTword(V, P) (P)[0] = (unsigned char)((V) >> 24); \
- (P)[1] = (unsigned char)((V) >> 16); \
- (P)[2] = (unsigned char)((V) >> 8); \
- (P)[3] = (unsigned char)(V)
-#define PUTdisp30(V, P) { \
- unsigned long int temp; \
- temp = GETword(P) & ~0x3fffffff; \
- temp |= ((V) & 0x3fffffff); \
- PUTword(temp, P); \
- }
-#define PUTdisp22(V, P) { \
- unsigned long int temp; \
- temp = GETword(P) & ~0x3fffff; \
- temp |= ((V) & 0x3fffff); \
- PUTword(temp, P); \
- }
-#define PUTimm22(V, P) { \
- unsigned long int temp; \
- temp = GETword(P) & ~0x3fffff; \
- temp |= ((V) & 0x3fffff); \
- PUTword(temp, P); \
- }
-#define PUTimm5(V, P) { \
- unsigned long int temp; \
- temp = GEThalf(P+2) & ~0x1f; \
- temp |= ((V) & 0x1f); \
- PUThalf(temp, (P+2)); \
- }
-#define PUTimm6(V, P) { \
- unsigned long int temp; \
- temp = GEThalf(P+2) & ~0x2f; \
- temp |= ((V) & 0x2f); \
- PUThalf(temp, (P+2)); \
- }
-#define PUTimm7(V, P) { \
- unsigned long int temp; \
- temp = GEThalf(P+2) & ~0x3f; \
- temp |= ((V) & 0x3f); \
- PUThalf(temp, (P+2)); \
- }
-#define PUTsimm13(V, P) { \
- unsigned long int temp; \
- temp = GEThalf(P+2) & ~0x1fff; \
- temp |= ((V) & 0x1fff); \
- PUThalf(temp, (P+2)); \
- }
-#define PUTplt22(V, P) { \
- unsigned long int temp; \
- temp = GETword((P)+8) & ~0x3fffff; \
- temp |= ((V) & 0x3fffff); \
- PUTword(temp, ((P)+8)); \
- }
-#define PUTsimm10(V, P) { \
- unsigned long int temp; \
- temp = GEThalf(P+2) & ~0x3ff; \
- temp |= ((V) & 0x3ff); \
- PUThalf(temp, (P+2)); \
- }
-#define PUTsimm11(V, P) { \
- unsigned long int temp; \
- temp = GEThalf(P+2) & ~0x7ff; \
- temp |= ((V) & 0x7ff); \
- PUThalf(temp, (P+2)); \
- }
-#define PUTdisp16(V, P) { \
- unsigned long int temp; \
- temp = GETword(P) & ~0x303fff; \
- temp |= ((V) & 0xc000) << 6; \
- temp |= ((V) & 0x3fff); \
- PUTword(temp, P); \
- }
-#define PUTdisp19(V, P) { \
- unsigned long int temp; \
- temp = GETword(P) & ~0x7ffff; \
- temp |= ((V) & 0x7ffff); \
- PUTword(temp, P); \
- }
-
-static void
-move_reloc(unsigned char * iaddr, unsigned char * oaddr, unsigned char type)
-{
- switch (type) {
- case R_SPARC_8:
- case R_SPARC_DISP8:
- PUTbyte(GETbyte(iaddr), oaddr);
- break;
-
- case R_SPARC_16:
- case R_SPARC_DISP16:
- PUThalf(GEThalf(iaddr), oaddr);
- break;
-
- case R_SPARC_32:
- case R_SPARC_DISP32:
- case R_SPARC_GLOB_DAT:
- case R_SPARC_RELATIVE:
- case R_SPARC_UA32:
- PUTword(GETword(iaddr), oaddr);
- break;
-
- case R_SPARC_WDISP30:
- case R_SPARC_WPLT30:
- PUTdisp30(GETdisp30(iaddr), oaddr);
- break;
-
- case R_SPARC_WDISP22:
- case R_SPARC_PC22:
- PUTdisp22(GETdisp22(iaddr), oaddr);
- break;
-
- case R_SPARC_HI22:
- case R_SPARC_GOT22:
- case R_SPARC_22:
- PUTimm22(GETimm22(iaddr), oaddr);
- break;
-
- case R_SPARC_13:
- case R_SPARC_GOT13:
- PUTsimm13(GETsimm13(iaddr), oaddr);
- break;
-
- case R_SPARC_LO10:
- case R_SPARC_GOT10:
- case R_SPARC_PC10:
-#ifdef R_SPARC_10
- case R_SPARC_10:
-#endif
- PUTsimm10(GETsimm10(iaddr), oaddr);
- break;
-
-#ifdef R_SPARC_11
- case R_SPARC_11:
- PUTsimm11(GETsimm11(iaddr), oaddr);
- break;
-#endif
-
-#ifdef R_SPARC_WDISP16
- case R_SPARC_WDISP16:
- PUTdisp16(GETdisp16(iaddr), oaddr);
- break;
-#endif
-
-#ifdef R_SPARC_WDISP19
- case R_SPARC_WDISP19:
- PUTdisp19(GETdisp19(iaddr), oaddr);
- break;
-#endif
-
-#ifdef R_SPARC_5
- case R_SPARC_5:
- PUTimm5(GETimm5(iaddr), oaddr);
- break;
-#endif
-
-#ifdef R_SPARC_6
- case R_SPARC_6:
- PUTimm6(GETimm6(iaddr), oaddr);
- break;
-#endif
-
-#ifdef R_SPARC_7
- case R_SPARC_7:
- PUTimm7(GETimm7(iaddr), oaddr);
- break;
-#endif
-
- default:
- break;
- }
-}
-
-void
-update_reloc(Cache *ocache, Cache *_ocache,
- Cache *icache, Cache *_icache,
- Half shnum)
-{
- Shdr *shdr;
- Rel *rels;
- int reln, cnt;
- Cache *orcache, *ircache;
-
- /*
- * Set up to read the output relocation table.
- */
- shdr = _ocache->c_shdr;
- rels = (Rel *)_ocache->c_data->d_buf;
- reln = shdr->sh_size / shdr->sh_entsize;
-
- /*
- * Determine the section that is being relocated.
- */
- orcache = &ocache[shdr->sh_info];
- shdr = _icache->c_shdr;
- ircache = &icache[shdr->sh_info];
-
- /*
- * Loop through the relocation table.
- */
- for (cnt = 0; cnt < reln; cnt++, rels++) {
- unsigned char *iaddr, *oaddr;
- Addr off;
- unsigned char type = ELF_R_TYPE(rels->r_info);
-
- /*
- * Ignore some relocations as these can safely be carried out
- * twice (they simply override any existing data). In fact,
- * some relocations like __iob's copy relocation must be carried
- * out each time the process restarts otherwise stdio blows up.
- */
- if ((type == R_SPARC_COPY) || (type == R_SPARC_JMP_SLOT) ||
- (type == R_SPARC_NONE))
- continue;
-
- /*
- * If we are required to restore the relocation location
- * to its value prior to relocation, then read the
- * locations original contents from the input image and
- * copy it to the output image.
- */
- off = rels->r_offset - ircache->c_shdr->sh_addr;
- iaddr = (unsigned char *)ircache->c_data->d_buf + off;
- oaddr = (unsigned char *)orcache->c_data->d_buf + off;
- move_reloc(iaddr, oaddr, type);
- }
-}
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/sparc/machdep.h
--- a/dynodump/sparc/machdep.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-#pragma ident "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:26 steve Exp $ - SMI"
-
-/*
- * Global include file for all sgs SPARC machine dependent macros, constants
- * and declarations.
- */
-#ifndef MACHDEP_DOT_H
-#define MACHDEP_DOT_H
-
-#include <link.h>
-#include <sys/elf_SPARC.h>
-
-/*
- * Make machine class dependent data types transparent to the common code
- */
-#define Word Elf32_Word
-#define Sword Elf32_Sword
-#define Half Elf32_Half
-#define Addr Elf32_Addr
-#define Off Elf32_Off
-#define Byte unsigned char
-
-#define Ehdr Elf32_Ehdr
-#define Shdr Elf32_Shdr
-#define Sym Elf32_Sym
-#define Rel Elf32_Rela
-#define Phdr Elf32_Phdr
-#define Dyn Elf32_Dyn
-#define Boot Elf32_Boot
-#define Verdef Elf32_Verdef
-#define Verdaux Elf32_Verdaux
-#define Verneed Elf32_Verneed
-#define Vernaux Elf32_Vernaux
-#define Versym Elf32_Versym
-
-/*
- * Make machine class dependent functions transparent to the common code
- */
-#define ELF_R_TYPE ELF32_R_TYPE
-#define ELF_R_INFO ELF32_R_INFO
-#define ELF_R_SYM ELF32_R_SYM
-#define ELF_ST_BIND ELF32_ST_BIND
-#define ELF_ST_TYPE ELF32_ST_TYPE
-#define ELF_ST_INFO ELF32_ST_INFO
-#define elf_fsize elf32_fsize
-#define elf_getehdr elf32_getehdr
-#define elf_getphdr elf32_getphdr
-#define elf_newehdr elf32_newehdr
-#define elf_newphdr elf32_newphdr
-#define elf_getshdr elf32_getshdr
-
-/*
- * Make relocation types transparent to the common code
- */
-#define M_REL_SHT_TYPE SHT_RELA /* section header type */
-
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/sparc/uninit.c
--- a/dynodump/sparc/uninit.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-/*
- * This is where you put processor specific un-initialization things
- * to deal with "initialization idempotency issues".
- */
-
-void dynodump_uninit(void);
-void
-dynodump_uninit(void)
-{
- return;
-}
diff -r 75975fd0b7fc -r aa5ed11f473b dynodump/syms.c
--- a/dynodump/syms.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1995 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * This source code is a product of Sun Microsystems, Inc. and is provided
- * for unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part. Users
- * may copy or modify this source code without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
- * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
- * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT
- * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN
- * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
- * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
- *
- * This source code is provided with no support and without any obligation on
- * the part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
- * SOURCE CODE OR ANY PART THEREOF.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California 94043
- */
-
-/*
- * Update the value of the `_edata' and `_end' symbols.
- */
-#pragma ident "@(#) $Id: syms.c,v 1.3 1997/05/29 04:22:30 steve Exp $ - SMI"
-
-#include <libelf.h>
-#include <string.h>
-#include "machdep.h"
-#include "_dynodump.h"
-
-void
-update_sym(Cache * cache, Cache * _cache, Addr edata)
-{
- char *strs;
- Sym *syms;
- Shdr *shdr;
- int symn, cnt;
-
- /*
- * Set up to read the symbol table and its associated string table.
- */
- shdr = _cache->c_shdr;
- syms = (Sym *) _cache->c_data->d_buf;
- symn = shdr->sh_size / shdr->sh_entsize;
-
- strs = (char *) cache[shdr->sh_link].c_data->d_buf;
-
- /*
- * Loop through the symbol table looking for `_end' and `_edata'.
- */
- for (cnt = 0; cnt < symn; cnt++, syms++) {
- char *name = strs + syms->st_name;
-
- if (strcmp(name, "_end") && strcmp(name, "_edata"))
- continue;
-
- syms->st_value = edata;
- }
-}
diff -r 75975fd0b7fc -r aa5ed11f473b lib-src/ChangeLog
--- a/lib-src/ChangeLog Wed Nov 18 22:44:28 2009 +0900
+++ b/lib-src/ChangeLog Wed Nov 18 08:49:14 2009 -0700
@@ -1,3 +1,12 @@
+2009-11-10 Jerry James <james@xemacs.org>
+
+ * fakemail.c (MAIL_PROGRAM_NAME): No s&m files define this now, so
+ make it unconditional.
+ (main): Make mail_program_name const, since it is never read, and drop
+ a bogus cast as a result.
+ * gnuclient.c (main): Remove reference to hp9000s300.
+ * gnuserv.h: BSD4_1 is not defined on any supported system.
+
2009-10-26 Jerry James <james@xemacs.org>
* insert-data-in-exec.c: Add BSD header, with permission of
diff -r 75975fd0b7fc -r aa5ed11f473b lib-src/fakemail.c
--- a/lib-src/fakemail.c Wed Nov 18 22:44:28 2009 +0900
+++ b/lib-src/fakemail.c Wed Nov 18 08:49:14 2009 -0700
@@ -131,10 +131,7 @@
#define MY_NAME "fakemail"
#define NIL ((line_list) NULL)
#define INITIAL_LINE_SIZE 200
-
-#ifndef MAIL_PROGRAM_NAME
#define MAIL_PROGRAM_NAME "/bin/mail"
-#endif
static const char *my_name;
static char *the_date;
@@ -633,14 +630,14 @@
char *command_line;
header the_header;
long name_length;
- char *mail_program_name;
+ const char *mail_program_name;
char buf[BUFLEN + 1];
register int size;
FILE *the_pipe;
mail_program_name = getenv ("FAKEMAILER");
if (!(mail_program_name && *mail_program_name))
- mail_program_name = (char *) MAIL_PROGRAM_NAME;
+ mail_program_name = MAIL_PROGRAM_NAME;
name_length = strlen (mail_program_name);
my_name = MY_NAME;
diff -r 75975fd0b7fc -r aa5ed11f473b lib-src/gnuclient.c
--- a/lib-src/gnuclient.c Wed Nov 18 22:44:28 2009 +0900
+++ b/lib-src/gnuclient.c Wed Nov 18 08:49:14 2009 -0700
@@ -596,7 +596,7 @@
strncpy (remotepath, ptr, QXE_PATH_MAX);
}
#if 0 /* This is really bogus... re-enable it if you must have it! */
-#if defined (hp9000s300) || defined (hp9000s800)
+#if defined (hp9000s800)
else if (strcmp (thishost,hostarg))
{ /* try /net/thishost */
strcpy (remotepath, "/net/"); /* (this fails using internet
diff -r 75975fd0b7fc -r aa5ed11f473b lib-src/gnuserv.h
--- a/lib-src/gnuserv.h Wed Nov 18 22:44:28 2009 +0900
+++ b/lib-src/gnuserv.h Wed Nov 18 08:49:14 2009 -0700
@@ -169,11 +169,9 @@
*/
#ifndef DONT_USE_LITOUT
#if !defined(HAVE_TERMIO) && !defined(HAVE_TERMIOS) && !defined(VMS)
-#if !defined(BSD4_1)
#define USE_LITOUT
#endif
#endif
-#endif
#define HOSTNAMSZ 255 /* max size of a hostname */
diff -r 75975fd0b7fc -r aa5ed11f473b lisp/ChangeLog
--- a/lisp/ChangeLog Wed Nov 18 22:44:28 2009 +0900
+++ b/lisp/ChangeLog Wed Nov 18 08:49:14 2009 -0700
@@ -1,3 +1,18 @@
+2009-11-10 Jerry James <james@xemacs.org>
+
+ * device.el (device-type): Remove (mostly imaginary) support for
+ NeXTstep.
+ * font.el (font-window-system-mappings): Ditto.
+ (ns-font-weight-mappings): Remove, unused.
+ (ns-font-families-for-device): Ditto.
+ (ns-font-create-name): Ditto.
+ * frame.el (make-frame-on-device): Ditto.
+ (frame-type): Ditto.
+ (display-mouse-p): Remove reference to NeXTstep in a comment.
+ * paths.el (initialize-xemacs-paths): Remove support for old Ultrix,
+ but still look in standard paths for mh. Also remove support for old
+ SCO Unix, Bull DPX/2, Data General Unix, RTU, and Unisoft Unix.
+
2009-11-15 Aidan Kehoe <kehoea@parhasard.net>
* custom.el (custom-quote):
diff -r 75975fd0b7fc -r aa5ed11f473b lisp/device.el
--- a/lisp/device.el Wed Nov 18 22:44:28 2009 +0900
+++ b/lisp/device.el Wed Nov 18 08:49:14 2009 -0700
@@ -53,7 +53,6 @@
Value is `tty' for a tty device (a character-only terminal),
`x' for a device that is a screen on an X display,
`gtk' for a device that is a GTK connection.
-`ns' for a device that is a NeXTstep connection (not yet implemented),
`mswindows' for a device that is a MS Windows workstation,
`msprinter' for a device that is a MS Windows printer connection,
`stream' for a stream device (which acts like a stdio stream), and
diff -r 75975fd0b7fc -r aa5ed11f473b lisp/font.el
--- a/lisp/font.el Wed Nov 18 22:44:28 2009 +0900
+++ b/lisp/font.el Wed Nov 18 08:49:14 2009 -0700
@@ -112,7 +112,6 @@
(gtk . (x-font-create-name x-font-create-object))
;; #### FIXME should this handle fontconfig font objects?
(fc . (fc-font-create-name fc-font-create-object))
- (ns . (ns-font-create-name ns-font-create-object))
(mswindows . (mswindows-font-create-name mswindows-font-create-object))
(pm . (x-font-create-name x-font-create-object)) ; Change? FIXME
;; #### what is this bogosity?
@@ -122,18 +121,6 @@
The first function creates a font name from a font descriptor object.
The second performs the reverse translation.")
-(defconst ns-font-weight-mappings
- '((:extra-light . "extralight")
- (:light . "light")
- (:demi-light . "demilight")
- (:medium . "medium")
- (:normal . "medium")
- (:demi-bold . "demibold")
- (:bold . "bold")
- (:extra-bold . "extrabold"))
- "An assoc list mapping keywords to actual NeXTstep specific
-information to use")
-
(defconst x-font-weight-mappings
'((:extra-light . "extralight")
(:light . "light")
@@ -848,66 +835,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; The window-system dependent code (NS-style)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defun ns-font-families-for-device (&optional device no-resetp)
- ;; For right now, assume we are going to have the same storage for
- ;; device fonts for NS as we do for X. Is this a valid assumption?
- (or device (setq device (selected-device)))
- (if (boundp 'device-fonts-cache)
- (let ((menu (or (cdr-safe (assq device device-fonts-cache)))))
- (if (and (not menu) (not no-resetp))
- (progn
- (reset-device-font-menus device)
- (ns-font-families-for-device device t))
- (let ((scaled (mapcar #'(lambda (x) (if x (aref x 0)))
- (aref menu 0)))
- (normal (mapcar #'(lambda (x) (if x (aref x 0)))
- (aref menu 1))))
- (sort (delete-duplicates (nconc scaled normal) :test #'equal)
- 'string-lessp))))))
-
-(defun ns-font-create-name (fontobj &optional device)
- "Return a font name constructed from FONTOBJ, appropriate for NextSTEP devices."
- (let ((family (or (font-family fontobj)
- (ns-font-families-for-device device)))
- (weight (or (font-weight fontobj) :medium))
- (style (or (font-style fontobj) (list :normal)))
- (size (font-size fontobj)))
- ;; Create a font, wow!
- (if (stringp family)
- (setq family (list family)))
- (if (or (symbolp style) (numberp style))
- (setq style (list style)))
- (setq weight (font-higher-weight weight (car-safe (memq :bold style))))
- (if (stringp size)
- (setq size (font-spatial-to-canonical size device)))
- (setq weight (or (cdr-safe (assq weight ns-font-weight-mappings))
- "medium"))
- (let ((done nil) ; Did we find a good font yet?
- (font-name nil) ; font name we are currently checking
- (cur-family nil) ; current family we are checking
- )
- (while (and family (not done))
- (setq cur-family (car family)
- family (cdr family))
- (if (assoc cur-family font-x-family-mappings)
- ;; If the family name is an alias as defined by
- ;; font-x-family-mappings, then append those families
- ;; to the front of 'family' and continue in the loop.
- ;; #### jhar: I don't know about ns font names, so using X mappings
- (setq family (append
- (cdr-safe (assoc cur-family
- font-x-family-mappings))
- family))
- ;; CARL: Need help here - I am not familiar with the NS font
- ;; model
- (setq font-name "UNKNOWN FORMULA GOES HERE"
- done (try-font-name font-name device))))
- (if done font-name))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; The window-system dependent code (mswindows-style)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff -r 75975fd0b7fc -r aa5ed11f473b lisp/frame.el
--- a/lisp/frame.el Wed Nov 18 22:44:28 2009 +0900
+++ b/lisp/frame.el Wed Nov 18 08:49:14 2009 -0700
@@ -642,8 +642,6 @@
and output (usually the TTY in which XEmacs started). Only
if support for TTY's was compiled into XEmacs.
gtk A GTK device.
-ns A connection to a machine running the NeXTstep windowing
- system. Not currently implemented.
mswindows A connection to a machine running Microsoft Windows NT or
Windows 95/97.
pc A direct-write MS-DOS frame. Not currently implemented.
@@ -869,7 +867,6 @@
This is equivalent to the type of the frame's device.
Value is `tty' for a tty frame (a character-only terminal),
`x' for a frame that is an X window,
-`ns' for a frame that is a NeXTstep window (not yet implemented),
`mswindows' for a frame that is a MS Windows desktop window,
`msprinter' for a frame that is a MS Windows print job,
`stream' for a stream frame (which acts like a stdio stream), and
@@ -1186,8 +1183,7 @@
((eq 'mswindows type)
(> (declare-boundp mswindows-num-mouse-buttons) 0))
((device-on-window-system-p display)
- ;; We assume X, NeXTstep, and GTK and the rest always have a pointing
- ;; device.
+ ;; We assume X, GTK and the rest always have a pointing device.
t)
((eq 'tty type)
(and-fboundp 'gpm-is-supported-p
diff -r 75975fd0b7fc -r aa5ed11f473b lisp/paths.el
--- a/lisp/paths.el Wed Nov 18 22:44:28 2009 +0900
+++ b/lisp/paths.el Wed Nov 18 08:49:14 2009 -0700
@@ -150,34 +150,25 @@
(funcall
l 'mh-progs
- (cond ((file-directory-p "/usr/bin/mh") "/usr/bin/mh/") ;Ultrix 4.2
- ((file-directory-p "/usr/new/mh") "/usr/new/mh/") ;Ultrix <4.2
+ (cond ((file-directory-p "/usr/bin/mh") "/usr/bin/mh/")
((file-directory-p "/usr/local/bin/mh") "/usr/local/bin/mh/")
((file-directory-p "/usr/local/mh") "/usr/local/mh/")
(t "/usr/local/bin/")))
(funcall
l 'mh-libs
- (cond ((file-directory-p "/usr/lib/mh") "/usr/lib/mh/") ;Ultrix 4.2
- ((file-directory-p "/usr/new/lib/mh")
- "/usr/new/lib/mh/") ;Ultrix <4.2
+ (cond ((file-directory-p "/usr/lib/mh") "/usr/lib/mh/")
((file-directory-p "/usr/local/lib/mh") "/usr/local/lib/mh/")
(t "/usr/local/bin/mh/")))
(funcall
l 'rmail-spool-directory
- (cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration)
- "/usr/spool/mail/")
- ;; On The Bull DPX/2 /usr/spool/mail is used although
- ;; it is usg-unix-v.
- ((string-match "^m68k-bull-sysv3" system-configuration)
- "/usr/spool/mail/")
- ;; SVR4 and recent BSD are said to use this.
+ (cond ;; SVR4 and recent BSD are said to use this.
;; Rather than trying to know precisely which systems use it,
;; let's assume this dir is never used for anything else.
((file-exists-p "/var/mail")
"/var/mail/")
- ((memq system-type '(dgux hpux usg-unix-v unisoft-unix rtu irix))
+ ((memq system-type '(hpux usg-unix-v irix))
"/usr/mail/")
((memq system-type '(linux))
"/var/spool/mail/")
diff -r 75975fd0b7fc -r aa5ed11f473b lwlib/ChangeLog
--- a/lwlib/ChangeLog Wed Nov 18 22:44:28 2009 +0900
+++ b/lwlib/ChangeLog Wed Nov 18 08:49:14 2009 -0700
@@ -1,3 +1,7 @@
+2009-11-10 Jerry James <james@xemacs.org>
+
+ * lwlib.c: Drop workaround for old NeXT systems.
+
2009-05-18 Stephen J. Turnbull <stephen@xemacs.org>
* XEmacs 21.5.29 "garbanzo" is released.
diff -r 75975fd0b7fc -r aa5ed11f473b lwlib/lwlib.c
--- a/lwlib/lwlib.c Wed Nov 18 22:44:28 2009 +0900
+++ b/lwlib/lwlib.c Wed Nov 18 08:49:14 2009 -0700
@@ -19,10 +19,6 @@
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifdef NeXT
-#undef __STRICT_BSD__ /* ick */
-#endif
-
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
diff -r 75975fd0b7fc -r aa5ed11f473b man/ChangeLog
--- a/man/ChangeLog Wed Nov 18 22:44:28 2009 +0900
+++ b/man/ChangeLog Wed Nov 18 08:49:14 2009 -0700
@@ -1,3 +1,19 @@
+2009-11-10 Jerry James <james@xemacs.org>
+
+ * internals/internals.texi (XEmacs from the Perspective of Building):
+ Remove reference to dynodump.
+ (A Summary of the Various XEmacs Modules): Remove references to
+ deleted files.
+ (Low-Level Modules): Ditto.
+ (Modules for the Basic Displayable Lisp Objects): Remove reference to
+ NeXTstep.
+ * lispref/os.texi (Operating System Environment): Remove references to
+ old unsupported systems.
+ * make-stds.texi (Variables for Installation Directories): Likely
+ insufficient update to list of current operating systems.
+ * xemacs-faq.texi (Q1.2.2: What versions of Unix does XEmacs run on?):
+ Ditto.
+
2009-10-05 Jerry James <james@xemacs.org>
* beta.texi (Building XEmacs from a full distribution): Remove
diff -r 75975fd0b7fc -r aa5ed11f473b man/internals/internals.texi
--- a/man/internals/internals.texi Wed Nov 18 22:44:28 2009 +0900
+++ b/man/internals/internals.texi Wed Nov 18 08:49:14 2009 -0700
@@ -2635,9 +2635,6 @@
used when you enter the Info system using @kbd{C-h i} or through the
Help menu.
-The @file{dynodump/} directory contains auxiliary code used to build
-XEmacs on Solaris platforms.
-
The other directories contain various miscellaneous code and information
that is not normally used or needed.
@@ -2860,7 +2857,6 @@
@item @file{bitmaps.h} @tab @ref{Modules for other Display-Related Lisp Objects}.
@item @file{blocktype.c} @tab @ref{Low-Level Modules}.
@item @file{blocktype.h} @tab @ref{Low-Level Modules}.
-@item @file{broken-sun.h} @tab @ref{Modules for Interfacing with the Operating System}.
@item @file{buffer.c} @tab @ref{Modules for Standard Editing Operations}.
@item @file{buffer.h} @tab @ref{Modules for Standard Editing Operations}.
@item @file{bufslots.h} @tab @ref{Modules for Standard Editing Operations}.
@@ -3021,7 +3017,6 @@
@item @file{hash-table-tests.el} @tab @ref{Modules for Regression Testing}.
@item @file{hash.c} @tab @ref{Modules for Other Aspects of the Lisp Interpreter and Object System}.
@item @file{hash.h} @tab @ref{Modules for Other Aspects of the Lisp Interpreter and Object System}.
-@item @file{hftctl.c} @tab @ref{Modules for Interfacing with the Operating System}.
@item @file{hpplay.c} @tab @ref{Modules for Interfacing with the Operating System}.
@item @file{imgproc.c} @tab
@item @file{imgproc.h} @tab
@@ -3088,7 +3083,6 @@
@item @file{nas.c} @tab @ref{Modules for Interfacing with the Operating System}.
@item @file{native-gtk-toolbar.c} @tab
@item @file{ndir.h} @tab @ref{Modules for Interfacing with the File System}.
-@item @file{nsselect.m} @tab
@item @file{nt.c} @tab
@item @file{ntheap.c} @tab
@item @file{ntplay.c} @tab
@@ -3173,10 +3167,7 @@
@item @file{specifier.h} @tab @ref{Modules for Other Aspects of the Lisp Interpreter and Object System}.
@item @file{src-headers} @tab
@item @file{strcat.c} @tab
-@item @file{strcmp.c} @tab @ref{Modules for Interfacing with the Operating System}.
-@item @file{strcpy.c} @tab @ref{Modules for Interfacing with the Operating System}.
@item @file{strftime.c} @tab
-@item @file{sunOS-fix.c} @tab @ref{Modules for Interfacing with the Operating System}.
@item @file{sunplay.c} @tab @ref{Modules for Interfacing with the Operating System}.
@item @file{sunpro.c} @tab @ref{Modules for Interfacing with the Operating System}.
@item @file{symbol-tests.el} @tab @ref{Modules for Regression Testing}.
@@ -3223,25 +3214,12 @@
@item @file{undo.c} @tab @ref{Modules for Standard Editing Operations}.
@item @file{unexaix.c} @tab @ref{Low-Level Modules}.
@item @file{unexalpha.c} @tab @ref{Low-Level Modules}.
-@item @file{unexapollo.c} @tab @ref{Low-Level Modules}.
-@item @file{unexconvex.c} @tab @ref{Low-Level Modules}.
@item @file{unexcw.c} @tab
@item @file{unexec.c} @tab @ref{Low-Level Modules}.
@item @file{unexelf.c} @tab @ref{Low-Level Modules}.
-@item @file{unexelfsgi.c} @tab @ref{Low-Level Modules}.
-@item @file{unexencap.c} @tab @ref{Low-Level Modules}.
-@item @file{unexenix.c} @tab @ref{Low-Level Modules}.
-@item @file{unexfreebsd.c} @tab @ref{Low-Level Modules}.
-@item @file{unexfx2800.c} @tab @ref{Low-Level Modules}.
-@item @file{unexhp9k3.c} @tab @ref{Low-Level Modules}.
@item @file{unexhp9k800.c} @tab @ref{Low-Level Modules}.
-@item @file{unexmips.c} @tab @ref{Low-Level Modules}.
-@item @file{unexnext.c} @tab @ref{Low-Level Modules}.
@item @file{unexnt.c} @tab
-@item @file{unexsni.c} @tab
@item @file{unexsol2-6.c} @tab
-@item @file{unexsol2.c} @tab @ref{Low-Level Modules}.
-@item @file{unexsunos4.c} @tab @ref{Low-Level Modules}.
@item @file{unicode.c} @tab
@item @file{universe.h} @tab @ref{Low-Level Modules}.
@item @file{vm-limit.c} @tab @ref{Low-Level Modules}.
@@ -3385,21 +3363,9 @@
@example
@file{unexaix.c}
@file{unexalpha.c}
-@file{unexapollo.c}
-@file{unexconvex.c}
@file{unexec.c}
@file{unexelf.c}
-@file{unexelfsgi.c}
-@file{unexencap.c}
-@file{unexenix.c}
-@file{unexfreebsd.c}
-@file{unexfx2800.c}
-@file{unexhp9k3.c}
@file{unexhp9k800.c}
-@file{unexmips.c}
-@file{unexnext.c}
-@file{unexsol2.c}
-@file{unexsunos4.c}
@end example
These modules contain code dumping out the XEmacs executable on various
@@ -4350,27 +4316,6 @@
-@example
-@file{broken-sun.h}
-@file{strcmp.c}
-@file{strcpy.c}
-@file{sunOS-fix.c}
-@end example
-
-These files provide replacement functions and prototypes to fix numerous
-bugs in early releases of SunOS 4.1.
-
-
-
-@example
-@file{hftctl.c}
-@end example
-
-This module provides some terminal-control code necessary on versions of
-AIX prior to 4.1.
-
-
-
@node The Build Configuration System, Rules When Writing New C Code, The Modules of XEmacs, Top
@chapter The Build Configuration System
@cindex build configuration
@@ -17674,7 +17619,7 @@
services for not only device operations but also for the frame, window,
menubar, scrollbar, toolbar, and other displayable-object subsystems.
The reason for this is that all of these subsystems have the same
-subtypes (X, TTY, NeXTstep, Microsoft Windows, etc.) as devices do.
+subtypes (X, TTY, Microsoft Windows, etc.) as devices do.
@strong{This abstraction is probably broken} (as of late 2004), at least
for X consoles, with the advent of the @strong{Xft} library. Xft is a
diff -r 75975fd0b7fc -r aa5ed11f473b man/lispref/os.texi
--- a/man/lispref/os.texi Wed Nov 18 22:44:28 2009 +0900
+++ b/man/lispref/os.texi Wed Nov 18 08:49:14 2009 -0700
@@ -561,47 +561,38 @@
system XEmacs is operating on. Here is a table of the possible values:
@table @code
-@item aix-v3
-AIX.
+@item aix
+AIX 4.2 or later.
@item berkeley-unix
Berkeley BSD.
-@item dgux
-Data General DGUX operating system.
+@item cygwin32
+Cygwin.
+
+@item darwin
+Mac OS X.
@item gnu
A GNU system using the GNU HURD and Mach.
@item hpux
-Hewlett-Packard HPUX operating system.
+Hewlett-Packard HPUX operating system, version 11.0 or later.
@item irix
-Silicon Graphics Irix system.
+Silicon Graphics Irix system, version 6.0 or later.
@item linux
A GNU system using the Linux kernel.
-@item ms-dos
-Microsoft MS-DOS ``operating system.''
-
-@item next-mach
-NeXT Mach-based system.
-
-@item rtu
-Masscomp RTU, UCB universe.
-
-@item unisoft-unix
-UniSoft UniPlus.
+@item mach
+The Mach kernel with a BSD 4.3 layer.
@item usg-unix-v
AT&T System V.
@item windows-nt
-Microsoft windows NT.
-
-@item xenix
-SCO Xenix 386.
+Microsoft windows NT or one of its descendants.
@end table
We do not wish to add new symbols to make finer distinctions unless it
diff -r 75975fd0b7fc -r aa5ed11f473b man/make-stds.texi
--- a/man/make-stds.texi Wed Nov 18 22:44:28 2009 +0900
+++ b/man/make-stds.texi Wed Nov 18 08:49:14 2009 -0700
@@ -283,7 +283,7 @@
Installation directories should always be named by variables, so it is
easy to install in a nonstandard place. The standard names for these
variables are described below. They are based on a standard filesystem
-layout; variants of it are used in SVR4, 4.4BSD, GNU/Linux, Ultrix v4,
+layout; variants of it are used in SVR4, FreeBSD, OpenBSD, GNU/Linux,
and other modern operating systems.
These two variables set the root for the installation. All the other
diff -r 75975fd0b7fc -r aa5ed11f473b man/xemacs-faq.texi
--- a/man/xemacs-faq.texi Wed Nov 18 22:44:28 2009 +0900
+++ b/man/xemacs-faq.texi Wed Nov 18 08:49:14 2009 -0700
@@ -1069,15 +1069,14 @@
@node Q1.2.2, Q1.2.3, Q1.2.1, Introduction
@unnumberedsubsec Q1.2.2: What versions of Unix does XEmacs run on?
-XEmacs is regularly tested on Linux, Solaris, SunOS, HP/UX, FreeBSD,
-OpenBSD, BSD/OS aka BSDI, Tru64 aka DEC/OSF, SCO5, and probably
-others. It should work on all versions of Unix created in the last 10
-years or so, perhaps with a bit of work on more obscure platforms to
-correct bit-rot. It uses a sophisticated configuration system to
-auto-detect zillions of features that are implemented differently in
-different versions of Unix, so it will probably work on your vendor's
-version, possibly with a bit of tweaking, even if we've never heard of
-it.
+XEmacs is regularly tested on Linux, Solaris and OpenSolaris, HP/UX,
+FreeBSD, OpenBSD, Cygwin, Mac OS X, and probably others. It should work
+on all versions of Unix created in the last 10 years or so, perhaps with
+a bit of work on more obscure platforms to correct bit-rot. It uses a
+sophisticated configuration system to auto-detect zillions of features
+that are implemented differently in different versions of Unix, so it
+will probably work on your vendor's version, possibly with a bit of
+tweaking, even if we've never heard of it.
For problems with particular machines and versions of Unix, see the
@file{PROBLEMS} file.
diff -r 75975fd0b7fc -r aa5ed11f473b modules/ChangeLog
--- a/modules/ChangeLog Wed Nov 18 22:44:28 2009 +0900
+++ b/modules/ChangeLog Wed Nov 18 08:49:14 2009 -0700
@@ -1,3 +1,7 @@
+2009-11-10 Jerry James <james@xemacs.org>
+
+ * canna/canna_api.c (Fcanna_initialize): Drop support for the NEC EWS.
+
2009-11-09 Jerry James <james@xemacs.org>
* sample/external/Makefile.in.in: Clarify GPL status.
diff -r 75975fd0b7fc -r aa5ed11f473b modules/canna/canna_api.c
--- a/modules/canna/canna_api.c Wed Nov 18 22:44:28 2009 +0900
+++ b/modules/canna/canna_api.c Wed Nov 18 08:49:14 2009 -0700
@@ -406,13 +406,7 @@
{
char **warning = (char **) 0;
-#ifdef nec_ews_svr4
- stop_polling ();
-#endif /* nec_ews_svr4 */
res = jrKanjiControl (0, KC_INITIALIZE, (char *) &warning);
-#ifdef nec_ews_svr4
- start_polling ();
-#endif /* nec_ews_svr4 */
val = Qnil;
if (warning)
{
diff -r 75975fd0b7fc -r aa5ed11f473b nt/ChangeLog
--- a/nt/ChangeLog Wed Nov 18 22:44:28 2009 +0900
+++ b/nt/ChangeLog Wed Nov 18 08:49:14 2009 -0700
@@ -1,3 +1,7 @@
+2009-11-10 Jerry James <james@xemacs.org>
+
+ * xemacs.dsp: Drop references to removed source files.
+
2009-11-09 Jerry James <james@xemacs.org>
* xemacs.mak: Don't define GNU_MALLOC, as there is no longer an "old"
diff -r 75975fd0b7fc -r aa5ed11f473b nt/xemacs.dsp
--- a/nt/xemacs.dsp Wed Nov 18 22:44:28 2009 +0900
+++ b/nt/xemacs.dsp Wed Nov 18 08:49:14 2009 -0700
@@ -119,10 +119,6 @@
# End Source File
# Begin Source File
-SOURCE="..\src\broken-sun.h"
-# End Source File
-# Begin Source File
-
SOURCE=..\src\buffer.c
# End Source File
# Begin Source File
@@ -651,10 +647,6 @@
# End Source File
# Begin Source File
-SOURCE=..\src\hftctl.c
-# End Source File
-# Begin Source File
-
SOURCE=..\src\hpplay.c
# End Source File
# Begin Source File
@@ -775,10 +767,6 @@
# End Source File
# Begin Source File
-SOURCE=..\src\malloc.c
-# End Source File
-# Begin Source File
-
SOURCE=..\src\marker.c
# End Source File
# Begin Source File
@@ -1111,22 +1099,10 @@
# End Source File
# Begin Source File
-SOURCE=..\src\strcmp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\strcpy.c
-# End Source File
-# Begin Source File
-
SOURCE=..\src\strftime.c
# End Source File
# Begin Source File
-SOURCE="..\src\sunOS-fix.c"
-# End Source File
-# Begin Source File
-
SOURCE=..\src\sunplay.c
# End Source File
# Begin Source File
@@ -1255,14 +1231,6 @@
# End Source File
# Begin Source File
-SOURCE=..\src\unexapollo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\unexconvex.c
-# End Source File
-# Begin Source File
-
SOURCE=..\src\unexcw.c
# End Source File
# Begin Source File
@@ -1275,62 +1243,18 @@
# End Source File
# Begin Source File
-SOURCE=..\src\unexelfsgi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\unexencap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\unexenix.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\unexfreebsd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\unexfx2800.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\unexhp9k3.c
-# End Source File
-# Begin Source File
-
SOURCE=..\src\unexhp9k800.c
# End Source File
# Begin Source File
-SOURCE=..\src\unexmips.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\unexnext.c
-# End Source File
-# Begin Source File
-
SOURCE=..\src\unexnt.c
# End Source File
# Begin Source File
-SOURCE=..\src\unexsni.c
-# End Source File
-# Begin Source File
-
SOURCE="..\src\unexsol2-6.c"
# End Source File
# Begin Source File
-SOURCE=..\src\unexsol2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\unexsunos4.c
-# End Source File
-# Begin Source File
-
SOURCE=..\src\universe.h
# End Source File
# Begin Source File
diff -r 75975fd0b7fc -r aa5ed11f473b src/ChangeLog
--- a/src/ChangeLog Wed Nov 18 22:44:28 2009 +0900
+++ b/src/ChangeLog Wed Nov 18 08:49:14 2009 -0700
@@ -1,3 +1,274 @@
+2009-11-10 Jerry James <james@xemacs.org>
+
+ * Makefile.in.in: Drop support for dynodump and OSF1.
+ * alloca.s: Drop support for old systems, namely hp9000s300, wicat,
+ ns16000, ns32000, sequent, pyramid, att3b5, and Xenix.
+ * broken-sun.h: Remove, unused.
+ * compiler.h: Drop support for OSF1.
+ * config.h.in: Modify comments about obsolete systems. Drop NeXTstep
+ and SunOS4 support.
+ (DYNODUMP): Removed.
+ * console.h: Remove reference to NeXTstep in a comment.
+ * data.c (sign_extend_temp): Removed, unused.
+ (sign_extend_lisp_int): Ditto.
+ * depend: Regenerate.
+ * ecrt0.c: Remove reference to DONT_NEED_ENVIRON, which is not defined
+ by any supported system. Remove support for obsolete systems. Remove
+ comments that refer to obsolete systems.
+ * emacs.c (main_1): Remove NeXT support. Remove references to
+ EXTRA_INITIALIZE and NO_SUBPROCESSES, which are not defined by any
+ supported system.
+ * faces.c (complex_vars_of_faces): Remove comment that refers to
+ NeXTstep.
+ * fileio.c: Drop support for ancient versions of HP/UX.
+ * getloadavg.c: Remove symbols defined only by obsolete systems from
+ comment at the top listing symbols of interest. Remove support for
+ obsolete systems.
+ (getloadavg): Drop code blocks specific to obsolete systems.
+ * getpagesize.h: Remove reference to NBPC, which is not used by any
+ supported system.
+ * gmalloc.c: Remove reference to GMALLOC_NEEDS_SBRK_DECL, which is not
+ used by any supported system.
+ * hftctl.c: Remove, used only by ancient versions of AIX.
+ * hpplay.c: Remove includes for HP/UX versions less than 11.
+ * libsst.h: Remove support for SunOS 4.
+ * m/arm.h: Remove comment about Xenix.
+ * m/ibmrs6000.h: Remove hftctl support, which is only for very old
+ versions of AIX.
+ * m/intel386.h: Remove references to obsolete systems.
+ * m/mips.h: Ditto.
+ * nsselect.m: Remove (devoid of content) NeXT support file.
+ * process-unix.c: Remove references to NO_SUBPROCESSES, SKTPAIR, and
+ CONNECT_NEEDS_SLOWED_INTERRUPTS, which are not defined by any
+ supported system.
+ * process.c: Remove reference to NO_SUBPROCESSES.
+ * process.h: Ditto.
+ * regex.c: Remove reference to SWITCH_ENUM_BUG, which is not defined
+ by an supported system, and hence SWITCH_ENUM_CAST as well.
+ * s/aix4-2.h: Merge older include files in, and drop #define/#undef
+ pairs.
+ * s/bsd4-3.h: Ditto.
+ * s/hpux11.h: Ditto.
+ * s/irix6-0.h: Ditto.
+ * s/usg5-4.h: Ditto.
+ * s/hpux11-shr.h: Remove references to deleted version of HP/UX.
+ * s/template.h: Remove references to ancient BSD versions.
+ * strcmp.c: Removed, unused.
+ * strcpy.c: Ditto.
+ * sunOS-fix.c: Ditto.
+ * sunplay.c (init_device): Remove SunOS4.0.3 code.
+ * syntax.c (scan_sexps_forward): Remove comment about Apollo, but
+ leave the code the way it is, because I prefer it this way.
+ * sysdep.c: Remove code guarded by preprocessor symbols that are not
+ defined on any supported system, namely ISC4_0, AIXHFT, IBMRTAIX,
+ NO_SUBPROCESSES, RTU, USG_JOBCTRL, USE_GETOBAUD, _CX_UX, DGUX, ultrix,
+ F_SETOWN_SOCK_NEG, SET_LINE_DISCIPLINE, BROKEN_CLOSEDIR, HPUX9, and
+ NeXT.
+ (sys_subshell): Remove, unused.
+ * sysfile.h: Remove reference to hftctl.c.
+ * sysproc.h: Remove code guarded by preprocessor symbols that are not
+ defined on any supported system, namely NO_SUBPROCESSES, IRIS,
+ NEED_NET_ERRNO_H, and USG_JOBCTRL.
+ * syssignal.h: Remove reference to NeXT.
+ * systty.h: Remove support for obsolete systems. Remove support for
+ BROKEN_TIOCGWINSZ, which is no longer needed.
+ * unexaix.c (unrelocate_symbols): Remove code only needed on ancient
+ versions of AIX.
+ * unexec.c: Remove references to COFF_ENCAPSULATE and
+ SECTION_ALIGNMENT, which are not needed on any supported system.
+ Remove references to obsolete systems.
+
+ * m/7300.h:
+ * m/acorn.h:
+ * m/alliant-2800.h:
+ * m/alliant.h:
+ * m/alliant1.h:
+ * m/alliant4.h:
+ * m/alpha.h:
+ * m/altos.h:
+ * m/amdahl.h:
+ * m/apollo.h:
+ * m/att3b.h:
+ * m/aviion.h:
+ * m/celerity.h:
+ * m/clipper.h:
+ * m/cnvrgnt.h:
+ * m/convex.h:
+ * m/cydra5.h:
+ * m/delta.h:
+ * m/delta88k.h:
+ * m/dpx2.h:
+ * m/dual.h:
+ * m/elxsi.h:
+ * m/ews4800r.h:
+ * m/gould-np1.h:
+ * m/gould.h:
+ * m/hp300bsd.h:
+ * m/hp9000s300.h:
+ * m/i860.h:
+ * m/ibm370aix.h:
+ * m/ibmps2-aix.h:
+ * m/ibmrt-aix.h:
+ * m/ibmrt.h:
+ * m/iris4d.h:
+ * m/iris5d.h:
+ * m/iris6d.h:
+ * m/irist.h:
+ * m/is386.h:
+ * m/isi-ov.h:
+ * m/luna88k.h:
+ * m/masscomp.h:
+ * m/mega68.h:
+ * m/mg1.h:
+ * m/mips-nec.h:
+ * m/mips-siemens.h:
+ * m/mips4.h:
+ * m/ncr386.h:
+ * m/news-risc.h:
+ * m/news.h:
+ * m/next.h:
+ * m/nh3000.h:
+ * m/nh4000.h:
+ * m/ns16000.h:
+ * m/ns32000.h:
+ * m/nu.h:
+ * m/orion.h:
+ * m/orion105.h:
+ * m/paragon.h:
+ * m/pfa50.h:
+ * m/plexus.h:
+ * m/pmax.h:
+ * m/pyramid.h:
+ * m/pyrmips.h:
+ * m/sequent-ptx.h:
+ * m/sequent.h:
+ * m/sgi-challenge.h:
+ * m/sgi3000.h:
+ * m/sps7.h:
+ * m/stride.h:
+ * m/sun1.h:
+ * m/sun2.h:
+ * m/sun3-68881.h:
+ * m/sun3-fpa.h:
+ * m/sun3-soft.h:
+ * m/sun3.h:
+ * m/sun386.h:
+ * m/symmetry.h:
+ * m/tad68k.h:
+ * m/tahoe.h:
+ * m/tandem-s2.h:
+ * m/targon31.h:
+ * m/tek4300.h:
+ * m/tekxd88.h:
+ * m/tower32.h:
+ * m/tower32v3.h:
+ * m/ustation.h:
+ * m/vax.h:
+ * m/wicat.h:
+ * m/xps100.h:
+ * s/3700.h:
+ * s/386-ix.h:
+ * s/386bsd.h:
+ * s/aix3-1.h:
+ * s/aix3-2-5.h:
+ * s/aix3-2.h:
+ * s/aix4-1.h:
+ * s/aix4.h:
+ * s/alliant-2800.h:
+ * s/alliant.h:
+ * s/altos.h:
+ * s/amdahl.h:
+ * s/bsd386.h:
+ * s/bsd4-1.h:
+ * s/bsd4-2.h:
+ * s/bsdos2-1.h:
+ * s/bsdos2.h:
+ * s/bsdos3.h:
+ * s/bsdos4.h:
+ * s/cxux.h:
+ * s/cxux7.h:
+ * s/decosf1-2.h:
+ * s/decosf1-3.h:
+ * s/decosf3-1.h:
+ * s/decosf3-2.h:
+ * s/decosf4-0.h:
+ * s/dgux.h:
+ * s/dgux5-4r2.h:
+ * s/dgux5-4r3.h:
+ * s/dgux5-4r4.h:
+ * s/domain.h:
+ * s/esix.h:
+ * s/esix5r4.h:
+ * s/ewsux5r4.h:
+ * s/hpux.h:
+ * s/hpux10-shr.h:
+ * s/hpux10.h:
+ * s/hpux8-shr.h:
+ * s/hpux8.h:
+ * s/hpux9-shr.h:
+ * s/hpux9-x11r4.h:
+ * s/hpux9.h:
+ * s/hpux9shxr4.h:
+ * s/iris3-5.h:
+ * s/iris3-6.h:
+ * s/irix3-3.h:
+ * s/irix4-0.h:
+ * s/irix5-0.h:
+ * s/irix5-1.h:
+ * s/irix5-2.h:
+ * s/irix5-3.h:
+ * s/isc2-2.h:
+ * s/isc3-0.h:
+ * s/isc4-0.h:
+ * s/isc4-1.h:
+ * s/linux.h:
+ * s/newsos5.h:
+ * s/nextstep.h:
+ * s/osf1.h:
+ * s/ptx.h:
+ * s/riscix1-1.h:
+ * s/riscix1-2.h:
+ * s/riscos5.h:
+ * s/rtu.h:
+ * s/sco4.h:
+ * s/sco5-shr.h:
+ * s/sco5.h:
+ * s/sunos4-0-shr.h:
+ * s/sunos4-0.h:
+ * s/sunos4-1-1.h:
+ * s/sunos4-1-2-shr.h:
+ * s/sunos4-1-2.h:
+ * s/sunos4-1-3-shr.h:
+ * s/sunos4-1-3.h:
+ * s/sunos4-1-4-shr.h:
+ * s/sunos4-1-4.h:
+ * s/sunos4-1-shr.h:
+ * s/sunos4-1.h:
+ * s/ultrix.h:
+ * s/ultrix4-3.h:
+ * s/umax.h:
+ * s/umips.h:
+ * s/unipl5-0.h:
+ * s/unipl5-2.h:
+ * s/usg5-0.h:
+ * s/usg5-2-2.h:
+ * s/usg5-2.h:
+ * s/usg5-3.h:
+ * s/xenix.h:
+ * unexapollo.c:
+ * unexconvex.c:
+ * unexelfsgi.c:
+ * unexencap.c:
+ * unexenix.c:
+ * unexfreebsd.c:
+ * unexfx2800.c:
+ * unexhp9k3.c:
+ * unexmips.c:
+ * unexnext.c:
+ * unexsni.c:
+ * unexsol2.c:
+ * unexsunos4.c: Removed.
+
2009-11-18 Stephen J. Turnbull <stephen@xemacs.org>
Assorted cleanups.
diff -r 75975fd0b7fc -r aa5ed11f473b src/Makefile.in.in
--- a/src/Makefile.in.in Wed Nov 18 22:44:28 2009 +0900
+++ b/src/Makefile.in.in Wed Nov 18 08:49:14 2009 -0700
@@ -537,13 +537,7 @@
cd ../lwlib && $(MAKE) $(RECURSIVE_MAKE_ARGS)
#endif /* HAVE_X_WINDOWS */
-#ifdef DYNODUMP
-dynodump_deps = ../dynodump/dynodump.so
-../dynodump/dynodump.so:
- cd ../dynodump && $(MAKE) $(RECURSIVE_MAKE_ARGS)
-#endif /* DYNODUMP */
-
-link_deps = $(start_files) $(objs) $(otherobjs) $(lwlib_deps) $(dynodump_deps)
+link_deps = $(start_files) $(objs) $(otherobjs) $(lwlib_deps)
$(LIB_SRC)/make-dump-id:
cd $(LIB_SRC) && $(MAKE) $(RECURSIVE_MAKE_ARGS) make-dump-id
@@ -825,17 +819,10 @@
extw_link_end =
# endif /* not IRIX */
# else /* not USG5 */
-# if defined (DEC_ALPHA) && defined (OSF1)
-# define EXTW_LINK(objs, output) $(LD) $(ldflags) $(ld_switch_shared) -d objs -o output $(LIBES)
-extw_link_beg = $(LD) $(ldflags) $(ld_switch_shared) -d
-extw_link_mid = -o
-extw_link_end = $(LIBES)
-# else /* !(DEC_ALPHA && OSF1) */
-# define EXTW_LINK(objs, output) $(LD) -dc objs -assert pure-text -o output
+# define EXTW_LINK(objs, output) $(LD) -dc objs -assert pure-text -o output
extw_link_beg = $(LD) -dc
extw_link_mid = -assert pure-text -o
extw_link_end =
-# endif /* !(DEC_ALPHA && OSF1) */
# endif /* not USG5 */
#ifdef EXTW_LINK
@@ -885,7 +872,6 @@
sed -e 's/ //' -e 's/^#.*//' | \
sed -n -e '/^..*$$/p' > allocax.s
@$(RM) alloca.o
-## Xenix, in particular, needs to run assembler via cc.
$(CC) -c allocax.s
$(RM) allocax.s allocatem.c
#endif /* HAVE_ALLOCA */
diff -r 75975fd0b7fc -r aa5ed11f473b src/alloca.s
--- a/src/alloca.s Wed Nov 18 22:44:28 2009 +0900
+++ b/src/alloca.s Wed Nov 18 08:49:14 2009 -0700
@@ -1,5 +1,4 @@
/* `alloca' standard 4.2 subroutine for 68000's and 16000's and others.
- Also has _setjmp and _longjmp for pyramids.
Copyright (C) 1985, 1986, 1988 Free Software Foundation, Inc.
This file is part of XEmacs.
@@ -35,115 +34,18 @@
#ifndef HAVE_ALLOCA /* define this to use system's alloca */
-#ifndef hp9000s300
#ifndef m68k
#ifndef m68000
-#ifndef WICAT
-#ifndef ns32000
-#ifndef ns16000
-#ifndef sequent
-#ifndef pyramid
-#ifndef ATT3B5
-#ifndef XENIX
you
lose!!
-#endif /* XENIX */
-#endif /* ATT3B5 */
-#endif /* pyramid */
-#endif /* sequent */
-#endif /* ns16000 */
-#endif /* ns32000 */
-#endif /* WICAT */
#endif /* m68000 */
#endif /* m68k */
-#endif /* hp9000s300 */
-#ifdef hp9000s300
-#ifdef OLD_HP_ASSEMBLER
- data
- text
- globl _alloca
-_alloca
- move.l (sp)+,a0 ; pop return addr from top of stack
- move.l (sp)+,d0 ; pop size in bytes from top of stack
- add.l #ROUND,d0 ; round size up to long word
- and.l #MASK,d0 ; mask out lower two bits of size
- sub.l d0,sp ; allocate by moving stack pointer
- tst.b PROBE(sp) ; stack probe to allocate pages
- move.l sp,d0 ; return pointer
- add.l #-4,sp ; new top of stack
- jmp (a0) ; not a normal return
-MASK equ -4 ; Longword alignment
-ROUND equ 3 ; ditto
-PROBE equ -128 ; safety buffer for C compiler scratch
- data
-#else /* new hp assembler syntax */
-/*
- The new compiler does "move.m <registers> (%sp)" to save registers,
- so we must copy the saved registers when we mung the sp.
- The old compiler did "move.m <register> <offset>(%a6)", which
- gave us no trouble
- */
- text
- set PROBE,-128 # safety for C frame temporaries
- set MAXREG,22 # d2-d7, a2-a5, fp2-fp7 may have been saved
- global _alloca
-_alloca:
- mov.l (%sp)+,%a0 # return address
- mov.l (%sp)+,%d0 # number of bytes to allocate
- mov.l %sp,%a1 # save old sp for register copy
- mov.l %sp,%d1 # compute new sp
- sub.l %d0,%d1 # space requested
- and.l &-4,%d1 # round down to longword
- sub.l &MAXREG*4,%d1 # space for saving registers
- mov.l %d1,%sp # save new value of sp
- tst.b PROBE(%sp) # create pages (sigh)
- mov.l %a2,%d1 # save reg a2
- mov.l %sp,%a2
- move.w &MAXREG-1,%d0
-copy_regs_loop: /* save caller's saved registers */
- mov.l (%a1)+,(%a2)+
- dbra %d0,copy_regs_loop
- mov.l %a2,%d0 # return value
- mov.l %d1,%a2 # restore a2
- add.l &-4,%sp # adjust tos
- jmp (%a0) # rts
-#endif /* new hp assembler */
-#else
#ifdef m68k /* SGS assembler totally different */
file "alloca.s"
global alloca
alloca:
-#ifdef MOTOROLA_DELTA
-/* slightly modified version of alloca to motorola sysV/68 pcc - based
- compiler.
- this compiler saves used registers relative to %sp instead of %fp.
- alright, just make new copy of saved register set whenever we allocate
- new space from stack..
- this is true at last until SVR3V7 . bug has reported to Motorola. */
- set MAXREG,10 # max no of registers to save (d2-d7, a2-a5)
- mov.l (%sp)+,%a1 # pop return addr from top of stack
- mov.l (%sp)+,%d0 # pop size in bytes from top of stack
- mov.l %sp,%a0 # save stack pointer for register copy
- addq.l &3,%d0 # round size up to long word
- andi.l &-4,%d0 # mask out lower two bits of size
- mov.l %sp,%d1 # compute new value of sp to d1
- sub.l %d0,%d1 # pseudo-allocate by moving stack pointer
- sub.l &MAXREG*4,%d1 # allocate more space for saved regs.
- mov.l %d1,%sp # actual allocation.
- move.w &MAXREG-1,%d0 # d0 counts saved regs.
- mov.l %a2,%d1 # preserve a2.
- mov.l %sp,%a2 # make pointer to new reg save area.
-copy_regs_loop: # copy stuff from old save area.
- mov.l (%a0)+,(%a2)+ # save saved register
- dbra %d0,copy_regs_loop
- mov.l %a2,%a0 # now a2 is start of allocated space.
- mov.l %a2,%d0 # return it in both a0 and d0 to play safe.
- mov.l %d1,%a2 # restore a2.
- subq.l &4,%sp # new top of stack
- jmp (%a1) # far below normal return
-#else /* not MOTOROLA_DELTA */
mov.l (%sp)+,%a1 # pop return addr from top of stack
mov.l (%sp)+,%d0 # pop size in bytes from top of stack
add.l &R%1,%d0 # round size up to long word
@@ -157,52 +59,11 @@
set S%1,64 # safety factor for C compiler scratch
set R%1,3+S%1 # add to size for rounding
set P%1,-132 # probe this far below current top of stack
-#endif /* not MOTOROLA_DELTA */
#else /* not m68k */
#ifdef m68000
-#ifdef WICAT
-/*
- * Registers are saved after the corresponding link so we have to explicitly
- * move them to the top of the stack where they are expected to be.
- * Since we do not know how many registers were saved in the calling function
- * we must assume the maximum possible (d2-d7,a2-a5). Hence, we end up
- * wasting some space on the stack.
- *
- * The large probe (tst.b) attempts to make up for the fact that we have
- * potentially used up the space that the caller probed for its own needs.
- */
- .procss m0
- .config "68000 1"
- .module _alloca
-MAXREG: .const 10
- .sect text
- .global _alloca
-_alloca:
- move.l (sp)+,a1 ; pop return address
- move.l (sp)+,d0 ; pop allocation size
- move.l sp,d1 ; get current SP value
- sub.l d0,d1 ; adjust to reflect required size...
- sub.l #MAXREG*4,d1 ; ...and space needed for registers
- and.l #-4,d1 ; backup to longword boundary
- move.l sp,a0 ; save old SP value for register copy
- move.l d1,sp ; set the new SP value
- tst.b -4096(sp) ; grab an extra page (to cover caller)
- move.l a2,d1 ; save callers register
- move.l sp,a2
- move.w #MAXREG-1,d0 ; # of longwords to copy
-loop: move.l (a0)+,(a2)+ ; copy registers...
- dbra d0,loop ; ...til there are no more
- move.l a2,d0 ; end of register area is addr for new space
- move.l d1,a2 ; restore saved a2.
- addq.l #4,sp ; caller will increment sp by 4 after return.
- move.l d0,a0 ; return value in both a0 and d0.
- jmp (a1)
- .end _alloca
-#else
-
/* Some systems want the _, some do not. Win with both kinds. */
.globl _alloca
_alloca:
@@ -219,137 +80,7 @@
addql #4,d0
jmp a0@
-#endif /* not WICAT */
#endif /* m68000 */
#endif /* not m68k */
-#endif /* not hp9000s300 */
-
-#if defined (ns16000) || defined (ns32000)
-
- .text
- .align 2
-/* Some systems want the _, some do not. Win with both kinds. */
-.globl _alloca
-_alloca:
-.globl alloca
-alloca:
-
-/* Two different assembler syntaxes are used for the same code
- on different systems. */
-
-#ifdef sequent
-#define IM
-#define REGISTER(x) x
-#else
-#ifdef NS5 /* ns SysV assembler */
-#define IM $
-#define REGISTER(x) x
-#else
-#define IM $
-#define REGISTER(x) 0(x)
-#endif
-#endif
-
-/*
- * The ns16000 is a little more difficult, need to copy regs.
- * Also the code assumes direct linkage call sequence (no mod table crap).
- * We have to copy registers, and therefore waste 32 bytes.
- *
- * Stack layout:
- * new sp -> junk
- * registers (copy)
- * r0 -> new data
- * | (orig retval)
- * | (orig arg)
- * old sp -> regs (orig)
- * local data
- * fp -> old fp
- */
-
- movd tos,r1 /* pop return addr */
- negd tos,r0 /* pop amount to allocate */
- sprd sp,r2
- addd r2,r0
- bicb IM/**/3,r0 /* 4-byte align */
- lprd sp,r0
- adjspb IM/**/36 /* space for regs, +4 for caller to pop */
- movmd 0(r2),4(sp),IM/**/4 /* copy regs */
- movmd 0x10(r2),0x14(sp),IM/**/4
- jump REGISTER(r1) /* funky return */
-#endif /* ns16000 or ns32000 */
-
-#ifdef pyramid
-
-.globl _alloca
-
-_alloca: addw $3,pr0 # add 3 (dec) to first argument
- bicw $3,pr0 # then clear its last 2 bits
- subw pr0,sp # subtract from SP the val in PR0
- andw $-32,sp # keep sp aligned on multiple of 32.
- movw sp,pr0 # ret. current SP
- ret
-
-#ifdef PYRAMID_OLD /* This isn't needed in system version 4. */
-.globl __longjmp
-.globl _longjmp
-.globl __setjmp
-.globl _setjmp
-
-__longjmp: jump _longjmp
-__setjmp: jump _setjmp
-#endif
-
-#endif /* pyramid */
-
-#ifdef ATT3B5
-
- .align 4
- .globl alloca
-
-alloca:
- movw %ap, %r8
- subw2 $9*4, %r8
- movw 0(%r8), %r1 /* pc */
- movw 4(%r8), %fp
- movw 8(%r8), %sp
- addw2 %r0, %sp /* make room */
- movw %sp, %r0 /* return value */
- jmp (%r1) /* continue... */
-
-#endif /* ATT3B5 */
-
-#ifdef XENIX
-
-.386
-
-_TEXT segment dword use32 public 'CODE'
-assume cs:_TEXT
-
-;-------------------------------------------------------------------------
-
-public _alloca
-_alloca proc near
-
- pop ecx ; return address
- pop eax ; amount to alloc
- add eax,3 ; round it to 32-bit boundary
- and al,11111100B ;
- mov edx,esp ; current sp in edx
- sub edx,eax ; lower the stack
- xchg esp,edx ; start of allocation in esp, old sp in edx
- mov eax,esp ; return ptr to base in eax
- push [edx+8] ; save poss. stored reg. values (esi,edi,ebx)
- push [edx+4] ; on lowered stack
- push [edx] ;
- sub esp,4 ; allow for 'add esp, 4'
- jmp ecx ; jump to return address
-
-_alloca endp
-
-_TEXT ends
-
-end
-
-#endif /* XENIX */
#endif /* not HAVE_ALLOCA */
diff -r 75975fd0b7fc -r aa5ed11f473b src/broken-sun.h
--- a/src/broken-sun.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-/* This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not in FSF. */
-
-/* Authorship:
-
- JWZ: long ago.
- */
-
-/* Sun's standard and GCC's header files leave out prototypes for
- all sorts of functions. */
-
-#ifndef INCLUDED_broken_sun_h_
-#define INCLUDED_broken_sun_h_
-
-#ifdef __GNUC__
-#include <stdlib.h>
-#include <stddef.h>
-
-/*********************** stdlib functions *********************/
-
-/* void * memchr (const void *, int, size_t); */
-
-/* int memcmp (const void *, const void *, size_t); */
-/* void * memcpy (void *, const void *, size_t); */
-/* void * memmove (void *, const void *, size_t);*/
-/* void * memset (void *, int, int); */
-/* char * strcat (char *, const char *); */
-/* char * strchr (const char *, int); */
-/* int strcmp (const char *, const char *); */
-
-/* Yes, they even left these functions out! */
-int tolower (int);
-int toupper (int);
-
-/*********************** stdio functions *********************/
-
-#include <stdio.h> /* else can't declare FILE */
-
-/* FILE *fopen (const char *, const char *); */
-/* FILE *freopen (const char *, const char *, FILE *); */
-FILE *tmpfile (void);
-int fclose (FILE *);
-char *fgets (char *, int, FILE *);
-int fgetc (FILE *);
-int fflush (FILE *);
-int fprintf (FILE *, const char *, ...);
-int fputc (char, FILE *);
-int fputs (const char *, FILE *);
-size_t fread (void *, size_t, size_t, FILE *);
-int fscanf (FILE *, const char *, ...);
-int fgetpos (FILE *, long *);
-int fseek (FILE *, long, int);
-int fsetpos (FILE *, const long *);
-long ftell (FILE *);
-size_t fwrite (const void *, size_t, size_t, FILE *);
-char *gets (char *);
-int pclose (FILE *);
-void perror (const char *);
-int printf (const char *, ...);
-int puts (const char *);
-int remove (const char *);
-int rename (const char *, const char *);
-int rewind (FILE *);
-int scanf (const char *, ...);
-int sscanf (const char *, const char *, ...);
-void setbuf (FILE *, char *);
-int setvbuf (FILE *, char *, int, size_t);
-int ungetc (int, FILE *);
-int vprintf (const char *, void *);
-int vfprintf (FILE *, const char *, void *);
-char *vsprintf (char *, const char *, void *);
-
-/*********************** signal functions *********************/
-
-int sigblock (int);
-#ifndef sigmask
-int sigmask (int);
-#endif
-int sigsetmask (int);
-int sigpause (int);
-
-/*********************** time functions ***********************/
-
-struct timeval;
-struct timezone;
-
-int utimes (const char *, struct timeval *);
-void tzset (void);
-time_t time (time_t *);
-int gettimeofday (struct timeval *, struct timezone *);
-
-/*********************** file-system functions *********************/
-
-/* Ilya Golubev reports that stat can be a #define on some systems.
- Presumably none of the systems this file is used for, and I don't
- know what file to include on a system known to be broken, anyway. */
-struct stat;
-#include </usr/include/sys/types.h>
-
-int fsync (int);
-int lstat (const char *, struct stat *);
-int fchmod (int, mode_t);
-char *mktemp (char *);
-/* int creat (const char *, mode_t); better no decl than a conflicting one... */
-int symlink (const char *, const char *);
-int readlink (const char *, char *, int);
-void sync (void);
-int select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
-char * getwd (char *);
-/* int lseek (int, long, int); better no decl than a conflicting one... */
-int _filbuf ();
-int _flsbuf ();
-
-/**************** interprocess communication functions ******************/
-
-int recv (int, char *, int, int);
-int socket (int, int, int);
-struct sockaddr;
-int connect (int, struct sockaddr *, int);
-int bind (int, struct sockaddr *, int);
-int listen (int, int);
-int accept (int, struct sockaddr *, int *);
-int gethostname (char *, int);
-struct rusage;
-int wait3 (void *, int, struct rusage *);
-int nice (int);
-int killpg (int, int);
-int system (char *);
-
-
-/*********************** low-level OS functions *********************/
-
-int ioctl (int, int, ...);
-struct nlist;
-int nlist (const char *, struct nlist *);
-int munmap (void *, int);
-int brk (void *);
-void * sbrk (int);
-struct rlimit;
-int getrlimit (int, struct rlimit *);
-int getpagesize (void);
-int shutdown (int, int);
-int mprotect (void *, int, int);
-
-/*********************** miscellaneous functions *********************/
-
-void tputs (const char *cp, int affcnt, void (*)(int));
-long random (void);
-int srandom (int seed);
-
-#endif /* __GNUC__ */
-
-#endif /* INCLUDED_broken_sun_h_ */
diff -r 75975fd0b7fc -r aa5ed11f473b src/compiler.h
--- a/src/compiler.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/compiler.h Wed Nov 18 08:49:14 2009 -0700
@@ -162,7 +162,7 @@
where there's an infinite loop in a function returning a Lisp object.
*/
#if (defined (_MSC_VER) && MSC_VERSION < 1300) || defined (__SUNPRO_C) || \
- defined (__SUNPRO_CC) || (defined (DEC_ALPHA) && defined (OSF1))
+ defined (__SUNPRO_CC)
# define DO_NOTHING_DISABLING_NO_RETURN_WARNINGS if (0) return Qnil
#else
# define DO_NOTHING_DISABLING_NO_RETURN_WARNINGS DO_NOTHING
diff -r 75975fd0b7fc -r aa5ed11f473b src/config.h.in
--- a/src/config.h.in Wed Nov 18 22:44:28 2009 +0900
+++ b/src/config.h.in Wed Nov 18 08:49:14 2009 -0700
@@ -187,8 +187,7 @@
/* Define to 1 if you have `alloca', as a function or macro. */
#undef HAVE_ALLOCA
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
- */
+/* Define to 1 if you have <alloca.h> and it should be used. */
#undef HAVE_ALLOCA_H
/* Define to 1 if using `alloca.c'. */
@@ -811,10 +810,6 @@
file. */
#undef DUMP_IN_EXEC
-/* Define DYNODUMP if it is necessary to properly dump on this system.
- Currently this is only Solaris 2.x, for x < 6. */
-#undef DYNODUMP
-
/* Compile in support for Sun Sparcworks/WorkShop? */
#undef SUNPRO
@@ -1009,7 +1004,7 @@
#endif
/* Define HAVE_WINDOW_SYSTEM if any windowing system is available. */
-#if defined (HAVE_GTK) || defined (HAVE_X_WINDOWS) || defined (HAVE_MS_WINDOWS) /* || defined (HAVE_NEXTSTEP) */
+#if defined (HAVE_GTK) || defined (HAVE_X_WINDOWS) || defined (HAVE_MS_WINDOWS)
#define HAVE_WINDOW_SYSTEM
#endif
@@ -1056,23 +1051,6 @@
#define HAVE_UNIXOID_EVENT_LOOP
#endif
-/* If you are using SunOS 4.1.1 and X11r5, then you need this patch.
- There is a stupid bug in the SunOS libc.a: two functions which X11r5
- uses, mbstowcs() and wcstombs(), are unusable when programs are
- statically linked (as XEmacs must be) because the static version of
- libc.a contains the *dynamic* versions of these functions. These
- functions don't seem to be called when XEmacs is running, so it's
- enough to define stubs for them.
-
- This appears to be fixed in SunOS 4.1.2.
-
- Also, SunOS 4.1.1 contains buggy versions of strcmp and strcpy that
- sometimes reference memory past the end of the string, which can segv.
- I don't know whether this has been fixed as of 4.1.2 or 4.1.3. */
-#if defined (sparc) && !defined (USG)
-#define OBJECTS_SYSTEM sunOS-fix.o strcmp.o strcpy.o
-#endif
-
#ifdef HAVE_CANNA
# define CANNA_MULE
# define CANNA_PURESIZE 0
diff -r 75975fd0b7fc -r aa5ed11f473b src/console.h
--- a/src/console.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/console.h Wed Nov 18 08:49:14 2009 -0700
@@ -44,8 +44,8 @@
the same physical display.
This is an implementation detail specific to X consoles (e.g. under
- NeXTstep or Windows, this could be different, and input would come
- directly from the console).
+ Windows, this could be different, and input would come directly from
+ the console).
*/
/* GCC does not like forward enum declaration. This needs to be
diff -r 75975fd0b7fc -r aa5ed11f473b src/data.c
--- a/src/data.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/data.c Wed Nov 18 08:49:14 2009 -0700
@@ -160,23 +160,6 @@
args_out_of_range_3 (make_int (val), make_int (min), make_int (max));
}
-/* On some machines, XINT needs a temporary location.
- Here it is, in case it is needed. */
-
-EMACS_INT sign_extend_temp;
-
-/* On a few machines, XINT can only be done by calling this. */
-/* XEmacs: only used by m/convex.h */
-EMACS_INT sign_extend_lisp_int (EMACS_INT num);
-EMACS_INT
-sign_extend_lisp_int (EMACS_INT num)
-{
- if (num & (1L << (INT_VALBITS - 1)))
- return num | ((-1L) << INT_VALBITS);
- else
- return num & (EMACS_INT) ((1UL << INT_VALBITS) - 1);
-}
-
/* Data type predicates */
diff -r 75975fd0b7fc -r aa5ed11f473b src/depend
--- a/src/depend Wed Nov 18 22:44:28 2009 +0900
+++ b/src/depend Wed Nov 18 08:49:14 2009 -0700
@@ -156,7 +156,7 @@
free-hook.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h hash.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
gc.o: $(CONFIG_H) $(LISP_H) backtrace.h buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h coding-system-slots.h compiler.h conslots.h console-impl.h console-stream.h console.h device.h dumper.h elhash.h events.h extents-impl.h extents.h file-coding.h frame-impl.h frame.h frameslots.h gc.h general-slots.h glyphs.h lisp-disunion.h lisp-union.h lisp.h lrecord.h lstream.h mc-alloc.h number-gmp.h number-mp.h number.h opaque.h process.h profile.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysdep.h sysfile.h systime.h text.h vdb.h window-impl.h window.h winslots.h
general.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
-getloadavg.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h sysfile.h syssignal.h text.h vdb.h
+getloadavg.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h sysfile.h text.h vdb.h
glyphs-eimage.o: $(CONFIG_H) $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h compiler.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h dumper.h faces.h file-coding.h frame.h gc.h general-slots.h glyphs.h lisp-disunion.h lisp-union.h lisp.h lrecord.h lstream.h mc-alloc.h number-gmp.h number-mp.h number.h objects-impl.h objects.h opaque.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysfile.h text.h vdb.h window-impl.h window.h winslots.h
glyphs-shared.o: $(CONFIG_H) $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h compiler.h console.h dumper.h elhash.h faces.h frame.h gc.h general-slots.h glyphs.h imgproc.h insdel.h lisp-disunion.h lisp-union.h lisp.h lrecord.h lstream.h mc-alloc.h number-gmp.h number-mp.h number.h opaque.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysdep.h sysfile.h text.h vdb.h window-impl.h window.h winslots.h
glyphs-widget.o: $(CONFIG_H) $(LISP_H) bytecode.h charset.h compiler.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h dumper.h faces.h frame.h gc.h general-slots.h glyphs.h gui.h insdel.h lisp-disunion.h lisp-union.h lisp.h lrecord.h lstream.h mc-alloc.h number-gmp.h number-mp.h number.h objects.h opaque.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h text.h vdb.h window-impl.h window.h winslots.h
@@ -166,7 +166,6 @@
gui.o: $(CONFIG_H) $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h compiler.h dumper.h elhash.h gc.h general-slots.h gui.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h menubar.h number-gmp.h number-mp.h number.h redisplay.h symeval.h symsinit.h text.h vdb.h
gutter.o: $(CONFIG_H) $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h compiler.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h dumper.h faces.h frame-impl.h frame.h frameslots.h gc.h general-slots.h glyphs.h gutter.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h text.h vdb.h window-impl.h window.h winslots.h
hash.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h hash.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
-hftctl.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h sysfile.h text.h vdb.h
hpplay.o: $(CONFIG_H) $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h sound.h symeval.h symsinit.h text.h vdb.h
imgproc.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h imgproc.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
indent.o: $(CONFIG_H) $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h compiler.h console.h device.h dumper.h extents.h faces.h frame.h gc.h general-slots.h glyphs.h insdel.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h text.h vdb.h window-impl.h window.h winslots.h
@@ -223,8 +222,6 @@
sound.o: $(CONFIG_H) $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h buffer.h bufslots.h casetab.h charset.h chartab.h compiler.h conslots.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h dumper.h gc.h general-slots.h intl-auto-encap-win32.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h redisplay.h sound.h specifier.h symeval.h symsinit.h sysdep.h sysfile.h sysproc.h syssignal.h systime.h syswindows.h text.h vdb.h xintrinsic.h
specifier.o: $(CONFIG_H) $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h compiler.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h dumper.h frame.h gc.h general-slots.h glyphs.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h opaque.h rangetab.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h text.h vdb.h window-impl.h window.h winslots.h
strcat.o: $(CONFIG_H)
-strcmp.o: $(CONFIG_H)
-strcpy.o: $(CONFIG_H)
strftime.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
sunplay.o: $(CONFIG_H) $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h sound.h symeval.h symsinit.h sysdep.h sysfile.h syssignal.h text.h vdb.h
sunpro.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
@@ -243,24 +240,12 @@
undo.o: $(CONFIG_H) $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h compiler.h dumper.h extents.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
unexaix.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h getpagesize.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
unexalpha.o: $(CONFIG_H) compiler.h
-unexapollo.o: $(CONFIG_H)
-unexconvex.o: $(CONFIG_H) compiler.h getpagesize.h
unexcw.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h sysfile.h text.h vdb.h
unexec.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h getpagesize.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
unexelf.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
-unexelfsgi.o: $(CONFIG_H) compiler.h
-unexencap.o: compiler.h
-unexenix.o: $(CONFIG_H) compiler.h
-unexfreebsd.o: $(CONFIG_H) compiler.h
-unexfx2800.o: compiler.h
-unexhp9k3.o: $(CONFIG_H) compiler.h sysdep.h syssignal.h
unexhp9k800.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
-unexmips.o: $(CONFIG_H) compiler.h getpagesize.h
unexnt.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h intl-auto-encap-win32.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h sysfile.h syswindows.h text.h vdb.h
-unexsni.o: compiler.h
unexsol2-6.o: compiler.h
-unexsol2.o: compiler.h
-unexsunos4.o: $(CONFIG_H) compiler.h
unicode.o: $(CONFIG_H) $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h compiler.h dumper.h extents.h file-coding.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h opaque.h rangetab.h symeval.h symsinit.h sysfile.h text.h vdb.h
vdb-fake.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
vdb-mach.o: $(CONFIG_H) $(LISP_H) compiler.h dumper.h gc.h general-slots.h lisp-disunion.h lisp-union.h lisp.h lrecord.h mc-alloc.h number-gmp.h number-mp.h number.h symeval.h symsinit.h text.h vdb.h
diff -r 75975fd0b7fc -r aa5ed11f473b src/ecrt0.c
--- a/src/ecrt0.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/ecrt0.c Wed Nov 18 08:49:14 2009 -0700
@@ -83,9 +83,7 @@
int errno;
#endif
-#ifndef DONT_NEED_ENVIRON
char **environ;
-#endif
#ifndef static
/* On systems where the static storage class is usable, this function
@@ -95,146 +93,6 @@
static start1 ();
#endif
-#ifdef APOLLO
-extern char *malloc(), *realloc(), *(*_libc_malloc) (), *(*_libc_realloc)();
-extern void free(), (*_libc_free) (); extern int main();
-std_$call void unix_$main();
-
-_start()
-{
- _libc_malloc = malloc;
- _libc_realloc = realloc;
- _libc_free = free;
- unix_$main(main); /* no return */
-}
-#endif /* APOLLO */
-
-#if defined(orion) || defined(pyramid) || defined(celerity) || defined(ALLIANT) || defined(clipper) || defined(sps7)
-
-#if defined(sps7) && defined(V3x)
- asm(" section 10");
- asm(" ds.b 0xb0");
-#endif
-
-#ifdef ALLIANT
-/* _start must initialize _curbrk and _minbrk on the first startup;
- when starting up after dumping, it must initialize them to what they were
- before the dumping, since they are in the shared library and
- are not dumped. See ADJUST_EXEC_HEADER in m-alliant.h. */
-extern unsigned char *_curbrk, *_minbrk;
-extern unsigned char end;
-unsigned char *_setbrk = &end;
-#ifdef ALLIANT_2800
-unsigned char *_end = &end;
-#endif
-#endif
-
-#ifndef DUMMIES
-#define DUMMIES
-#endif
-
-_start (DUMMIES argc, argv, envp)
- int argc;
- char **argv, **envp;
-{
-#ifdef ALLIANT
-#ifdef ALLIANT_2800
- _curbrk = _end;
- _minbrk = _end;
-#else
- _curbrk = _setbrk;
- _minbrk = _setbrk;
-#endif
-#endif
-
- environ = envp;
-
- exit (main (argc, argv, envp));
-}
-
-#endif /* orion or pyramid or celerity or alliant or clipper */
-
-#if defined (ns16000) && !defined (sequent) && !defined (UMAX) && !defined (CRT0_DUMMIES)
-
-_start ()
-{
-/* On 16000, _start pushes fp onto stack */
- start1 ();
-}
-
-/* ignore takes care of skipping the fp value pushed in start. */
-static
-start1 (ignore, argc, argv)
- int ignore;
- int argc;
- char **argv;
-{
- environ = argv + argc + 1;
-
- if (environ == *argv)
- environ--;
- exit (main (argc, argv, environ));
-}
-#endif /* ns16000, not sequent and not UMAX, and not the CRT0_DUMMIES method */
-
-#ifdef UMAX
-_start()
-{
- asm(" exit [] # undo enter");
- asm(" .set exitsc,1");
- asm(" .set sigcatchall,0x400");
-
- asm(" .globl _exit");
- asm(" .globl start");
- asm(" .globl __start");
- asm(" .globl _main");
- asm(" .globl _environ");
- asm(" .globl _sigvec");
- asm(" .globl sigentry");
-
- asm("start:");
- asm(" br .xstart");
- asm(" .org 0x20");
- asm(" .double p_glbl,0,0xf00000,0");
- asm(" .org 0x30");
- asm(".xstart:");
- asm(" adjspb $8");
- asm(" movd 8(sp),0(sp) # argc");
- asm(" addr 12(sp),r0");
- asm(" movd r0,4(sp) # argv");
- asm("L1:");
- asm(" movd r0,r1");
- asm(" addqd $4,r0");
- asm(" cmpqd $0,0(r1) # null args term ?");
- asm(" bne L1");
- asm(" cmpd r0,0(4(sp)) # end of 'env' or 'argv' ?");
- asm(" blt L2");
- asm(" addqd $-4,r0 # envp's are in list");
- asm("L2:");
- asm(" movd r0,8(sp) # env");
- asm(" movd r0,@_environ # indir is 0 if no env ; not 0 if env");
- asm(" movqd $0,tos # setup intermediate signal handler");
- asm(" addr @sv,tos");
- asm(" movzwd $sigcatchall,tos");
- asm(" jsr @_sigvec");
- asm(" adjspb $-12");
- asm(" jsr @_main");
- asm(" adjspb $-12");
- asm(" movd r0,tos");
- asm(" jsr @_exit");
- asm(" adjspb $-4");
- asm(" addr @exitsc,r0");
- asm(" svc");
- asm(" .align 4 # sigvec arg");
- asm("sv:");
- asm(" .double sigentry");
- asm(" .double 0");
- asm(" .double 0");
-
- asm(" .comm p_glbl,1");
-}
-#endif /* UMAX */
-
#ifdef CRT0_DUMMIES
/* Define symbol "start": here; some systems want that symbol. */
@@ -273,8 +131,6 @@
int
_start ()
{
-/* On vax, nothing is pushed here */
-/* On sequent, bogus fp is pushed here */
start1 ();
}
@@ -341,33 +197,6 @@
#else /* m68000, not m68k */
#ifdef m68000
-
-#ifdef ISI68K
-/* Added by ESM Sun May 24 12:44:02 1987 to get new ISI library to work */
-/* Edited by Ray Mon May 15 15:59:56 EST 1989 so we can compile with gcc */
-#if defined(BSD4_3) && !defined(__GNUC__)
-static foo () {
-#endif
- asm (" .globl is68020");
- asm ("is68020:");
-#ifndef BSD4_3
- asm (" .long 0x00000000");
- asm (" .long 0xffffffff");
-/* End of stuff added by ESM */
-#endif
- asm (" .text");
- asm (" .globl __start");
- asm ("__start:");
- asm (" .word 0");
- asm (" link a6,#0");
- asm (" jbsr _start1");
- asm (" unlk a6");
- asm (" rts");
-#if defined(BSD4_3) && !defined(__GNUC__)
- }
-#endif
-#else /* not ISI68K */
-
_start ()
{
#ifdef sun
@@ -376,7 +205,6 @@
/* On 68000, _start pushes a6 onto stack */
start1 ();
}
-#endif /* not ISI68k */
#endif /* m68000 */
#endif /* m68k */
@@ -412,199 +240,6 @@
#endif /* not CRT0_DUMMIES */
-#ifdef hp9000s300
-int argc_value;
-char **argv_value;
-#ifdef OLD_HP_ASSEMBLER
- asm(" text");
- asm(" globl __start");
- asm(" globl _exit");
- asm(" globl _main");
- asm("__start");
- asm(" dc.l 0");
- asm(" subq.w #0x1,d0");
- asm(" move.w d0,float_soft");
- asm(" move.l 0x4(a7),d0");
- asm(" beq.s skip_1");
- asm(" move.l d0,a0");
- asm(" clr.l -0x4(a0)");
- asm("skip_1");
- asm(" move.l a7,a0");
- asm(" subq.l #0x8,a7");
- asm(" move.l (a0),(a7)");
- asm(" move.l (a0),_argc_value");
- asm(" addq.l #0x4,a0");
- asm(" move.l a0,0x4(a7)");
- asm(" move.l a0,_argv_value");
- asm("incr_loop");
- asm(" tst.l (a0)+");
- asm(" bne.s incr_loop");
- asm(" move.l 0x4(a7),a1");
- asm(" cmp.l (a1),a0");
- asm(" blt.s skip_2");
- asm(" subq.l #0x4,a0");
- asm("skip_2");
- asm(" move.l a0,0x8(a7)");
- asm(" move.l a0,_environ");
- asm(" jsr _main");
- asm(" addq.l #0x8,a7");
- asm(" move.l d0,-(a7)");
- asm(" jsr _exit");
- asm(" move.w #0x1,d0");
- asm(" trap #0x0");
- asm(" comm float_soft,4");
-/* float_soft is allocated in this way because C would
- put an underscore character in its name otherwise. */
-
-#else /* new hp assembler */
-
- asm(" text");
- asm(" global float_loc");
- asm(" set float_loc,0xFFFFB000");
- asm(" global fpa_loc");
- asm(" set fpa_loc,0xfff08000");
- asm(" global __start");
- asm(" global _exit");
- asm(" global _main");
- asm("__start:");
- asm(" byte 0,0,0,0");
- asm(" subq.w &1,%d0");
- asm(" mov.w %d0,float_soft");
- asm(" mov.w %d1,flag_68881");
-#ifndef HPUX_68010
- asm(" beq.b skip_float");
- asm(" fmov.l &0x7400,%fpcr");
-/* asm(" fmov.l &0x7480,%fpcr"); */
-#endif /* HPUX_68010 */
- asm("skip_float:");
- asm(" mov.l %a0,%d0");
- asm(" add.l %d0,%d0");
- asm(" subx.w %d1,%d1");
- asm(" mov.w %d1,flag_68010");
- asm(" add.l %d0,%d0");
- asm(" subx.w %d1,%d1");
- asm(" mov.w %d1,flag_fpa");
- asm(" tst.l %d2");
- asm(" ble.b skip_3");
- asm(" lsl flag_68881");
- asm(" lsl flag_fpa");
- asm("skip_3:");
- asm(" mov.l 4(%a7),%d0");
- asm(" beq.b skip_1");
- asm(" mov.l %d0,%a0");
- asm(" clr.l -4(%a0)");
- asm("skip_1:");
- asm(" mov.l %a7,%a0");
- asm(" subq.l &8,%a7");
- asm(" mov.l (%a0),(%a7)");
- asm(" mov.l (%a0),_argc_value");
- asm(" addq.l &4,%a0");
- asm(" mov.l %a0,4(%a7)");
- asm(" mov.l %a0,_argv_value");
- asm("incr_loop:");
- asm(" tst.l (%a0)+");
- asm(" bne.b incr_loop");
- asm(" mov.l 4(%a7),%a1");
- asm(" cmp.l %a0,(%a1)");
- asm(" blt.b skip_2");
- asm(" subq.l &4,%a0");
- asm("skip_2:");
- asm(" mov.l %a0,8(%a7)");
- asm(" mov.l %a0,_environ");
- asm(" jsr _main");
- asm(" addq.l &8,%a7");
- asm(" mov.l %d0,-(%a7)");
- asm(" jsr _exit");
- asm(" mov.w &1,%d0");
- asm(" trap &0");
- asm(" comm float_soft, 4");
- asm(" comm flag_68881, 4");
- asm(" comm flag_68010, 4");
- asm(" comm flag_68040, 4");
- asm(" comm flag_fpa, 4");
-
-#endif /* new hp assembler */
-#endif /* hp9000s300 */
-
-#ifdef GOULD
-
-/* startup code has to be in near text rather
- than fartext as allocated by the C compiler. */
- asm(" .text");
- asm(" .align 2");
- asm(" .globl __start");
- asm(" .text");
- asm("__start:");
-/* setup base register b1 (function base). */
- asm(" .using b1,.");
- asm(" tpcbr b1");
-/* setup base registers b3 through b7 (data references). */
- asm(" file basevals,b3");
-/* setup base register b2 (stack pointer); it should be
- aligned on a 8-word boundary; but because it is pointing
- to argc, its value should be remembered (in r5). */
- asm(" movw b2,r4");
- asm(" movw b2,r5");
- asm(" andw #~0x1f,r4");
- asm(" movw r4,b2");
-/* allocate stack frame to do some work. */
- asm(" subea 16w,b2");
-/* initialize signal catching for UTX/32 1.2; this is
- necessary to make restart from saved image work. */
- asm(" movea sigcatch,r1");
- asm(" movw r1,8w[b2]");
- asm(" svc #1,#150");
-/* setup address of argc for start1. */
- asm(" movw r5,8w[b2]");
- asm(" func #1,_start1");
- asm(" halt");
-/* space for ld to store base register initial values. */
- asm(" .align 5");
- asm("basevals:");
- asm(" .word __base3,__base4,__base5,__base6,__base7");
-
-static
-start1 (xargc)
- int *xargc;
-{
- int argc;
- char **argv;
-
- argc = *xargc;
- argv = (char **)(xargc) + 1;
- environ = argv + argc + 1;
-
- if (environ == argv)
- environ--;
- exit (main (argc, argv, environ));
-
-}
-
-#endif /* GOULD */
-
-#ifdef elxsi
-#include <elxsi/argvcache.h>
-
-extern char **environ;
-extern int errno;
-extern void _init_doscan(), _init_iob();
-extern char end[];
-char *_init_brk = end;
-
-_start()
-{
- environ = exec_cache.ac_envp;
- brk (_init_brk);
- errno = 0;
- _init_doscan ();
- _init_iob ();
- _exit (exit (main (exec_cache.ac_argc,
- exec_cache.ac_argv,
- exec_cache.ac_envp)));
-}
-#endif /* elxsi */
-
-
#ifdef sparc
#ifdef no_toplevel_asm
static no_toplevel_asm_wrapper() {
diff -r 75975fd0b7fc -r aa5ed11f473b src/emacs.c
--- a/src/emacs.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/emacs.c Wed Nov 18 08:49:14 2009 -0700
@@ -895,9 +895,6 @@
Rawbyte stack_bottom_variable;
int skip_args = 0;
Lisp_Object load_me;
-#ifdef NeXT
- extern int malloc_cookie;
-#endif
#if (!defined (SYSTEM_MALLOC) && !defined (HAVE_LIBMCHECK) \
&& !defined (DOUG_LEA_MALLOC))
@@ -929,19 +926,6 @@
}
#endif /* NEW_GC */
-#ifdef NeXT
- /* 19-Jun-1995 -baw
- * NeXT secret magic, ripped from Emacs-for-NS by Carl Edman
- * <cedman@princeton.edu>. Note that even Carl doesn't know what this
- * does; it was provided by NeXT, and it presumably makes NS's mallocator
- * work with dumping. But malloc_jumpstart() and malloc_freezedry() in
- * unexnext.c are both completely undocumented, even in NS header files!
- * But hey, it solves all NS related memory problems, so who's
- * complaining? */
- if (initialized && malloc_jumpstart (malloc_cookie) != 0)
- stderr_out ("malloc jumpstart failed!\n");
-#endif /* NeXT */
-
#if defined (LOSING_GCC_DESTRUCTOR_FREE_BUG)
/* Prior to XEmacs 21, this was `#if 0'ed out. */
/* I'm enabling this because it is the only reliable way I've found to */
@@ -1029,10 +1013,6 @@
setuid (getuid ());
#endif /* SET_EMACS_PRIORITY */
-#ifdef EXTRA_INITIALIZE
- EXTRA_INITIALIZE;
-#endif
-
/* NOTE NOTE NOTE: Keep the following args in sync with the big list of
arguments below in standard_args[], with the help text in startup.el,
and with the list of non-clobbered variables near where pdump_load()
@@ -1581,12 +1561,10 @@
#endif
syms_of_objects ();
syms_of_print ();
-#if !defined (NO_SUBPROCESSES)
syms_of_process ();
#ifdef HAVE_WIN32_PROCESSES
syms_of_process_nt ();
#endif
-#endif
syms_of_profile ();
#if defined (HAVE_MMAP) && defined (REL_ALLOC) && !defined (DOUG_LEA_MALLOC)
syms_of_ralloc ();
@@ -2158,7 +2136,6 @@
vars_of_objects ();
vars_of_print ();
-#ifndef NO_SUBPROCESSES
vars_of_process ();
#ifdef HAVE_UNIX_PROCESSES
vars_of_process_unix ();
@@ -2166,7 +2143,6 @@
#ifdef HAVE_WIN32_PROCESSES
vars_of_process_nt ();
#endif
-#endif
vars_of_profile ();
#if defined (HAVE_MMAP) && defined (REL_ALLOC) && !defined (DOUG_LEA_MALLOC)
diff -r 75975fd0b7fc -r aa5ed11f473b src/faces.c
--- a/src/faces.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/faces.c Wed Nov 18 08:49:14 2009 -0700
@@ -2261,8 +2261,6 @@
set_specifier_fallback (Fget (Vdefault_face, Qbackground, Qnil), bg_fb);
}
- /* #### We may want to have different fallback values if NeXTstep
- support is compiled in. */
{
Lisp_Object inst_list = Qnil;
diff -r 75975fd0b7fc -r aa5ed11f473b src/fileio.c
--- a/src/fileio.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/fileio.c Wed Nov 18 08:49:14 2009 -0700
@@ -53,9 +53,6 @@
#ifdef HPUX
#include <netio.h>
-#ifdef HPUX_PRE_8_0
-#include <errnet.h>
-#endif /* HPUX_PRE_8_0 */
#endif /* HPUX */
#ifdef WIN32_ANY
diff -r 75975fd0b7fc -r aa5ed11f473b src/getloadavg.c
--- a/src/getloadavg.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/getloadavg.c Wed Nov 18 08:49:14 2009 -0700
@@ -27,30 +27,19 @@
Returns a double.
LDAV_SYMBOL Name of kernel symbol giving load average.
LOAD_AVE_TYPE Type of the load average array in the kernel.
- Must be defined unless one of
- apollo, DGUX, NeXT, or UMAX is defined;
- otherwise, no load average is available.
+ Must be defined; otherwise, no load average
+ is available.
NLIST_STRUCT Include nlist.h, not a.out.h, and
the nlist n_name element is a pointer,
not an array.
- NLIST_NAME_UNION struct nlist has an n_un member, not n_name.
LINUX_LDAV_FILE [__linux__]: File containing load averages.
Specific system predefines this file uses, aside from setting
default values if not emacs:
- apollo
BSD Real BSD, not just BSD-like.
- convex
- DGUX
hpux
- NeXT
sgi
- sequent Sequent Dynix 3.x.x (BSD)
- _SEQUENT_ Sequent DYNIX/ptx 1.x.x (SYSV)
- sony_news NEWS-OS (works at least for 4.1C)
- UMAX
- UMAX4_3
WIN32_NATIVE No-op for Windows9x/NT.
CYGWIN No-op for Cygwin.
__linux__ Linux: assumes /proc filesystem mounted.
@@ -92,22 +81,6 @@
#include <kstat.h>
#endif /* HAVE_KSTAT_H */
-#if !defined (BSD) && defined (ultrix)
-/* Ultrix behaves like BSD on Vaxen. */
-#define BSD
-#endif
-
-#ifdef NeXT
-/* NeXT in the 2.{0,1,2} releases defines BSD in <sys/param.h>, which
- conflicts with the definition understood in this file, that this
- really is BSD. */
-#undef BSD
-
-/* NeXT defines FSCALE in <sys/param.h>. However, we take FSCALE being
- defined to mean that the nlist method should be used, which is not true. */
-#undef FSCALE
-#endif
-
/* Set values that are different from the defaults, which are
set a little farther down with #ifndef. */
@@ -118,14 +91,6 @@
#define hpux
#endif
-#if defined(hp300) && !defined(hpux)
-#define MORE_BSD
-#endif
-
-#if defined(ultrix) && defined(mips)
-#define decstation
-#endif
-
#if (defined(sun) && defined(SVR4)) || defined (SOLARIS2)
#define SUNOS_5
#endif
@@ -143,21 +108,10 @@
#include <sys/table.h>
#endif
-/* UTek's /bin/cc on the 4300 has no architecture specific cpp define by
- default, but _MACH_IND_SYS_TYPES is defined in <sys/types.h>. Combine
- that with a couple of other things and we'll have a unique match. */
-#if !defined (tek4300) && defined (unix) && defined (m68k) && defined (mc68000) && defined (mc68020) && defined (_MACH_IND_SYS_TYPES)
-#define tek4300 /* Define by emacs, but not by other users. */
-#endif
-
/* VAX C can't handle multi-line #ifs, or lines longer than 256 chars. */
#ifndef LOAD_AVE_TYPE
-#ifdef MORE_BSD
-#define LOAD_AVE_TYPE long
-#endif
-
#ifdef sun
#define LOAD_AVE_TYPE long
#endif
@@ -166,10 +120,6 @@
#define LOAD_AVE_TYPE long
#endif
-#ifdef _SEQUENT_
-#define LOAD_AVE_TYPE long
-#endif
-
#ifdef sgi
#define LOAD_AVE_TYPE long
#endif
@@ -182,10 +132,6 @@
#define LOAD_AVE_TYPE long
#endif
-#ifdef sequent
-#define LOAD_AVE_TYPE long
-#endif
-
#ifdef OSF_ALPHA
#define LOAD_AVE_TYPE long
#endif
@@ -194,25 +140,10 @@
#define LOAD_AVE_TYPE long
#endif
-#ifdef tek4300
-#define LOAD_AVE_TYPE long
-#endif
-
-#if defined(alliant) && defined(i860) /* Alliant FX/2800 */
-#define LOAD_AVE_TYPE long
-#endif
-
#ifdef _AIX
#define LOAD_AVE_TYPE long
#endif
-#ifdef convex
-#define LOAD_AVE_TYPE double
-#ifndef LDAV_CVT
-#define LDAV_CVT(n) (n)
-#endif
-#endif
-
#endif /* No LOAD_AVE_TYPE. */
#ifdef OSF_ALPHA
@@ -222,27 +153,15 @@
#define FSCALE 1024.0
#endif
-#if defined(alliant) && defined(i860) /* Alliant FX/2800 */
-/* <sys/param.h> defines an incorrect value for FSCALE on an
- Alliant FX/2800 Concentrix 2.2, according to ghazi@noc.rutgers.edu. */
-#undef FSCALE
-#define FSCALE 100.0
-#endif
-
-
#ifndef FSCALE
/* SunOS and some others define FSCALE in sys/param.h. */
-#ifdef MORE_BSD
-#define FSCALE 2048.0
-#endif
-
#if defined(MIPS) || defined(SVR4) || defined(decstation)
#define FSCALE 256
#endif
-#if defined (sgi) || defined (sequent)
+#if defined (sgi)
/* Sometimes both MIPS and sgi are defined, so FSCALE was just defined
above under #ifdef MIPS. But we want the sgi value. */
#undef FSCALE
@@ -253,10 +172,6 @@
#define FSCALE 65536.0
#endif
-#ifdef tek4300
-#define FSCALE 100.0
-#endif
-
#ifdef _AIX
#define FSCALE 65536.0
#endif
@@ -270,10 +185,6 @@
/* VAX C can't handle multi-line #ifs, or lines longer that 256 characters. */
#ifndef NLIST_STRUCT
-#ifdef MORE_BSD
-#define NLIST_STRUCT
-#endif
-
#ifdef sun
#define NLIST_STRUCT
#endif
@@ -286,10 +197,6 @@
#define NLIST_STRUCT
#endif
-#if defined (_SEQUENT_) || defined (sequent)
-#define NLIST_STRUCT
-#endif
-
#ifdef sgi
#define NLIST_STRUCT
#endif
@@ -310,18 +217,10 @@
#define NLIST_STRUCT
#endif
-#ifdef tek4300
-#define NLIST_STRUCT
-#endif
-
#ifdef butterfly
#define NLIST_STRUCT
#endif
-#if defined(alliant) && defined(i860) /* Alliant FX/2800 */
-#define NLIST_STRUCT
-#endif
-
#ifdef _AIX
#define NLIST_STRUCT
#endif
@@ -333,25 +232,15 @@
#define FIXUP_KERNEL_SYMBOL_ADDR(nl) ((nl)[0].n_value &= ~(1 << 31))
#endif
-
-#if !defined (KERNEL_FILE) && defined (sequent)
-#define KERNEL_FILE "/dynix"
-#endif
-
#if !defined (KERNEL_FILE) && defined (hpux)
#define KERNEL_FILE "/hp-ux"
#endif
-#if !defined(KERNEL_FILE) && (defined(_SEQUENT_) || defined(MIPS) || defined(SVR4) || defined(ISC) || defined (sgi) || defined(SVR4) || (defined (ardent) && defined (titan)))
+#if !defined(KERNEL_FILE) && (defined(MIPS) || defined(SVR4) || defined(ISC) || defined (sgi) || defined(SVR4) || (defined (ardent) && defined (titan)))
#define KERNEL_FILE "/unix"
#endif
-
-#if !defined (LDAV_SYMBOL) && defined (alliant)
-#define LDAV_SYMBOL "_Loadavg"
-#endif
-
-#if !defined(LDAV_SYMBOL) && ((defined(hpux) && !defined(hp9000s300)) || defined(_SEQUENT_) || defined(SVR4) || defined(ISC) || defined(sgi) || (defined (ardent) && defined (titan)) || defined (_AIX))
+#if !defined(LDAV_SYMBOL) && (defined(hpux) || defined(SVR4) || defined(ISC) || defined(sgi) || (defined (ardent) && defined (titan)) || defined (_AIX))
#define LDAV_SYMBOL "avenrun"
#endif
@@ -394,45 +283,10 @@
#endif /* LOAD_AVE_TYPE */
-#ifdef NeXT
-#ifdef HAVE_MACH_MACH_H
-#include <mach/mach.h>
-#else
-#include <mach.h>
-#endif
-#endif /* NeXT */
-
#ifdef sgi
#include <sys/sysmp.h>
#endif /* sgi */
-#ifdef UMAX
-#include <stdio.h>
-#include "syssignal.h"
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/syscall.h>
-
-#ifdef UMAX_43
-#include <machine/cpu.h>
-#include <inq_stats/statistics.h>
-#include <inq_stats/sysstats.h>
-#include <inq_stats/cpustats.h>
-#include <inq_stats/procstats.h>
-#else /* Not UMAX_43. */
-#include <sys/sysdefs.h>
-#include <sys/statistics.h>
-#include <sys/sysstats.h>
-#include <sys/cpudefs.h>
-#include <sys/cpustats.h>
-#include <sys/procstats.h>
-#endif /* Not UMAX_43. */
-#endif /* UMAX */
-
-#ifdef DGUX
-#include <sys/dg_sys_info.h>
-#endif
-
#if defined (HAVE_SYS_PSTAT_H)
#include <sys/pstat.h>
#endif /* HAVE_SYS_PSTAT_H (on HPUX) */
@@ -440,20 +294,6 @@
/* Avoid static vars inside a function since in HPUX they dump as pure. */
-#ifdef NeXT
-static processor_set_t default_set;
-static int getloadavg_initialized;
-#endif /* NeXT */
-
-#ifdef UMAX
-static unsigned int cpus = 0;
-static unsigned int samples;
-#endif /* UMAX */
-
-#ifdef DGUX
-static struct dg_sys_info_load_info load_info; /* what-a-mouthful! */
-#endif /* DGUX */
-
#ifdef LOAD_AVE_TYPE
/* File descriptor open to /dev/kmem */
static int channel;
@@ -617,139 +457,6 @@
loadavg[elem] = (double) load_ave[elem] / (double) scale;
#endif /* __NetBSD__ or __OpenBSD__ */
-#if !defined (LDAV_DONE) && defined (NeXT)
-#define LDAV_DONE
- /* The NeXT code was adapted from iscreen 3.2. */
-
- host_t host;
- struct processor_set_basic_info info;
- unsigned info_count;
-
- /* We only know how to get the 1-minute average for this system,
- so even if the caller asks for more than 1, we only return 1. */
-
- if (!getloadavg_initialized)
- {
- if (processor_set_default (host_self (), &default_set) == KERN_SUCCESS)
- getloadavg_initialized = 1;
- }
-
- if (getloadavg_initialized)
- {
- info_count = PROCESSOR_SET_BASIC_INFO_COUNT;
- if (processor_set_info (default_set, PROCESSOR_SET_BASIC_INFO, &host,
- (processor_set_info_t) &info, &info_count)
- != KERN_SUCCESS)
- getloadavg_initialized = 0;
- else
- {
- if (nelem > 0)
- loadavg[elem++] = (double) info.load_average / LOAD_SCALE;
- }
- }
-
- if (!getloadavg_initialized)
- return -1;
-#endif /* NeXT */
-
-#if !defined (LDAV_DONE) && defined (UMAX)
-#define LDAV_DONE
-/* UMAX 4.2, which runs on the Encore Multimax multiprocessor, does not
- have a /dev/kmem. Information about the workings of the running kernel
- can be gathered with inq_stats system calls.
- We only know how to get the 1-minute average for this system. */
-
- struct proc_summary proc_sum_data;
- struct stat_descr proc_info;
- double load;
- REGISTER unsigned int i, j;
-
- if (cpus == 0)
- {
- REGISTER unsigned int c, i;
- struct cpu_config conf;
- struct stat_descr desc;
-
- desc.sd_next = 0;
- desc.sd_subsys = SUBSYS_CPU;
- desc.sd_type = CPUTYPE_CONFIG;
- desc.sd_addr = (char *) &conf;
- desc.sd_size = sizeof (conf);
-
- if (inq_stats (1, &desc))
- return -1;
-
- c = 0;
- for (i = 0; i < conf.config_maxclass; ++i)
- {
- struct class_stats stats;
- memset ((char *) &stats, 0, sizeof (stats));
-
- desc.sd_type = CPUTYPE_CLASS;
- desc.sd_objid = i;
- desc.sd_addr = (char *) &stats;
- desc.sd_size = sizeof (stats);
-
- if (inq_stats (1, &desc))
- return -1;
-
- c += stats.class_numcpus;
- }
- cpus = c;
- samples = cpus < 2 ? 3 : (2 * cpus / 3);
- }
-
- proc_info.sd_next = 0;
- proc_info.sd_subsys = SUBSYS_PROC;
- proc_info.sd_type = PROCTYPE_SUMMARY;
- proc_info.sd_addr = (char *) &proc_sum_data;
- proc_info.sd_size = sizeof (struct proc_summary);
- proc_info.sd_sizeused = 0;
-
- if (inq_stats (1, &proc_info) != 0)
- return -1;
-
- load = proc_sum_data.ps_nrunnable;
- j = 0;
- for (i = samples - 1; i > 0; --i)
- {
- load += proc_sum_data.ps_nrun[j];
- if (j++ == PS_NRUNSIZE)
- j = 0;
- }
-
- if (nelem > 0)
- loadavg[elem++] = load / samples / cpus;
-#endif /* UMAX */
-
-#if !defined (LDAV_DONE) && defined (DGUX)
-#define LDAV_DONE
- /* This call can return -1 for an error, but with good args
- it's not supposed to fail. The first argument is for no
- apparent reason of type `long int *'. */
- dg_sys_info ((long int *) &load_info,
- DG_SYS_INFO_LOAD_INFO_TYPE,
- DG_SYS_INFO_LOAD_VERSION_0);
-
- if (nelem > 0)
- loadavg[elem++] = load_info.one_minute;
- if (nelem > 1)
- loadavg[elem++] = load_info.five_minute;
- if (nelem > 2)
- loadavg[elem++] = load_info.fifteen_minute;
-#endif /* DGUX */
-
-#if !defined (LDAV_DONE) && defined (OSF_MIPS)
-#define LDAV_DONE
-
- struct tbl_loadavg load_ave;
- table (TBL_LOADAVG, 0, &load_ave, 1, sizeof (load_ave));
- loadavg[elem++]
- = (load_ave.tl_lscale == 0
- ? load_ave.tl_avenrun.d[0]
- : (load_ave.tl_avenrun.l[0] / (double) load_ave.tl_lscale));
-#endif /* OSF_MIPS */
-
#if !defined (LDAV_DONE) && defined (WIN32_ANY)
#define LDAV_DONE
@@ -760,18 +467,6 @@
}
#endif /* WIN32_NATIVE or CYGWIN */
-#if !defined (LDAV_DONE) && defined (OSF_ALPHA)
-#define LDAV_DONE
-
- struct tbl_loadavg load_ave;
- table (TBL_LOADAVG, 0, &load_ave, 1, sizeof (load_ave));
- for (elem = 0; elem < nelem; elem++)
- loadavg[elem]
- = (load_ave.tl_lscale == 0
- ? load_ave.tl_avenrun.d[elem]
- : (load_ave.tl_avenrun.l[elem] / (double) load_ave.tl_lscale));
-#endif /* OSF_ALPHA */
-
#if !defined (LDAV_DONE) && defined(LOAD_AVE_TYPE)
/* UNIX-specific code -- read the average from /dev/kmem. */
@@ -788,13 +483,8 @@
strcpy (nl[0].n_name, LDAV_SYMBOL);
strcpy (nl[1].n_name, "");
#else /* NLIST_STRUCT */
-#ifdef NLIST_NAME_UNION
- nl[0].n_un.n_name = LDAV_SYMBOL;
- nl[1].n_un.n_name = 0;
-#else /* not NLIST_NAME_UNION */
nl[0].n_name = (char *) LDAV_SYMBOL;
nl[1].n_name = 0;
-#endif /* not NLIST_NAME_UNION */
#endif /* NLIST_STRUCT */
#ifndef SUNOS_5
diff -r 75975fd0b7fc -r aa5ed11f473b src/getpagesize.h
--- a/src/getpagesize.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/getpagesize.h Wed Nov 18 08:49:14 2009 -0700
@@ -54,13 +54,9 @@
#if (defined (sparc) && defined (USG)) || defined (SOLARIS2)
#define getpagesize() PAGESIZE
#else /* not Solaris 2 */
-#ifdef NBPC
-#define getpagesize() NBPC
-#else /* no NBPC */
#ifdef PAGESIZE
#define getpagesize() PAGESIZE
#endif
-#endif /* NBPC */
#endif /* not Solaris 2 */
#endif /* no NBPG */
#endif /* no EXEC_PAGESIZE */
diff -r 75975fd0b7fc -r aa5ed11f473b src/gmalloc.c
--- a/src/gmalloc.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/gmalloc.c Wed Nov 18 08:49:14 2009 -0700
@@ -1219,10 +1219,6 @@
#define __sbrk sbrk
/* #endif */
-#ifdef GMALLOC_NEEDS_SBRK_DECL
-/* some versions of OSF1 need this */
-extern __ptr_t __sbrk __P ((ssize_t increment));
-#else
#ifdef __GNU_LIBRARY__
/* It is best not to declare this and cast its result on foreign operating
systems with potentially hostile include files. */
@@ -1230,7 +1226,6 @@
extern __ptr_t __sbrk __P ((int increment));
#endif
#endif
-#endif
#ifndef NULL
#define NULL 0
diff -r 75975fd0b7fc -r aa5ed11f473b src/hftctl.c
--- a/src/hftctl.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,343 +0,0 @@
-/* IBM has disclaimed copyright on this module. */
-
-/* Synched up with: FSF 19.30. */
-
-/***************************************************************/
-/* */
-/* Function: hftctl */
-/* */
-/* Syntax: */
-/* #include <sys/ioctl.h> */
-/* #include <sys/hft.h> */
-/* */
-/* int hftctl(fildes, request, arg ) */
-/* int fildes, request; */
-/* char *arg; */
-/* */
-/* Description: */
-/* */
-/* Does the following: */
-/* 1. determines if fildes is pty */
-/* does normal ioctl it is not */
-/* 2. places fildes into raw mode */
-/* 3. converts ioctl arguments to data stream */
-/* 4. waits for 2 secs for acknowledgement before */
-/* timing out. */
-/* 5. places response in callers buffer ( just like */
-/* ioctl. */
-/* 6. returns fildes to its original mode */
-/* */
-/* User of this program should review steps 1,4, and 3. */
-/* hftctl makes no check on the request type. It must be */
-/* a HFT ioctl that is supported remotely. */
-/* This program will use the SIGALRM and alarm(2). Any */
-/* Previous alarms are lost. */
-/* */
-/* Users of this program are free to modify it any way */
-/* they want. */
-/* */
-/* Return Value: */
-/* */
-/* If ioctl fails, a value of -1 is returned and errno */
-/* is set to indicate the error. */
-/* */
-/***************************************************************/
-
-#include <config.h>
-#include "lisp.h"
-#include "sysfile.h"
-
-#include <sys/signal.h>
-#include <errno.h>
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <setjmp.h>
-#include <sys/ioctl.h>
-#include <sys/devinfo.h>
-#include <termios.h>
-#include <termio.h>
-#include <sys/hft.h>
-#include <sys/uio.h>
-#include <sys/tty.h>
-/* #include <sys/pty.h> */
-
-#define REMOTE 0x01
-
-#undef ioctl
-static char SCCSid[] = "com/gnuemacs/src,3.1,9021-90/05/03-5/3/90";
-
-/*************** LOCAL DEFINES **********************************/
-
-#define QDEV ((HFQPDEVCH<<8)|HFQPDEVCL)
-#define QLOC ((HFQLOCCH<<8)|HFQLOCCL)
-#define QPS ((HFQPRESCH<<8)|HFQPRESCL)
-
-#ifndef TCGETS
-#define TCGETS TCGETA
-#endif
-#ifndef TCSETS
-#define TCSETS TCSETA
-#endif
-
-/*************** EXTERNAL / GLOBAL DATA AREA ********************/
-
-static int hfqry();
-static int hfskbd();
-
-extern int errno;
-static JMP_BUF hftenv;
-static int is_ack_vtd;
-static SIGTYPE (*sav_alrm) ();
-static struct hfctlreq req =
- { 0x1b,'[','x',0,0,0,21,HFCTLREQCH,HFCTLREQCL};
-static struct hfctlack ACK =
- { 0x1b,'[','x',0,0,0,21,HFCTLACKCH,HFCTLACKCL};
-
- /* FUNC signal(); */
-
-/*************** LOCAL MACROS ***********************************/
-
-#define HFTYPE(p) ((p->hf_typehi<<8)|(p->hf_typelo))
-
-#define BYTE4(p) ((p)[0]<<24 | (p)[1]<<16 | (p)[2]<<8 | (p)[3])
-
- /* read a buffer */
-#define RD_BUF(f,p,l) \
- while ((l)) \
- if ((j = read ((f),(p),(l))) < 0) \
- if (errno != EINTR) return (-1); \
- else continue; \
- else { (l) -= j; (p) += j; }
-
-/*************** function prototypes ***************************/
-#ifdef __STDC__
-static GT_ACK (int fd, int req, char *buf);
-static WR_REQ (int fd, int request, int cmdlen, char *cmd, int resplen);
-static void hft_alrm(int sig);
-#else
-static GT_ACK ();
-static WR_REQ ();
-static void hft_alrm ();
-#endif
-
-/*************** HFTCTL FUNCTION *******************************/
-
-hftctl (fd, request, arg)
- int fd;
- int request;
- union {
- struct hfintro *intro;
- struct hfquery *query;
- char *c;
- } arg;
-{
-
- int i;
- int fd_flag; /* fcntl flags */
- union {
- struct hfintro *cmd; /* p.cmd - intro des. */
- struct hfqphdevc *ph; /* p.ph - physical dev.*/
- char *c; /* p.c - char ptr */
- } p; /* general pointer */
- int pty_new; /* pty modes */
- int pty_old;
- int retcode;
- struct termios term_new; /* terminal attributes */
- struct termios term_old;
- struct devinfo devInfo; /* defined in sys/devinfo.h */
-
-
- if (ioctl (fd, IOCINFO, &devInfo) == -1) return(-1);
-
- if (devInfo.devtype != DD_PSEU) /* is it a pty? */
- return (ioctl(fd, request, arg)); /* no, do IOCTL */
-
- /******* START PTY **************/
- /** Pty found, possible HFT */
- /** set new file des as raw */
- /** as you can. */
- /********************************/
-
- /* Get current state of file */
- /* descriptor & save */
- if ((fd_flag = fcntl (fd, F_GETFL, 0)) == -1) return (-1);
- if (ioctl (fd, TCGETS, &term_old) == -1) return (-1);
- /* set terminal attr to raw */
- /* and to delay on read */
- pty_new = pty_old | REMOTE;
- memcpy (&term_new, &term_old, sizeof (term_new));
- term_new.c_iflag = 0;
- term_new.c_oflag = 0;
- term_new.c_lflag = 0;
- /* term_new.c_line = 0; */
- for (i = 1; i <= 5; i++)
- term_new.c_cc[i] = 0;
- term_new.c_cc[0] = -1;
- ioctl (fd, TCSETS, &term_new);
- if (fcntl (fd, F_SETFL, fd_flag & ~O_NDELAY) == -1)
- return(-1);
- /* call spacific function */
- if (request == HFSKBD)
- retcode = hfskbd (fd, request, arg.c);
- else /* assume HFQUERY */
- retcode = hfqry (fd, request, arg.c);
-
- fcntl (fd, F_SETFL, fd_flag); /* reset terminal to original */
- ioctl (fd, TCSETS, &term_old);
-
-
- return (retcode); /* return error */
-}
-
-/*************** HFSKBD FUNCTION ******************************/
-static int
-hfskbd (fd, request, arg)
- int fd;
- int request;
- struct hfbuf *arg;
-{
- WR_REQ(fd, request, arg->hf_buflen, arg->hf_bufp,0);
- return (GT_ACK(fd, request, arg->hf_bufp));
-}
-
-/*************** HFQUERY FUNCTION ******************************/
-static int
-hfqry (fd, request, arg)
- int fd;
- int request;
- struct hfquery *arg;
-{
- WR_REQ(fd, request, arg->hf_cmdlen, arg->hf_cmd, arg->hf_resplen);
- return (GT_ACK(fd, request, arg->hf_resp));
-}
-
-
-/*************** GT_ACK FUNCTION ******************************/
-static int
-GT_ACK (fd, req, buf)
- int fd;
- int req;
- char *buf;
-{
- struct hfctlack ack;
- int i = sizeof (ack);
- int j = 0;
- union {
- char *c;
- struct hfctlack *ack;
- } p;
-
- is_ack_vtd = 0; /* flag no ACT VTD yet */
-
- if (SETJMP (hftenv)) /* set environment in case */
- { /* of time out */
- errno = ENODEV; /* if time out, set errno */
- return (-1); /* flag error */
- }
-
- alarm(3); /* time out in 3 secs */
- sav_alrm = signal (SIGALRM, hft_alrm); /* prepare to catch time out */
-
- p.ack = &ack;
- while (! is_ack_vtd) /* do until valid ACK VTD */
- {
- RD_BUF(fd, p.c, i); /* read until a ACK VTD is fill*/
-
- if (! memcmp (&ack, &ACK, sizeof (HFINTROSZ)) /* the ACK intro & */
- && (ack.hf_request == req)) /* is it the response we want ?*/
- { /* yes, ACK VTD found */
- is_ack_vtd = 1; /* quickly, flag it */
- break; /* get the %$%#@ out of here */
- }
-
- p.ack = &ack; /* no, then skip 1st */
- ++p.c; /* char and start over */
- i = sizeof (ack) - 1; /* one less ESC to cry over */
-
- while ((*p.c != 0x1b) && i) /* scan for next ESC */
- { ++p.c; --i; } /* if any */
-
- (i ? memcpy (&ack, p.c, i) : 0); /* if any left over, then move */
- p.ack = &ack; /* ESC to front of ack struct */
- p.c += i; /* skip over what's been read */
- i = sizeof (ack) - i; /* set what's left to be read */
- } /***** TRY AGAIN */
-
- alarm(0); /* ACK VTD received, reset alrm*/
- signal (SIGALRM, sav_alrm); /* reset signal */
-
- if (i = ack.hf_arg_len) /* any data following ? */
- { /* yes, */
- RD_BUF(fd,buf,i); /* read until it is received */
- }
-
- if (errno = ack.hf_retcode) /* set errno based on returned */
- return (-1); /* code, if 0, then no error */
- else
- return (0); /* if set, then error returned */
-}
-
-/*************** HFT_ALRM FUNCTION ******************************/
-static void
-hft_alrm (sig) /* Function hft_alrm - handle */
- int sig; /* alarm signal */
-{
- signal (SIGALRM, sav_alrm); /* reset to previous */
-
- if (is_ack_vtd) /* has ack vtd arrived ? */
- return; /* yes, then continue */
- else /* no, then return with error */
- LONGJMP (hftenv, -1);
-
-}
-
-/*********************************************************************/
-/*** ***/
-/*** NOTE: Both the HFCTLREQ and the arg structure should be ***/
-/*** sent in one io write operation. If terminal ***/
-/*** emulators are in NODELAY mode then multiple writes ***/
-/*** may cause bogus information to be read by the emulator ***/
-/*** depending on the timing. ***/
-/*** ***/
-/*********************************************************************/
-
-static int
-WR_REQ (fd, request, cmdlen, cmd, resplen)
- int fd;
- int request;
- int cmdlen;
- char *cmd;
- int resplen;
-{
- struct {
- char *c;
- struct hfctlreq *req;
- } p;
- int size;
-
- req.hf_request = request;
- req.hf_arg_len = cmdlen;
- req.hf_rsp_len = resplen;
-
- if (cmdlen) /* if arg structure to pass */
- {
- size = sizeof (struct hfctlreq) + cmdlen;
- if ((p.c = xmalloc (size)) == NULL) /* malloc one area */
- return (-1);
-
- memcpy (p.c, &req, sizeof (req)); /* copy CTL REQ struct */
- memcpy (p.c + sizeof (req), cmd, cmdlen); /* copy arg struct */
- }
- else
- {
- p.req = &req; /* otherwise use only CTL REQ */
- size = sizeof (req);
- }
-
- /* write request to terminal */
- if (write(fd,p.c,size) == -1) return (-1);
- if (p.req != &req) /* free if allocated */
- xfree (p.c, char *);
- return (0);
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/hpplay.c
--- a/src/hpplay.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/hpplay.c Wed Nov 18 08:49:14 2009 -0700
@@ -55,13 +55,8 @@
#include "sound.h"
-#ifdef HPUX10
#include <Alib.h>
#include <CUlib.h>
-#else /* !HPUX 10 */
-#include <audio/Alib.h>
-#include <audio/CUlib.h>
-#endif /* !HPUX 10 */
Lisp_Object Vhp_play_server;
diff -r 75975fd0b7fc -r aa5ed11f473b src/libsst.h
--- a/src/libsst.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/libsst.h Wed Nov 18 08:49:14 2009 -0700
@@ -18,16 +18,12 @@
#define INCLUDED_libsst_h_
#include <sys/ioctl.h>
-#ifndef SUNOS4_0_3
#define AUDIO_4_0_3_COMPAT
#define AUDIO_CHIP
#define AMD_CHIP /* SparcStation 1, 2, IPC, and IPX */
#include <sbusdev/audio_79C30.h>
#include <multimedia/libaudio.h>
#include <multimedia/audio_device.h>
-#else
-#include <sbusdev/audioreg.h>
-#endif
#include <sun/audioio.h>
#define SAMPLES_PER_SECOND 8192
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/7300.h
--- a/src/m/7300.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/* machine description file for AT&T UNIX PC model 7300
- Copyright (C) 1986 Free Software Foundation, Inc.
- Modified for this machine by mtxinu!rtech!gonzo!daveb
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000 are the ones defined so far. */
-
-# ifndef mc68k
-# define mc68k
-# endif
-#ifndef m68k
-#define m68k
-#endif
-
-/* Cause crt0.c to define errno. */
-
-#define NEED_ERRNO
-
-/* Data type of load average, as read out of kmem. */
-/* These are commented out since it is not supported by this machine. */
-
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0) */
-
-#ifdef __GNUC__
-
-#else
-
-#define SWITCH_ENUM_BUG
-
-#endif
-
-/* We don't have memmove. */
-#define memmove(d, s, n) safe_bcopy (s, d, n)
-
-/* These three lines were new in 18.50. They were said to permit
- a demand-paged executable, but someone else says they don't work.
- Someone else says they do. They didn't work because errno was an
- initialized variable in crt0.c, and because of %splimit (also therein),
- both of which have been fixed now. */
-#define SECTION_ALIGNMENT 0x03ff
-#define SEGMENT_MASK 0xffff
-#define LD_SWITCH_MACHINE "-z"
-
-/* Insist on using cc when compiling this. GCC may have been
- configured to use GAS syntax, which causes problems. */
-#define CRT0_COMPILE "cc -c -O -Demacs"
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/acorn.h
--- a/src/m/acorn.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/* Machine description file for Acorn RISCiX machines.
- Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-/* ARM note - this is done by the Norcroft compiler - symbol is `__arm' */
-
-#ifdef LDAV_SYMBOL
-#undef LDAV_SYMBOL
-#endif
-
-#define LDAV_SYMBOL "_iavenrun"
-
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/*
- * Scale factor for scaled integers used to count
- * %cpu time and load averages.
- */
-
-/* FSHIFT and FSCALE are defined in param.h, but are required by
- LOAD_AVE_CVT, so they need to be defined here. */
-
-#ifndef FSHIFT
-#define FSHIFT 8 /* bits to right of fixed binary point */
-#endif
-
-#ifndef FSCALE
-#define FSCALE (1<<FSHIFT)
-#endif
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* This prevents Emacs dumping an unsqueezed binary with the
- SQUEEZE bit set in the magic number. */
-
-#define ADJUST_EXEC_HEADER {hdr.a_magic &= ~MF_SQUEEZED;}
-
-#ifdef __GNUC__
-
-/* Keep gcc/RISCiX happy - it uses __gccmain where other versions of
- gcc use __main, because of a library routine name clash. */
-#define __main __gccmain
-
-#endif /* __GNUC__ */
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-
-#ifndef NOT_C_CODE
-#define TEXT_START 0x8000
-extern int _edata;
-#define etext _etext
-#endif
-
-/* Avoid debugging library */
-#define LIBS_DEBUG
-
-/* Avoid sharing libc */
-#define LIB_STANDARD "-lc_n"
-
-/* Avoid sharing libX11 */
-#define LIB_X11_LIB "-lX11_n"
-
-/* All kinds of symbol definitions, so as to avoid multiply defined symbol
- errors from the RISCiX linker. */
-
-#ifdef __GNUC__
-#define C_DEBUG_SWITCH
-
-#define C_OPTIMIZE_SWITCH "-O1 -fomit-frame-pointer -w -g -Dgetopt=gnu_getopt -Dopterr=gnu_opterr -Doptind=gnu_optind -Doptarg=gnu_optarg -Dcfree=gnu_cfree -D___type="
-
-#else
-#define C_DEBUG_SWITCH "-O -w -g -Dgetopt=gnu_getopt -Dopterr=gnu_opterr -Doptind=gnu_optind -Doptarg=gnu_optarg -Dcfree=gnu_cfree"
-#endif
-
-/* Turn this on to avoid the emacs malloc and use standard one */
-
-#undef SYSTEM_MALLOC
-
-#ifdef NO_REMAP
-/* CRT0_O is defined in s/riscix1-1.h or s/riscix1-2.h, as appropriate. */
-#define START_FILES "pre-crt0.o CRT0_O"
-#else
-Cannot
-do
-this
-yet
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/alliant-2800.h
--- a/src/m/alliant-2800.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/* alliant-2800.h - Alliant FX/2800 machine running Concentrix 2800.
- Copyright (C) 1990 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-3" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-
-#define ALLIANT
-#define ALLIANT_2800
-#define sun /* Use X support for Sun keyboard stuff. */
-#define C_OPTIMIZE_SWITCH "-Og" /* No concurrent code allowed here. */
-
-/* Concentrix uses a different kernel symbol for load average. */
-
-#undef LDAV_SYMBOL /* Undo definition in s-bsd4-2.h */
-#define LDAV_SYMBOL "_Loadavg"
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (x * 100 / LOADAVG_SCALE)
-
-/* include <sys/param.h> for the definition of LOADAVG_SCALE, and also
- LOADAVG_SIZE, the number of items in the Loadavg array. */
-
-#define UNEXEC "unexfx2800.o"
-#define LIBS_MACHINE "-lalliant"
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-/* Actually, Alliant CONCENTRIX does paging "right":
- data pages are copy-on-write, which means that the pure data areas
- are shared automatically and remapping is not necessary. */
-
-#define NO_REMAP
-
-/* Alliant needs special crt0.o because system version is not reentrant */
-
-#define START_FILES "crt0.o"
-
-/* Alliant dependent code for dumping executing image.
- See crt0.c code for alliant. */
-
-#define ADJUST_EXEC_HEADER {\
-extern int _curbrk, _setbrk;\
-_setbrk = _curbrk;\
-hdr.a_bss_addr = bss_start;\
-unexec_text_start = hdr.a_text_addr;}
-
-#if 0 /* RMSmacs */
-/* Use the K&R version of the DEFUN macro. */
-#define USE_NONANSI_DEFUN
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/alliant.h
--- a/src/m/alliant.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/* alliant.h Alliant machine running system version 2 or 3.
- Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
- Note that for version 1 of the Alliant system
- you should use alliant1.h instead of this file.
- Use alliant4.h for version 4.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-
-#define ALLIANT
-
-/* No load average information available for Alliants. */
-
-#undef LOAD_AVE_TYPE
-#undef LOAD_AVE_CVT
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-/* Actually, Alliant CONCENTRIX does paging "right":
- data pages are copy-on-write, which means that the pure data areas
- are shared automatically and remapping is not necessary. */
-
-#define NO_REMAP
-
-/* Alliant needs special crt0.o because system version is not reentrant */
-
-#define START_FILES "crt0.o"
-
-/* Alliant dependent code for dumping executing image.
- See crt0.c code for alliant. */
-
-#define ADJUST_EXEC_HEADER {\
-extern int _curbrk, _setbrk;\
-_setbrk = _curbrk;\
-hdr.a_bss_addr = bss_start;\
-unexec_text_start = hdr.a_text_addr;}
-
-/* cc screws up on long names. Try making cpp replace them. */
-
-#ifdef ALLIANT_1
-#define Finsert_abbrev_table_description Finsert_abbrev_table_descrip
-#define internal_with_output_to_temp_buffer internal_with_output_to_tem
-#endif
-
-/* "vector" is a typedef in /usr/include/machine/reg.h, so its use as
- a variable name causes errors when compiling under ANSI C. */
-
-#define vector xxvector
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/alliant1.h
--- a/src/m/alliant1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* config.h should include this file for version 1 of Alliant's
- operating system. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-2" */
-
-#define ALLIANT_1
-#include "alliant.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/alliant4.h
--- a/src/m/alliant4.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* machine description file for Alliant Concentrix 4.0 or later.
- Use alliant.h for versions 2 and 3. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-2" */
-
-#include "alliant.h"
-
-/* Concentrix uses a different kernel symbol for load average. */
-
-#undef LDAV_SYMBOL /* Undo definition in s-bsd4-2.h */
-#define LDAV_SYMBOL "_Loadavg"
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (x * 100 / LOADAVG_SCALE)
-
-/* include <sys/param.h> for the definition of LOADAVG_SCALE, and also
- LOADAVG_SIZE, the number of items in the Loadavg array. */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/alpha.h
--- a/src/m/alpha.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/m/alpha.h Wed Nov 18 08:49:14 2009 -0700
@@ -19,10 +19,6 @@
Boston, MA 02111-1307, USA. */
-#ifdef OSF1
-# define ORDINARY_LINK
-#endif
-
#ifndef __ELF__
/* Describe layout of the address space in an executing process. */
# define TEXT_START 0x120000000
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/altos.h
--- a/src/m/altos.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/* altos machine description file Altos 3068 Unix System V Release 2
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2" */
-
-#define LIB_STANDARD "-lc"
-
-#define SWITCH_ENUM_BUG
-
-#define NO_REMAP
-
-#undef TERMINFO
-
-#define TERMCAP
-
-#define LIBS_TERMCAP "-ltermlib"
-#define ALTOS
-
-#ifdef __GNUC__
-#define COFF_ENCAPSULATE
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/amdahl.h
--- a/src/m/amdahl.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/* amdahl machine description file
- Copyright (C) 1987 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
-This file for amdahl_uts created by modifying the template.h
-by Jishnu Mukerji 3/1/87
-
-The following line tells the configuration script what sort of
-operating system this machine is likely to run.
-USUAL-OPSYS="usg5-2-2"
-
-This file works with the Amdahl uts native C compiler. The 5.2u370
-compiler is so brain damaged that it is not even worth trying to use it.
-*/
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-
-/* uts gets defined automatically */
-/* However for clarity define amdahl_uts */
-#define amdahl_uts
-
-/* Data type of load average, as read out of kmem. */
-
-/* #define LOAD_AVE_TYPE long*/
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/*#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0)*/
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-/*#define NO_REMAP*/
-
-#define TERMINFO
-
-/* The usual definition of XINT, which involves shifting, does not
- sign-extend properly on this machine. */
-
-#define XREALINT(i) (((sign_extend_temp=(i)) & 0x00800000) \
- ? (sign_extend_temp | 0xFF000000) \
- : (sign_extend_temp & 0x00FFFFFF))
-
-#ifdef emacs /* Don't do this when making xmakefile! */
-extern int sign_extend_temp;
-#endif
-
-/* The following needed to load the proper crt0.o and to get the
- proper declaration of data_start in the #undef NO_REMAP case */
-
-#ifndef NO_REMAP
-#define START_FILES "pre-crt0.o /lib/crt0.o"
-#endif
-
-/* Perhaps this means that the optimizer isn't safe to use. */
-
-#define C_OPTIMIZE_SWITCH
-
-/* Put text and data on non-segment boundary; makes image smaller */
-
-#define LD_SWITCH_MACHINE "-N"
-
-/* When writing the 'xemacs' file, make text segment ro */
-#define EXEC_MAGIC 0410
-
-/* Mask for address bits within a memory segment */
-#define SEGSIZ 0x10000 /* Should this not be defined elsewhere ? */
-#define SEGMENT_MASK (SEGSIZ - 1)
-
-/* Compensate for error in signal.h. */
-#if NSIG==19
-#undef NSIG
-#define NSIG 20
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/apollo.h
--- a/src/m/apollo.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/* machine description file for Apollo machine.
- Copyright (C) 1985, 1986, 1994, Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-3" */
-
-/* Say this machine is a 68000 */
-
-/* #define m68000 */ /* Done by the C compiler */
-
-#define APOLLO
-
-/* Assume we use s-bsd4-3.h for system version 10. */
-
-#ifdef BSD4_3
-#define APOLLO_SR10
-#endif
-
-/* Do not define LOAD_AVE_TYPE or LOAD_AVE_CVT
- since there is no /dev/kmem */
-
-/* Prevent -lg from being used for debugging. Not needed. */
-
-#define LIBS_DEBUG
-
-/* Can't use the system's termcap. It has compressed data sections that
- interfere with dumping. That means we won't automatically get a vt100
- when we start up emacs in a dm pad (a dubious feature at best anyway). */
-
-#undef LIBS_TERMCAP
-
-/* Must use the system's malloc and alloca. */
-
-#define SYSTEM_MALLOC
-
-/* Define the file we use for UNEXEC. */
-
-#define UNEXEC "unexapollo.o"
-
-/* The Apollo linker does not recognize the -X switch, so we remove it here. */
-
-#define LD_SWITCH_SYSTEM
-
-/* Define C_SWITCH_MACHINE to compile for 68020/68030 or PRISM.
- Define LD_SWITCH_MACHINE to save space by stripping symbols
- and use X11 libraries. */
-
-#if _ISP__A88K
-#define C_SWITCH_MACHINE "-W0,-ncompress -W0,-opt,2 -A cpu,a88k -A sys,any -A run,bsd4.3"
-#define LD_SWITCH_MACHINE "-A cpu,a88k -A sys,any -A run,bsd4.3"
-#else
-#define C_SWITCH_MACHINE "-W0,-ncompress -W0,-opt,2 -A cpu,3000 -A sys,any -A run,bsd4.3"
-#define LD_SWITCH_MACHINE "-A cpu,m68k -A sys,any -A run,bsd4.3"
-#endif
-
-#define OLDXMENU_OPTIONS "${C_SWITCH_MACHINE}"
-
-#if 0 /* from FSF Emacs */
-
-/* In SR10.4, unistd.h has bad prototype for getpgrp, so we don't include it. */
-#undef HAVE_UNISTD_H
-#endif /* 0 */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/arm.h
--- a/src/m/arm.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/m/arm.h Wed Nov 18 08:49:14 2009 -0700
@@ -30,8 +30,7 @@
#endif
/* crt0.c, if it is used, should use the i386-bsd style of entry.
- with no extra dummy args. On USG and XENIX,
- NO_REMAP says this isn't used. */
+ with no extra dummy args. On USG, NO_REMAP says this isn't used. */
/* Mly 16-Jan-96 16:38:32: this is part of a prototype -- same bug present in
other m*.h files */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/att3b.h
--- a/src/m/att3b.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/* Machine-dependent configuration for GNU Emacs for AT&T 3b machines.
- Copyright (C) 1986 Free Software Foundation, Inc.
-
- Modified by David Robinson (daver@csvax.caltech.edu) 6/6/86
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically */
-#define ATT3B
-
-/* Data type of load average, as read out of kmem. */
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) */
-
-/* SysV has alloca in the PW library */
-
-#define LIB_STANDARD "-lPW -lc"
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* #define LD_SWITCH_MACHINE -N */
-
-/* Use Terminfo, not Termcap. */
-
-#define TERMINFO
-
-/* -O has been observed to make correct C code in Emacs not work.
- So don't try to use it. */
-
-#if u3b2 || u3b5 || u3b15
-#define C_OPTIMIZE_SWITCH
-#endif
-
-/* Define our page size. */
-
-#define NBPC 2048
-
-/* The usual definition of XINT, which involves shifting, does not
- sign-extend properly on this machine. */
-
-#define XREALINT(i) (((sign_extend_temp=(i)) & 0x00800000) \
- ? (sign_extend_temp | 0xFF000000) \
- : (sign_extend_temp & 0x00FFFFFF))
-
-#ifdef emacs /* Don't do this when making xmakefile! */
-extern int sign_extend_temp;
-#endif
-
-#if u3b2 || u3b5 || u3b15
-
-/* On 3b2/5/15, data space has high order bit on. */
-#define VALBITS 27
-#define VALMASK (((1<<VALBITS) - 1) | (1 << 31))
-/* XEmacs: markbit is between type bits and value bits */
-/* #define XTYPE(a) ((enum Lisp_Type) (((a) >> VALBITS) & GCTYPEMASK)) */
-#define XTYPE(a) ((enum Lisp_Type) (((a) >> ((VALBITS) + 1)) & GCTYPEMASK))
-
-#endif /* 3b2, 3b5 or 3b15 */
-
-#define TEXT_START 0
-
-
-/* (short) negative-int doesn't sign-extend correctly */
-#define SHORT_CAST_BUG
-
-/* 3B2s with WIN/3B have winsize defined in ptem.h */
-#if u3b2
-#define NEED_PTEM_H
-#endif /* u3b2 */
-
-/* 3b2 does not have memmove, I'm told. */
-/* It is safe to have no parens around the args in the safe_bcopy call,
- and parens would screw up the prototype decl for memmove. */
-#define memmove(d, s, n) safe_bcopy (s, d, n)
-
-/* This affects filemode.c. */
-#define NO_MODE_T
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/aviion.h
--- a/src/m/aviion.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/* machine description file for Data General AViiON.
- Copyright (C) 1985, 1986, 1991 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-/*#ifndef m88k*/
-/*#define m88k*/
-/*#endif*/
-
-/* Data type of load average, as read out of kmem. */
-
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) */
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* Define ADDR_CORRECT(ADDR) to be a macro to correct an int which is
- the bit pattern of a pointer to a byte into an int which is the
- number of a byte.
-
- This macro has a default definition which is usually right.
- This default definition is a no-op on most machines (where a
- pointer looks like an int) but not on all machines. */
-
-#define ADDR_CORRECT(ADDR) ((int)ADDR)
-
-/* Some machines that use COFF executables require that each section
- start on a certain boundary *in the COFF file*. Such machines should
- define SECTION_ALIGNMENT to a mask of the low-order bits that must be
- zero on such a boundary. This mask is used to control padding between
- segments in the COFF file.
-
- If SECTION_ALIGNMENT is not defined, the segments are written
- consecutively with no attempt at alignment. This is right for
- unmodified system V. */
-
-#define SECTION_ALIGNMENT 0x7
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/celerity.h
--- a/src/m/celerity.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/* machine description file for Celerity.
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-2" */
-
-/* celerity preprocessor defines "accel", however the following is clearer */
-#define celerity
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* A machine-specific loader switch is needed. */
-
-#define LD_SWITCH_MACHINE "-k100000"
-
-/* (short) negative-int doesn't sign-extend correctly */
-#define SHORT_CAST_BUG
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/clipper.h
--- a/src/m/clipper.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/* machine description file for clipper
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically */
-
-#define clipper 1
-
-/* crt0.c should define a symbol `start' and do .globl with a dot. */
-
-#define DOT_GLOBAL_START
-
-/* USG systems I know of running on Vaxes do not actually
- support the load average, so disable it for them. */
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-/* #define NO_REMAP */
-
-#ifdef USG
-#define TEXT_START 0
-#endif /* USG */
-
-#define LD_TEXT_START_ADDR 8000
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/cnvrgnt.h
--- a/src/m/cnvrgnt.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/* machine description file for convergent S series.
- Copyright (C) 1989 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically. */
-
-#define m68000
-
-/* Data type of load average, as read out of kmem.
- These are commented out since it is not supported by this machine. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* Change some things to avoid bugs in compiler. */
-
-#define SWITCH_ENUM_BUG
-
-/* some errno.h's don't actually allocate the variable itself.
- Cause crt0.c to define errno. */
-
-#define NEED_ERRNO
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/convex.h
--- a/src/m/convex.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-/* machine description file for Convex (all models).
- Copyright (C) 1987, 1994 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-3" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically. */
-#ifndef convex /* The compiler doesn't always do this. */
-#define convex
-#endif
-
-#ifndef __GNUC__ /* David M. Cooke <dcooke@haven.larc.nasa.gov>
- and Ralph Sobek <Ralph.Sobek@cerfacs.fr> agree
- must ignore one arg when compiled with convex compiler. */
-#define CRT0_DUMMIES ignore,
-#else
-#define CRT0_DUMMIES
-#endif
-
-/* crt0.c should define a symbol `start' and do .globl with a dot. */
-
-#define DOT_GLOBAL_START
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) ((x) * 100.0)
-
-/* Must use the system's termcap. It does special things. */
-
-#define LIBS_TERMCAP "-ltermcap"
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-/* #define NO_REMAP */
-
-/* Right shift is logical shift.
- And the usual way of handling such machines, which involves
- copying the number into sign_extend_temp, does not work
- for reasons as yet unknown. */
-
-#define XREALINT(a) sign_extend_lisp_int (a)
-
-/* Convex uses a special version of unexec. */
-
-#define UNEXEC "unexconvex.o"
-
-/* you gotta define 'COFF' for post 6.1 unexec. */
-
-#define COFF
-#define TEXT_START 0x80001000
-
-/* Posix stuff for Convex OS 8.1 and up. */
-
-#define LD_SWITCH_MACHINE "-e__start -L /usr/lib '-A__iob=___ap$$iob' '-A_use_libc_sema=___ap$$use_libc_sema'"
-
-#ifdef _POSIX_SOURCE
-
-/* These symbols have been undefined to advance the state of the art. */
-
-#define S_IFMT _S_IFMT
-#define S_IFDIR _S_IFDIR
-
-#define S_IREAD _S_IREAD
-#define S_IWRITE _S_IWRITE
-#define S_IEXEC _S_IEXEC
-
-#endif
-
-/* Ptys may start below ptyp0; call a routine to hunt for where. */
-
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER first_pty_letter()
-
-#if 0
-/*
- * Force a K&R compilation and libraries with the Convex V 4.0 C compiler
- */
-#define C_SWITCH_MACHINE "-pcc"
-#define LIB_STANDARD "-lc_old"
-#define LIBS_MACHINE "-lC2_old"
-#define LD_SWITCH_MACHINE "-X -NL -fn -Enoposix -A__iob=___ap\$$iob -A_use_libc_sema=___ap\$$use_libc_sema -L /usr/lib"
-#endif
-
-/* Avoid error in xrdb.c - d.m.cooke@larc.nasa.gov. */
-#define DECLARE_GETPWUID_WITH_UID_T
-
-/* Tested for both Convex C and GNUC by d.m.cooke@larc.nasa.gov. */
-#define LIBS_MACHINE "-lC2"
-
-/* Avoid error in getloadavg.c. */
-#define NLIST_NAME_UNION 1
-
-#if 0 /* This is supposed to be an improvement.
- It would be good for people to try enabling this code
- and report the results. */
-/* gcc -nostdlib prevents some math symbols from being included.
- So we have to use -nostartfiles instead. */
-#define LINKER "$(CC) -nostartfiles"
-
-#define ORDINARY_LINK
-
-#undef LD_SWITCH_MACHINE
-#define LD_SWITCH_MACHINE "-L /usr/lib '-A__iob=___ap$$iob' '-A_use_libc_sema=___ap$$use_libc_sema'"
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/cydra5.h
--- a/src/m/cydra5.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/* machine description file for Cydrome's CYDRA 5 mini super computer
- Copyright (C) 1988 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-3" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) x
-
-#define DATA_START 0x20000000
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-#define LIBS_MACHINE "-lsocket -lnsl"
-
-/* The data section in a coff file must be aligned in the file. */
-#define DATA_SECTION_ALIGNMENT 0xFFF
-
-/* Compiler won't allow switch (x) when x is an enum. */
-#define SWITCH_ENUM_BUG
-
-
-/* Explain how pty filenames work. */
-
-#define PTY_ITERATION for (i = 47; i >= 0; i--)
-#define PTY_NAME_SPRINTF sprintf (ptyname, "/dev/pty%03x", i);
-#define PTY_TTY_NAME_SPRINTF sprintf (ptyname, "/dev/ptm%03x", i);
-
-/* We can't do interrupt-driven input, so don't let user try. */
-
-#define BROKEN_SIGIO
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/delta.h
--- a/src/m/delta.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/* Machine description file for the Motorola Delta.
- Tested on mvme147 board using R3V7 without X. Tested with gcc.
- Tested on mvme167 board using R3V7 without X. Tested with cc, gnucc, gcc.
- Copyright (C) 1986, 1993, 1994 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-3" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-#define m68000
-#define MOTOROLA_DELTA
-
-/* Data type of load average, as read out of kmem. */
-
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) */
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-
-/* Machine specific stuff */
-#define BROKEN_CLOSEDIR /* builtin closedir is interruptible */
-#define memmove(t,f,s) safe_bcopy(f,t,s) /* for overlapping copies */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/sysv68"
-#undef LDAV_SYMBOL
-
-/* The standard C library is -lc881, not -lc.
- DO NOT USE -lPW. That version of alloca is broken in versions R3V5,
- R3V6, R3V7. -riku@field.fi -pot@cnuce.cnr.it. */
-
-#define LIB_STANDARD "-lc881"
-#define LIB_MATH "-lm881"
-#define LIBS_TERMCAP "-lcurses"
-#define LIBS_SYSTEM "-lbsd"
-
-#ifdef HAVE_X_WINDOWS
-# define HAVE_RANDOM
-# define HAVE_XSCREENNUMBEROFSCREEN
-# undef LIB_X11_LIB /* no shared libraries */
-# define LIB_X11_LIB "-lX11"
-# undef USG_SHARED_LIBRARIES /* once again, no shared libs */
-# undef LIBX11_SYSTEM /* no -lpt as usg5-3.h expects */
-# define LIBX11_SYSTEM "-lnls -lnsl_s"
-#endif /* HAVE_X_WINDOWS */
-
- /* We are assuming here that the `true' GNU gcc has not been
- installed, and we are using the gnucc provided by Motorola. No
- support exists for compiling with GNU gcc, as I do not have it on
- my machine to try it out. -pot@cnuce.cnr.it
- If __STDC__ is defined gnucc has been called without the -traditional
- option, that is, we are inside configure. If THIS_IS_CONFIGURE is
- not defined, then configure is trying to figure out what the right
- option for real compilation are.
- Let us set -traditional, because gmalloc.c includes <stddef.h>, and
- we don't have that (as of SYSV68 R3V7). */
-# define C_SWITCH_MACHINE "-mfp0ret -traditional -Dconst= -fdelayed-branch -fstrength-reduce -fno-inline -fcaller-saves"
-# define LIB_GCC "/lib/gnulib881"
-
-#else
- /* Not __GNUC__, use the alloca in alloca.s. */
-
- /* Try to guess if we are using the Green Hills Compiler */
-# if defined mc68000 && defined MC68000
- /* Required only for use with Green Hills compiler:
- -ga Because alloca relies on stack frames. This option forces
- the Green Hills compiler to create stack frames even for
- functions with few local variables. */
-# define C_SWITCH_MACHINE "-ga -O"
-# define GAP_USE_BCOPY /* *++to = *++from is inefficient */
-# define BCOPY_UPWARD_SAFE 0
-# define BCOPY_DOWNWARD_SAFE 1 /* bcopy does: mov.b (%a1)+,(%a0)+ */
-# else
- /* We are using the standard AT&T Portable C Compiler */
-# define SWITCH_ENUM_BUG
-# endif
-
-#endif /* not __GNUC__ */
-
-#ifdef HAVE_INET_SOCKETS /* this comes from autoconf */
-# define HAVE_SOCKETS /* NSE may or may not have been installed */
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/delta88k.h
--- a/src/m/delta88k.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/* Machine description file for Motorola System V/88 machines
- Copyright (C) 1985 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-3" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-#ifndef m88000 /* Some 88k C compilers already define this */
-#define m88000
-#endif
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically. */
-
-
-/* Data type of load average, as read out of kmem. */
-/* No load average on Motorola machines. */
-/* #define LOAD_AVE_TYPE double */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-/* #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0)) */
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/*
- * we have the wrong name for networking libs
- */
-#ifdef USG5_4
-/* rms: not needed; LIB_X11_LIB deals with this. */
-/* #define LIBX11_SYSTEM -lX11 */
-#else
-#undef LIB_X11_LIB /* We don't have the shared libs as assumed in usg5-3.h. */
-#undef LIBX11_SYSTEM
-#define LIBX11_SYSTEM "-lnsl -lbsd"
-#endif /* USG5_4 */
-
-
-/* previously defined in usg5-4, if we choose to use that. */
-/* XEmacs: smarch@quaver.urbana.mcd.mot.com (Steve March) says
- we always need -lgen and usg5-4.h doesn't use it. */
-#undef LIBS_SYSTEM
-#ifdef USG5_4
-#define LIBS_SYSTEM "-lsocket -lnsl -lelf -lgen"
-#else
-#define LIBS_SYSTEM "-lbsd -lg"
-#endif /* USG5_4 */
-
-#define NO_SIOCTL_H
-
-/* XEmacs change -- smarch@quaver.urbana.mcd.mot.com */
-#ifndef NOT_C_CODE
-#include <dirent.h>
-#endif
-
-#define USE_GETOBAUD
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/dpx2.h
--- a/src/m/dpx2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/* machine description for Bull DPX/2 range
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-3" */
-
-/*
- * You need to either un-comment one of these lines, or copy one
- * of them to config.h before you include this file.
- * Note that some simply define a constant and others set a value.
- */
-
-/* #define ncl_el /* DPX/2 210,220 etc */
-/* #define ncl_mr 1 /* DPX/2 320,340 (and 360,380 ?) */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-/* /bin/cc on ncl_el and ncl_mr define m68k and mc68000 */
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define FSCALE 1000.0
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/*
- * end of the standard macro's
- */
-
-/*
- * a neat identifier to handle source mods (if needed)
- */
-#ifndef DPX2
-#define DPX2
-#endif
-
-/* Disable support for shared libraries in unexec. */
-
-#undef USG_SHARED_LIBRARIES
-
-/*
- * if we use X11, libX11.a has these...
- */
-# undef LIB_X11_LIB
-# define LIB_X11_LIB "-lX11"
-# undef LIBX11_SYSTEM
-# define LIBX11_SYSTEM "-lmalloc -lnsl"
-
-/*
- * useful if you have INET loaded
- */
-# define LIBS_MACHINE "-linet"
-
-
-#if (defined(ncl_mr) || defined(ncl_el)) && !defined (NBPC)
-# define NBPC 4096
-#endif
-
-/*
- * if SIGIO is defined, much of the emacs
- * code assumes we are BSD !!
- */
-#ifdef SIGIO
-#define BROKEN_SIGIO
-#endif
-
-
-#ifdef SIGTSTP
-/*
- * sysdep.c(sys_suspend) works fine with emacs-18.58
- * and BOS 02.00.45, if you have an earler version
- * of Emacs and/or BOS, or have problems, or just prefer
- * to start a sub-shell rather than suspend-emacs,
- * un-comment out the next line.
- */
-/* # undef SIGTSTP /* make suspend-emacs spawn a sub-shell */
-#endif
-/*
- * no we don't want this at all
- */
-#ifdef USG_JOBCTRL
-# undef USG_JOBCTRL
-#endif
-
-/* select also needs this header file--but not in ymakefile. */
-#ifndef NOT_C_CODE
-#include <sys/types.h>
-#include <sys/select.h>
-#endif
-
-#define TEXT_START 0
-
-/* on bos2.00.45 there is a bug that makes the F_SETOWN fcntl() call
- enters in an infinite loop. Avoid calling it */
-#define F_SETOWN_BUG
-
-/* system closedir sometimes complains about wrong descriptor
- for no apparent reasons. Use the provided closedir in sysdep.c instead */
-#ifdef HAVE_CLOSEDIR
-#undef HAVE_CLOSEDIR
-#endif
-
-/* This is to prevent memory clobbering on the DPX/2 200. */
-#define LD_SWITCH_MACHINE "-N -T32"
-
- /* end of dpx2.h */
-
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/dual.h
--- a/src/m/dual.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/* machine description file for Dual machines using unisoft port.
- Copyright (C) 1985 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Dual running System V (-machine=dual -opsystem=usg5-2)
-
- As of 17.46, this works except for a few changes
- needed in unexec.c.
-
-Dual running Uniplus (-machine=dual -opsystem=unipl5-2)
-
- Works, as of 17.51.
-NOTE-END */
-
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000 are the ones defined so far. */
-
-#ifndef m68000
-#define m68000
-#endif
-
-/* Data type of load average, as read out of kmem. */
-/* These are commented out since it does not really work in uniplus */
-
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0) */
-
-/* Change some things to avoid bugs in compiler */
-
-#define SWITCH_ENUM_BUG 1
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/elxsi.h
--- a/src/m/elxsi.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/* machine description file for Elxsi machine (running enix).
- Copyright (C) 1986, 1992 Free Software Foundation, Inc.
- Adapted by John Salmon
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2" */
-
-/* This file was modified by Matt Crawford <matt@tank.uchicago.edu>
- to work under Elxsi's 12.0 release of BSD unix. */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-
-#ifndef elxsi
-#define elxsi
-#endif
-
-/* Name of kernel load average variable */
-
-#undef LDAV_SYMBOL
-#define LDAV_SYMBOL "avenrun"
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) ((x) * 100.0)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-/*#define NO_REMAP*/
-
-/* This is a guess for an alternate solution to whatever
- problem motivated defining _sobuf in sysdep,c with extern char *_sobuf. */
-#define _sobuf xsobuf
-
-/* Address of start of text segment as loaded. */
-
-#define TEXT_START 0x800
-
-/* Tell crt0.c not to define environ. */
-
-#define DONT_NEED_ENVIRON
-
-/* The elxsi has no debugger, so might as well optimize instead
- of trying to make a symbol table. */
-
-#define C_DEBUG_SWITCH "-O"
-
-/* Elxsi uses COFF under both Sys V and BSD environments */
-
-#define COFF
-
-#define ADJUST_EXEC_HEADER {\
-extern int _init_brk;\
-_init_brk = bss_start;\
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/ews4800r.h
--- a/src/m/ews4800r.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/* m- file for NEC EWS4800 RISC series.
- Copyright (C) 1987, 1992 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Mule 2.0. Not in FSF. */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-#ifndef mips
-# define mips
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / 256.0)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* Describe layout of the address space in an executing process. */
-
-#define TEXT_START 0x400000
-/*#define DATA_START 0x800000*/
-
-/* Alter some of the options used when linking. */
-
-#define LIBS_TERMCAP "-lcurses"
-
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/gould-np1.h
--- a/src/m/gould-np1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* machine description file for Gould NP1 with UTX/32 3.0 (first release for NP1). */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-3" */
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-/* UTX 3.0 uses a cross between COFF and a.out format, but closer to COFF. */
-/* at least currently, already defined by cpp, but make sure */
-#ifndef COFF
-#define COFF
-#endif COFF
-
-#include "gould.h"
-
-/* undefine what gould.h defined */
-#undef ADJUST_EXEC_HEADER
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-/* UTX 3.0 uses a cross between COFF and a.out format, but closer to COFF. */
-#ifndef COFF /* at least currently, already defined by cpp */
-#define COFF
-#endif COFF
-
-/* make Gould NP1 and PN COFF look like USG COFF */
-/* NP1 COFF */
-#undef aouthdr /* Since gould.h already defined these */
-#undef a_dtbase
-
-#ifdef IN_UNEXEC
-#define aouthdr exec
-#define ADJUST_TEXT_SCNHDR_SIZE
-
-/* Gould COFF - these are already defined in gould.h */
-/*
- * #define COFF_WITH_BSD_SYMTAB
- * #define HEADER_INCL_IN_TEXT
- * #define magic a_magic
- * #define tsize a_text
- * #define dsize a_data
- * #define bsize a_bss
- * #define entry a_entry
- * #define text_start a_txbase
- * #define data_start a_dtbase
-*/
-/* End Gould COFF */
-#endif /* IN_UNEXEC */
-
-/* NP1 supports a slightly different set than PowerNode */
-#define BAUD_CONVERT { 0, 50, 75, 110, 134, 150, 300, 450, 600, 1200, \
- 1800, 2000, 2400, 3600, 4800, 7200, 9600, \
- 19200, 38400 }
-
-#define LD_SWITCH_SYSTEM "-BS -e start"
-
-/* Undef C_DEBUG_SWITCH because it may have been set in gould.h */
-/* It will compile and load and works with dbx. Runs under an incomplete
- port of gdb, but gdb doesn't always find things correctly. */
-#undef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH "-g"
-#define LIBS_DEBUG "-lg"
-
-#define DATA_START 0x1000000
-
-/* The text segment always starts at 0.
- This way we don't need to have a label _start defined. */
-#define TEXT_START 0
-
-/* Data isn't right next to text on an NP1 */
-#define NO_REMAP
-
-#ifndef GOULD_NP1
-#define GOULD_NP1
-#endif
-
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/gould.h
--- a/src/m/gould.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-/* machine description file for Gould PowerNodes with UTX/32 2.0 and 2.1.
- (See MACHINES for older versions.)
-
-* NOTE: If you are running a pre-release of UTX/32 2.1 you should #define
-* RELEASE2_1 in config.h. This may also be necessary with un-updated
-* official releases of 2.1
-
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Gould Power Node (-machine=gould -opsystem=bsd4-2 or bsd4-3)
-(gould.h; s-bsd4-2.h or s-bsd4-3.h)
-
- 18.36 worked on versions 1.2 and 2.0 of the operating system.
-
- On UTX/32 2.0, use -opsystem=bsd4-3
-
- On UTX/32 1.2 and UTX/32S 1.0, use -opsystem=bsd4-2 and note that compiling
- lib-src/sorted-doc tickles a compiler bug: remove the -g flag to cc in the
- makefile.
-
- Version 19 incorporates support for releases 2.1 and later of UTX/32.
- A site running a pre-release of 2.1 should #define RELEASE2_1 in config.h.
-NOTE-END */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically */
-
-#ifndef GOULD
-#define GOULD
-#endif
-
-/* sel is an old preprocessor name on gould machines
- - it is no longer needed and interferes with a variable in xmenu.c */
-#undef sel
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0)
-
-/* No need to extend the user stack. */
-
-/* If this is a 2.1 system, COFF will be predefined by cpp. If it's */
-/* pre-2.1 COFF won't be defined, which is as it should be. */
-
-#ifdef COFF
-
-#define HEADER_INCL_IN_TEXT
-#define COFF_BSD_SYMBOLS
-
-/* Seems to be necessary with coff */
-#define NO_REMAP
-
-#ifndef GOULD_NP1
-/* gould-np1.h includes this file */
-/* keep the old value - don't skip over the headers */
-#define KEEP_OLD_TEXT_SCNPTR
-#define KEEP_OLD_PADDR
-#ifndef RELEASE2_1
-#define ADJUST_TEXTBASE
-#endif /*RELEASE2_1*/
-#endif /* GOULD_NP1 */
-
-#ifdef IN_UNEXEC
-/* make Gould NP and PN COFF look like USG COFF */
-/* PN COFF */
-#define aouthdr old_exec
-/* PN COFF doesn't have a data_start or a_dtbase field in its */
-/* optional header, so substitute a junk field */
-#define a_dtbase a_ccvers
-/* Gould COFF */
-#define magic a_magic
-#define tsize a_text
-#define dsize a_data
-#define bsize a_bss
-#define entry a_entry
-#define text_start a_txbase
-#define data_start a_dtbase
-#endif /* IN_UNEXEC */
-
-/* Define how to search all pty names.
- * This is for UTX 2.1 and greater on PN and all NP versions. It is only
- * accident that this happens to correspond to the same versions of UTX
- * as COFF does, but we'll take advantage of that here.
- */
-
-/*#define USE_PTY_PAIR*/
-
-#endif /* COFF */
-
-/* -g is sometimes broken on the Gould. */
-
-#define C_DEBUG_SWITCH
-
-/* The GOULD machine counts the a.out file header as part of the text. */
-
-#define A_TEXT_OFFSET(HDR) sizeof (HDR)
-
-/* Machine-dependent action when about to dump an executable file. */
-
-#ifndef COFF
-#define ADJUST_EXEC_HEADER \
- unexec_text_start = hdr.a_txbase + sizeof (hdr);
-#endif
-
-/* We use the system's crt0.o. Somehow it avoids losing
- with `environ' the way most standard crt0.o's do. */
-
-#define START_FILES "pre-crt0.o /lib/crt0.o"
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/hp300bsd.h
--- a/src/m/hp300bsd.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/* machine description file for HP300 running BSD 4.3
- Copyright (C) 1985, 1986, 1989 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-3" */
-
-/* Say this machine is a 68000 */
-
-#ifndef m68000
-#define m68000
-#endif
-
-/* One CRT0 Dummy variable */
-
-#define CRT0_DUMMIES one_dummy,
-
-#define LOAD_AVE_TYPE long
-#define LOAD_AVE_CVT(x) ((int) (((double) (x)) / 2048.0 * 100.0))
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/hp9000s300.h
--- a/src/m/hp9000s300.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-/* machine description file for hp9000 series 200 or 300 on either HPUX or BSD.
- Copyright (C) 1985, 1994 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-HP 9000 series 200 or 300 (-machine=hp9000s300)
-
- These machines are 68000-series CPUs running HP-UX
- (a derivative of sysV with some BSD features) or BSD 4.3 ported by Utah.
-
- If you're running HP-UX, specify `-opsystem=hpux'.
- If you're running BSD, specify `-opsystem=bsd4-3'.
-NOTE-END */
-
-/* Define this symbol if you are running a version of HP-UX
- which predates version 6.01 */
-
-/* #define HPUX_5 */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically. */
-
-#ifndef hp9000s300
-#define hp9000s300
-#endif
-
-/* Let the OS header file determine this if not HPUX. */
-#ifdef HPUX
-# define UNEXEC "unexhp9k3.o"
-#endif
-
-
-/* For University of Utah 4.3bsd implementation on HP300s.
- The #ifndef __GNUC__ definitions are required for the "standard" cc,
- a very old, brain-dead version of PCC. */
-
-#ifdef BSD4_3
-
-/* Tell crt0.c that this is an ordinary 68020. */
-#undef hp9000s300
-#define m68000
-
-#define CRT0_DUMMIES bogus_a6,
-
-#ifndef __GNUC__
-#define LIBS_DEBUG /* don't have -lg that works */
-#define C_DEBUG_SWITCH /* don't support -g */
-#endif
-
-#undef LOAD_AVE_TYPE
-#undef LOAD_AVE_CVT
-#define LOAD_AVE_TYPE long
-#define LOAD_AVE_CVT(x) ((int) (((double) (x)) / 2048.0 * 100.0))
-
-#endif /* BSD4_3 */
-
-#ifndef BSD4_3
-/* The following definitions are for HPUX only. */
-
-/* The symbol in the kernel where the load average is found
- is named _avenrun on this machine. */
-
-#define LDAV_SYMBOL "_avenrun"
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* This library is needed with -g, on the 200/300 only. */
-
-#if !defined(__GNUC__) || defined(__HPUX_ASM__)
-#define LIBS_DEBUG "/usr/lib/end.o"
-#endif
-
-/* Need a TEXT_START. On the HP9000/s300 that is 0. */
-#ifdef __GNUC__
-#define TEXT_START 0
-#endif
-
-/* In older versions of hpux, for unknown reasons, S_IFLNK is defined
- even though symbolic links do not exist.
- Make sure our conditionals based on S_IFLNK are not confused.
-
- Here we assume that stat.h is included before config.h
- so that we can override it here.
-
- Version 6 of HP-UX has symbolic links. */
-
-#ifdef HPUX_5
-#undef S_IFLNK
-#endif
-
-/* Define C_SWITCH_MACHINE to be +X if you want the s200/300
- * Emacs to run on both 68010 and 68020 based hp-ux's.
- *
- * Define OLD_HP_ASSEMBLER if you have an ancient assembler
- *
- * Define HPUX_68010 if you are using the new assembler but
- * compiling for a s200 (upgraded) or s310. 68010 based
- * processor without 68881.
- */
-
-/* These switches increase the size of some internal C compiler tables.
- They are required for compiling the X11 interface files. */
-
-#ifndef HPUX_5
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE "-Wc,-Nd4000,-Ns3000"
-#endif
-#endif
-
-/* Define NEED_BSDTTY if you have such. */
-
-#define NEED_BSDTTY
-
-#endif /* not BSD4_3 */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/i860.h
--- a/src/m/i860.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/* machine description file for i860.
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-#define INTEL860
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* The X11 include files for i860-sysv4 need the macro SVR4 defined.
- --Kaveh Ghazi (ghazi@noc.rutgers.edu) 8/9/94. */
-#ifdef USG5_4
-#ifndef SVR4
-#define SVR4
-#endif
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/ibm370aix.h
--- a/src/m/ibm370aix.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* m/ file for IBM 370 running AIX. */
-
-#include "ibmps2-aix.h"
-
-#define AIX
-
-/* these were defined in "ibmps2-aix.h" */
-#undef INTEL386
-#undef aix386
-
-#undef TEXT_START
-#undef SEGMENT_MASK
-#undef DATA_SECTION_ALIGNMENT
-
-#define TEXT_START 0
-#define SEGMENT_MASK 0
-#define DATA_SECTION_ALIGNMENT 0x00001000
-
-#undef LOAD_AVE_CVT
-#undef LOAD_AVE_TYPE
-/* Data type of load average, as read out of kmem. */
-#define LOAD_AVE_CVT(x) (int)(((double) (x)) * 100.0 / 1.0)
-#define LOAD_AVE_TYPE double
-
-#undef LIBS_MACHINE
-#define LIBS_MACHINE
-
-#undef LD_SWITCH_MACHINE
-#define LD_SWITCH_MACHINE "-xa"
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/ibmps2-aix.h
--- a/src/m/ibmps2-aix.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/* machine description file for ibm ps/2 aix386.
- Copyright (C) 1989 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
- Use -opsystem=usg5-3 on AIX 1.2.
- -opsystem=usg5-2-2 should work on either AIX 1.1 or 1.2, but may not
- work with certain new X window managers, and may be suboptimal.
-NOTE-END */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-#define INTEL386
-#define aix386
-
-#define IBMAIX
-
-/* crt0.c, if it is used, should use the i386-bsd style of entry.
- with no extra dummy args. On USG and XENIX,
- NO_REMAP says this isn't used. */
-
-#define CRT0_DUMMIES bogus_fp,
-
-/* crt0.c should define a symbol `start' and do .globl with a dot. */
-
-#define DOT_GLOBAL_START
-
-/* USG systems do not actually support the load average,
-so disable it for them. */
-
-/* Define addresses, macros, change some setup for dump */
-
-#define NO_REMAP
-
-#ifdef USG5_3
-#define TEXT_START 0x00000000
-#else
-#define TEXT_START 0x00400000
-#define DATA_START 0x00800000
-
-#endif
-
-#if 0 /* I refuse to promulgate a recommendation that would make
- users unable to debug - RMS. */
-/* delete the following line to foil optimization, enable debugging */
-#define C_DEBUG_SWITCH "-O"
-#endif
-
-/* AIX utimes allegedly causes SIGSEGV. */
-#undef HAVE_UTIMES /* override configuration decision */
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long /* For AIX (sysV) */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)/65535.0) * 100.0)
-
-/* This page was added in June 1990. It may be incorrect for some versions
- of aix, so delete it if it causes trouble. */
-
-/* #define SKTPAIR */ /* SKTPAIR works, but what is advantage over pipes? */
-
-/* Specify the font for X to use. */
-
-#define X_DEFAULT_FONT "8x13"
-
-
-/* sioctl.h should not be included, says bytheway@cs.utah.edu. */
-#undef NEED_SIOCTL
-/* I'm guessing that that means it doesn't want ptem.h either. */
-#undef NEED_PTEM_H
-
-/* Here override various assumptions in ymakefile */
-
-#ifdef __GNUC__
-#define alloca(n) __builtin_alloca(n)
-#if __GNUC__ < 2
-#define LIB_STANDARD "/usr/local/lib/gcc-gnulib -lbsd -lrts -lc "
-#endif
-/* -g fails to work, so it is omitted. */
-/* tranle says that -fstrength-reduce does not help. */
-#define C_DEBUG_SWITCH
-#else
-#define LIBS_MACHINE "-lbsd -lrts"
-#endif
-
-#define OBJECTS_MACHINE "hftctl.o"
-#define LD_SWITCH_MACHINE "-T0x00400000 -K -e start"
-#define LIBS_DEBUG /* no -lg on aix ps/2 */
-
-#ifdef USG5_3
-#define XICCC
-#undef LD_SWITCH_MACHINE
-#define LD_SWITCH_MACHINE "-T0x0 -K -e start"
-
-/* Things defined in s-usg5-3.h that need to be overridden. */
-#undef BROKEN_TIOCGETC
-#undef BROKEN_TIOCGWINSZ
-#undef LIBX10_SYSTEM
-#undef LIBX11_SYSTEM
-#undef LIB_X11_LIB
-#endif
-
-/* Shared libraries are supported in a patch release of ps/2 1.2.1.
- If the system has them, the user can turn them on, and this code
- will make them work. */
-#define USG_SHARED_LIBRARIES /* Assume that by 19's release everyone has this. */
-
-#ifdef USG_SHARED_LIBRARIES
-#define ORDINARY_LINK
-#undef LIB_STANDARD
-#undef LD_SWITCH_MACHINE
-#if __GNUC__ > 1
-#define LD_SWITCH_MACHINE "-shlib"
-#endif
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/ibmrs6000.h
--- a/src/m/ibmrs6000.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/m/ibmrs6000.h Wed Nov 18 08:49:14 2009 -0700
@@ -69,10 +69,6 @@
/* Here override various assumptions in ymakefile */
-#ifdef AIXHFT
-#define OBJECTS_MACHINE "hftctl.o"
-#endif
-
#ifndef USG5_4
/* XEmacs change -- commented out: dkeller@vnet.ibm.com */
/* #define C_SWITCH_MACHINE -D_BSD */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/ibmrt-aix.h
--- a/src/m/ibmrt-aix.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/* RTPC AIX machine/system dependent defines
- Copyright (C) 1988 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically. */
-
-#ifndef IBMAIX
-#define IBMAIX
-#endif
-
-/* No load average information appears in the AIX kernel. VRM has this
- info, and if anyone desires they should fix fns.c to get it out of VRM */
-
-/* Define addresses, macros, change some setup for dump */
-
-#undef COFF
-#define NO_REMAP
-
-#define TEXT_START 0x10000000
-#define DATA_START 0x20000000
-
-#define N_BADMAG(x) BADMAG(x)
-#define N_TXTOFF(x) A_TEXTPOS(x)
-#define N_SYMOFF(x) A_SYMPOS(x)
-#define A_TEXT_OFFSET(HDR) sizeof(HDR)
-#define ADJUST_EXEC_HEADER \
- unexec_text_start += sizeof(hdr); \
- unexec_data_start = ohdr.a_dbase
-#undef ADDR_CORRECT
-#define ADDR_CORRECT(x) ((int)(x))
-
-/* This is the offset of the executable's text, from the start of the file. */
-
-#define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
-
-/* AIX has PTYs, so define here, along with macros needed to make them work. */
-
-#define PTY_ITERATION for (i=0; i<256; i++)
-#define PTY_NAME_SPRINTF sprintf (ptyname, "/dev/ptc%d", i);
-
-#define PTY_TTY_NAME_SPRINTF \
-{ /* Check that server side not already open */ \
- if ((ioctl (*ptyv, PTYSTATUS, 0) & 0xFFFF) != 0) \
- { \
- close (*ptyv); \
- continue; \
- } \
- /* And finally to be sure we can open it later */ \
- sprintf (ptyname, "/dev/pts%d", i); \
- signal (SIGHUP,SIG_IGN); \
-} /* ignore hangup at process end */
-
-/* TIOCNOTTY doesn't occur on AIX, but the rest
- of the conditionalized code in process.c does
- the right thing if we fake this out. */
-#define TIOCNOTTY IOCTYPE
-
-/* #define SKTPAIR */ /* SKTPAIR works, but what is advantage over pipes? */
-
-/* Specify the font for X to use. */
-
-#define X_DEFAULT_FONT "Rom14.500"
-
-/* Here override various assumptions in ymakefile */
-
-/* On AIX 2.2.1, use these definitions instead
-#define C_SWITCH_MACHINE "-I/usr/include -Nn2000"
-#define LIBS_MACHINE "-lX -lrts"
-*/
-
-#define C_SWITCH_MACHINE "-I/usr/include -I/usr/include/bsd -Nn2000"
-#define LIBS_MACHINE "-lXMenu -lX -lsock -lbsd -lrts"
-
-#define OBJECTS_MACHINE "hftctl.o"
-#define START_FILES "/lib/crt0.o"
-/* -lXMenu, -lX must precede -lsock, -lbsd */
-#define LD_SWITCH_MACHINE "-n -T0x10000000 -K -e start"
-
-#if 0 /* I refuse to promulgate a recommendation that would make
- users unable to debug - RMS. */
-/* delete the following line to foil optimization, enable debugging */
-#define C_DEBUG_SWITCH "-O"
-#endif
-
-
-/* Setup to do some things BSD way - these won't work previous to AIX 2.1.2 */
-
-#include </usr/include/bsd/BSDtoAIX.h>
-
-/* AIX utimes allegedly causes SIGSEGV. */
-#undef HAVE_UTIMES /* override configuration decision */
-
-/* rocky@watson.ibm.com says this is needed. */
-#define HAVE_FTIME
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/ibmrt.h
--- a/src/m/ibmrt.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/* RTPC machine dependent defines
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically. */
-
-/* XEmacs change */
-#ifndef ibmrt
-#define ibmrt
-#endif
-#ifndef romp
-#define romp /* unfortunately old include files are hanging around. */
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double /* For AIS (sysV) */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0)
-
-
-#define DATA_START 0x10000000
-
-/* The text segment always starts at a fixed address.
- This way we don't need to have a label _start defined. */
-#define TEXT_START 0
-
-/* Taking a pointer to a char casting it as int pointer */
-/* and then taking the int which the int pointer points to */
-/* is practically guaranteed to give erroneous results */
-
-#define NEED_ERRNO
-
-#define SKTPAIR
-
-/* Special switches to give the C compiler. */
-
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE "-Dalloca=_Alloca"
-#endif
-
-/* XEmacs addition: */
-/* Under Mach at least, gcc doesn't seem to work as the linker. */
-#ifdef MACH
-#define START_FILES "pre-crt0.o"
-#ifdef __GNUC__
-#define LINKER "pcc"
-#endif
-#endif
-
-/* Don't attempt to relabel some of the data as text when dumping.
- It does not work because their virtual addresses are not consecutive.
- This enables us to use the standard crt0.o. */
-
-#define NO_REMAP
-
-/* Use the bitmap files that come with Emacs. */
-#define EMACS_BITMAP_FILES
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/intel386.h
--- a/src/m/intel386.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/m/intel386.h Wed Nov 18 08:49:14 2009 -0700
@@ -27,27 +27,16 @@
NOTE-START
Intel 386 (-machine=intel386 or -machine=is386.h)
- The possibilities for -opsystem are: bsd4-2, usg5-2-2, usg5-3,
- isc2-2, 386-ix, esix, linux, sco3.2v4, and xenix.
+ The possibilities for -opsystem are: bsd4-2, usg5-4, usg5-4-2, and linux.
18.58 should support a wide variety of operating systems.
- Use isc2-2 for Interactive 386/ix version 2.2.
- Use 386ix for prior versions.
- Use esix for Esix.
Use linux for Linux.
It isn't clear what to do on an SCO system.
- -machine=is386 is used for an Integrated Solutions 386 machine.
- It may also be correct for Microport systems.
-
Cubix QBx/386 (-machine=intel386 -opsystem=usg5-3)
Changes merged in 19.1. Systems before 2/A/0 may fail to compile etags.c
due to a compiler bug.
-
-Prime EXL (-machine=intel386 -opsystem=usg5-3)
-
- Minor changes merged in 19.1.
NOTE-END */
/* Now define a symbol for the cpu type, if your compiler
@@ -58,8 +47,7 @@
#define INTEL386
/* crt0.c, if it is used, should use the i386-bsd style of entry.
- with no extra dummy args. On USG and XENIX,
- NO_REMAP says this isn't used. */
+ with no extra dummy args. On USG, NO_REMAP says this isn't used. */
/* Mly 16-Jan-96 16:38:32: this is part of a prototype -- same bug present in
other m*.h files */
@@ -69,17 +57,6 @@
#define DOT_GLOBAL_START
-#ifdef XENIX
-/* Data type of load average, as read out of kmem. */
-#define LOAD_AVE_TYPE short
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-#define LOAD_AVE_CVT(x) (((double) (x)) * 100.0 / FSCALE)
-
-#define FSCALE 256.0 /* determined by experimentation... */
-#endif
-
-
#ifdef SOLARIS2
/* Data type of load average, as read out of kmem. */
#define LOAD_AVE_TYPE long
@@ -106,34 +83,10 @@
#endif
#endif /* not SOLARIS2 */
-#ifdef XENIX
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* Since cannot purify, use standard Xenix 386 startup code. */
-
-#define START_FILES "/lib/386/Sseg.o pre-crt0.o /lib/386/Scrt0.o"
-
-/* These really use terminfo. */
-
-#define LIBS_TERMCAP "/lib/386/Slibcurses.a /lib/386/Slibtinfo.a /lib/386/Slibx.a"
-
-/* Standard libraries for this machine. Since `-l' doesn't work in `ld'. */
-/* '__fltused' is unresolved w/o Slibcfp.a */
-#define LIB_STANDARD "/lib/386/Slibcfp.a /lib/386/Slibc.a"
-#else /* not XENIX */
-
#ifdef USG
-
#define NO_REMAP
#define TEXT_START 0
#endif /* USG */
-#endif /* not XENIX */
#ifdef linux
/* libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared library, */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/iris4d.h
--- a/src/m/iris4d.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/* machine description file for Iris-4D machines. Use with s/irix*.h.
- Copyright (C) 1987 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-#ifndef mips
-#define mips
-#endif
-
-#ifndef IRIS_4D
-#define IRIS_4D
-#endif
-
-/* jg@genmagic.genmagic.com (John Giannandrea) says this is unnecessary. */
-#if 0
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long /* This doesn't quite work on the 4D */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int)(((double)(x)*100)/1024.0)
-
-/* s-iris3-6.h uses /vmunix */
-
-#undef KERNEL_FILE
-#define KERNEL_FILE "/unix"
-#endif
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* This machine requires completely different unexec code
- which lives in a separate file. Specify the file name. */
-
-#ifdef USG5_4
-#undef UNEXEC
-#define UNEXEC "unexelf.o"
-#else
-#define UNEXEC "unexmips.o"
-#endif
-
-#define TEXT_START 0x400000
-#define DATA_START 0x10000000
-
-#undef LIBS_MACHINE
-/* -lsun in case using Yellow Pages for passwords. */
-#define LIBS_DEBUG
-
-/* Define this if you have a fairly recent system,
- in which crt1.o and crt1.n should be used. */
-#define HAVE_CRTN
-
-#ifndef USG5_4
-#ifdef HAVE_CRTN
-/* Must define START-FILES so that the linker can find /usr/lib/crt0.o. */
-#define START_FILES "pre-crt0.o /usr/lib/crt1.o"
-#define LIB_STANDARD "-lc /usr/lib/crtn.o"
-#else
-#define START_FILES "pre-crt0.o /usr/lib/crt0.o"
-/* The entry-point label (start of text segment) is `start', not `__start'. */
-#define DEFAULT_ENTRY_ADDRESS start
-#define LIB_STANDARD "-lc"
-#endif
-#endif
-
-/* Use terminfo instead of termcap. */
-
-#define TERMINFO
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'a' means it is /dev/ptya0 */
-
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER 'q'
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/iris5d.h
--- a/src/m/iris5d.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-/* machine description file for Iris-4D machines. Use with s-iris3-6.h
- Copyright (C) 1987 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="irix3-3" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-#ifndef mips
-#define mips
-#endif
-
-#ifndef IRIS_4D
-#define IRIS_4D
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long /* This doesn't quite work on the 4D */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int)(((double)(x)*100)/1024.0)
-
-/* s-iris3-6.h uses /vmunix */
-
-#undef KERNEL_FILE
-#define KERNEL_FILE "/unix"
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* This machine requires completely different unexec code
- which lives in a separate file. Specify the file name. */
-
-#ifdef UNEXEC
-#undef UNEXEC
-#endif
-#define UNEXEC "unexelf.o"
-
-#define TEXT_START 0x400000
-
-#define DATA_START 0x10000000
-
-#undef LIBS_MACHINE
-/* -lsun in case using Yellow Pages for passwords. */
-#define LIBS_DEBUG
-
-/* Define this if you have a fairly recent system,
- in which crt1.o and crt1.n should be used. */
-#define HAVE_CRTN
-
-#ifdef HAVE_CRTN
-/* Must define START-FILES so that the linker can find /usr/lib/crt0.o. */
-#define START_FILES "pre-crt0.o /usr/lib/crt1.o"
-#define LIB_STANDARD "-lbsd -lc /usr/lib/crtn.o"
-#else
-#define START_FILES "pre-crt0.o /usr/lib/crt0.o"
-/* The entry-point label (start of text segment) is `start', not `__start'. */
-#define DEFAULT_ENTRY_ADDRESS start
-#define LIB_STANDARD "-lbsd -lc"
-#endif
-
-/* Use terminfo instead of termcap. */
-
-#define TERMINFO
-
-/* sioctl.h should be included where appropriate. */
-
-#define NEED_SIOCTL
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'a' means it is /dev/ptya0 */
-
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER 'q'
-
-
-#ifndef __GNUC__
-/* Turn off some "helpful" error checks for type mismatches
- that we can't fix without breaking other machines. */
-#define C_SWITCH_MACHINE "-cckr"
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/iris6d.h
--- a/src/m/iris6d.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/* machine description file for Iris-4D machines. Use with s/irix*.h.
- Copyright (C) 1987 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-#ifndef mips
-#define mips
-#endif
-
-#ifndef IRIS_4D
-#define IRIS_4D
-#endif
-
-/* jg@genmagic.genmagic.com (John Giannandrea) says this is unnecessary. */
-#if 0
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long /* This doesn't quite work on the 4D */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int)(((double)(x)*100)/1024.0)
-
-/* s-iris3-6.h uses /vmunix */
-
-#undef KERNEL_FILE
-#define KERNEL_FILE "/unix"
-#endif
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* This machine requires completely different unexec code
- which lives in a separate file. Specify the file name. */
-
-#ifdef USG5_4
-#undef UNEXEC
-#define UNEXEC "unexelfsgi.o"
-#else
-#define UNEXEC "unexmips.o"
-#endif
-
-#define TEXT_START 0x400000
-#define DATA_START 0x10000000
-
-#undef LIBS_MACHINE
-/* -lsun in case using Yellow Pages for passwords. */
-#define LIBS_DEBUG
-
-/* Define this if you have a fairly recent system,
- in which crt1.o and crt1.n should be used. */
-#define HAVE_CRTN
-
-#ifndef USG5_4
-#ifdef HAVE_CRTN
-/* Must define START-FILES so that the linker can find /usr/lib/crt0.o. */
-#define START_FILES "pre-crt0.o /usr/lib/crt1.o"
-#define LIB_STANDARD "-lc /usr/lib/crtn.o"
-#else
-#define START_FILES "pre-crt0.o /usr/lib/crt0.o"
-/* The entry-point label (start of text segment) is `start', not `__start'. */
-#define DEFAULT_ENTRY_ADDRESS start
-#define LIB_STANDARD "-lc"
-#endif
-#endif
-
-/* Use terminfo instead of termcap. */
-
-#define TERMINFO
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'a' means it is /dev/ptya0 */
-
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER 'q'
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/irist.h
--- a/src/m/irist.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/* machine description file for Silicon Graphics Iris 2500 Turbos;
- also possibly for non-turbo Irises with system release 2.5.
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-NOTE-START
-Version 18 said to work; use -opsystem=irist3-5 for system version 2.5
-and -opsystem=iris3-6 for system versions 3.6 and up.
-NOTE-END */
-
-#if 0
- Message-Id: <8705050653.AA20004@orville.arpa>
- Subject: gnu emacs 18.41 on iris [23].5 machines
- Date: 04 May 87 23:53:11 PDT (Mon)
- From: raible@orville.arpa
-
- Aside from the SIGIOT, I know of only one bug, a real strange one:
- I wrote a utimes interface, which copies elements from timevals
- to utimbufs. This code is known good. The problem is that in
- emacs, the utime doesn't seem to take effect (i.e. doesn't change the
- dates at all) unless I call report_file_error *after* the utime returns!
-
- if (utime (name, &utb) < 0)
- return;
- else
- /* XXX XXX XXX */
- /* For some reason, if this is taken out, then the utime above breaks! */
- /* (i.e. it doesn't set the time. This just makes no sense... */
- /* Eric - May 4, 1987 */
- report_file_error ("Worked just find\n", Qnil);
-
- Without any sort of debugger that works on emacs (I know... but I don't have
- *time* right now to start with gdb), it was quite time consuming to track
- it down to this.
-
- But since this code is only used for an optional 4th argument to one command
- (copy-file), it would say that it is non-critical...
-#endif /* 0 */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-#ifndef m68000
-#define m68000
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define FSCALE 1.0
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-/* #define NO_REMAP */
-
-/* There is an inconsistency between the sgi assembler, linker which barfs
- on these. */
-
-#define internal_with_output_to_temp_buffer stupid_long_name1
-#define Finsert_abbrev_table_description stupid_long_name2
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/is386.h
--- a/src/m/is386.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* machine description file for Integrated Solutions 386 machine. */
-
-#include "intel386.h"
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Intel 386 (-machine=intel386 or -machine=is386.h)
-
- The possibilities for -opsystem are: bsd4-2, usg5-2-2, usg5-3,
- isc2-2, 386-ix, esix, or xenix.
-
- 18.58 should support a wide variety of operating systems.
- Use isc2-2 for Interactive 386/ix version 2.2.
- Use 386ix for prior versions.
- Use esix for Esix. It isn't clear what to do on an SCO system.
-
- -machine=is386 is used for an Integrated Solutions 386 machine.
- It may also be correct for Microport systems.
-NOTE-END */
-
-#define LIBX10_MACHINE "-lnsl_s"
-#define LIBX11_MACHINE "-lnsl_s"
-
-#define LIBS_DEBUG "-lg"
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/isi-ov.h
--- a/src/m/isi-ov.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/* machine description file for ISI 68000's
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Use `-opsystem=bsd4-2' or `-opsystem=bsd4-3'.
-NOTE-END */
-
-#define ISI68K
-
-/* Say this machine is a 68000 */
-
-#define m68000
-
-/* Data type of load average, as read out of kmem. */
-
-#ifdef BSD4_3
-#define LOAD_AVE_TYPE long
-#else
-#define LOAD_AVE_TYPE double
-#endif BSD4_3
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#ifdef BSD4_3
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-#else
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-#endif
-
-/* Mask for address bits within a memory segment */
-
-#define SEGMENT_MASK 0x1ffff
-
-/* use the -20 switch to get the 68020 code */
-/* #define C_SWITCH_MACHINE -20 */
-
-/* Use the version of the library for the 68020
- because the standard library requires some special hacks in crt0
- which the GNU crt0 does not have. */
-
-#define LIB_STANDARD "-lmc"
-
-/* macros to make unexec work right */
-
-#define A_TEXT_OFFSET(HDR) sizeof(HDR)
-#define A_TEXT_SEEK(HDR) sizeof(HDR)
-
-/* A few changes for the newer systems. */
-
-#ifdef BSD4_3
-/* The following line affects crt0.c. */
-#undef m68k
-
-#undef LIB_STANDARD
-#define LIB_STANDARD "-lmc -lc"
-#define C_DEBUG_SWITCH "-20 -O -X23"
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/luna88k.h
--- a/src/m/luna88k.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/* m- file for LUNA 88000 running Mach.
-
-originaly wrote by
- Jun. 26th '90
- Akitoshi MORISHIMA
- ohm@astem.or.jp
-
-modified for mule-2.0 by
- Sep. 10th '94
- MUKAIGAWA Shin'ichi
- shin@ari.ncl.omron.co.jp
-
- Copyright (C) 1990 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY. No author or distributor
-accepts responsibility to anyone for the consequences of using it
-or for whether it serves any particular purpose or works at all,
-unless he says so in writing. Refer to the GNU Emacs General Public
-License for full details.
-
-Everyone is granted permission to copy, modify and redistribute
-GNU Emacs, but only under the conditions described in the
-GNU Emacs General Public License. A copy of this license is
-supposed to have been given to you along with GNU Emacs so you
-can know your rights and responsibilities. It should be in a
-file named COPYING. Among other things, the copyright notice
-and this notice must be preserved on all copies. */
-
-/* Synched up with: Mule 2.0. Not in FSF. */
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* On Mach, LSCALE is defined instead of FSCALE, in h/kernel.h, as 1000. */
-
-#define FSCALE 1000
-
-/* Mask for address bits within a memory segment */
-/* In other words, data segment starts from the address that is end of
- text segment rounded up to next (SEGMENT_MASK + 1) boundary. */
-
-#define SEGSIZ 0x20000
-#define SEGMENT_MASK (SEGSIZ - 1)
-
-/* macros to make unexec work right */
-
-#define A_TEXT_OFFSET(HDR) sizeof(HDR)
-#define A_TEXT_SEEK(HDR) sizeof(HDR)
-
-/* Memory management mechanism is different on Mach, so emacs-supplied
- malloc.c does not work. */
-
-#define SYSTEM_MALLOC
-
-/* We want errno in crt0.c */
-
-#define NEED_ERRNO
-
-/* Mach has 'init_process()' in libc.a, conflicting with emacs'
- 'init_process()', causing make to stop. So redefining that. */
-
-#define init_process init_process_emacs
-
-#define C_COMPILER gcc
-
-#define LOAD_AVE_MACH
-
-#define LIBS_MACHINE "-lmach"
-
-#define LIB_X11_LIB "-L/usr/lib/X11 -lX11 -lXwchar"
-
-#define CRT0_COMPILE "cc -c -O -Demacs $(ALL_CFLAGS)"
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/masscomp.h
--- a/src/m/masscomp.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/* machine description file for Masscomp 5000 series running RTU, ucb universe.
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="rtu" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-/* Masscomp predefines mc68000. */
-#define m68000 mc68000
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#undef NO_REMAP
-
-/* crt0.c should use the vax-bsd style of entry, with a dummy arg. */
-
-#define CRT0_DUMMIES bogus_fp,
-
-/* Name of file the to look in
- for the kernel symbol table (for load average) */
-
-#define KERNEL_FILE "/unix"
-
-/* This triggers some stuff to avoid a compiler bug */
-
-#define MASSC_REGISTER_BUG
-
-/* Prevent -lg from being used for debugging. Not implemented? */
-
-#define LIBS_DEBUG
-
-/* Adjust a header field for the executable file about to be dumped. */
-
-#define ADJUST_EXEC_HEADER \
- hdr.a_stamp = STAMP13; /* really want the latest stamp, whatever it is */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/mega68.h
--- a/src/m/mega68.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/* machine description file for Megatest 68000's.
- Copyright (C) 1985 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-2" */
-
-/* Say this machine is a 68000 */
-
-#define m68000
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/mg1.h
--- a/src/m/mg1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/* machine description file for Whitechapel Computer Works MG1 (ns16000 based).
- Copyright (C) 1985 Free Software Foundation, Inc.
- MG-1 version by L.M.McLoughlin
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-We are in the dark about what operating system runs on the Whitechapel
-systems. Consult share-lib/MACHINES for information on which
-operating systems Emacs has already been ported to; one of them might
-work. If you find an existing system name that works or write your
-own configuration files, please let the Free Software Foundation in on
-your work; we'd like to distribute this information.
-NOTE-END */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-/* Say this machine is a 16000 and an mg1, cpp says its a 32000 */
-#define ns16000
-#define mg1
-
-/* Data type of load average, as read out of kmem. */
-/* mg1 its an unsigned long */
-#define LOAD_AVE_TYPE unsigned long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-#define FSCALE 1000.0
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-/* mapping seems screwy */
-#define NO_REMAP
-
-/* Avoids a compiler bug */
-/* borrowed from sequent.h */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/mips-nec.h
--- a/src/m/mips-nec.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/* m- file for Mips machines.
- Copyright (C) 1987, 1992, 1993, 1995 Free Software Foundation, Inc.
-
- This file contains some changes for our SVR4 based SINIX-Mips 5.4.
- I hope this is helpful to port the emacs to our RM?00 series and
- maybe to the DC/OSx (Mips-based) machines of Pyramid Inc.
- (Marco.Walther@mch.sni.de)
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Use m-mips4.h for RISCOS version 4; use s-bsd4-3.h with the BSD world.
-Note that the proper m- file for the Decstation is m-pmax.h.
-This is the m- file for SNI RM*00 machines. Use s- sinix5-4.h file!
-With this the file mips-siemens.h is obsolete.
-NOTE-END */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-#ifndef mips
-# define mips
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / 256.0)
-
-/* CDC EP/IX 1.4.3 uses /unix */
-
-#undef KERNEL_FILE
-#define KERNEL_FILE "/unix"
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* Describe layout of the address space in an executing process. */
-/* MARCO ???
-*/
-#define TEXT_START 0x400000
-
-#undef ORDINARY_LINK
-
-#undef LIBS_DEBUG
-
-/* Alter some of the options used when linking. */
-
-#undef LIBS_MACHINE
-/* #define LIBS_MACHINE "-lmld" */ /* mrb */
-#define START_FILES "pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o"
-
-#ifdef LIB_STANDARD
-#undef LIB_STANDARD
-#endif
-#define LIB_STANDARD "-lc /usr/ccs/lib/crtn.o"
-
-#ifdef __GNUC__
-#define C_DEBUG_SWITCH
-#define C_OPTIMIZE_SWITCH "-O"
-#define LD_SWITCH_MACHINE
-#else
-#define C_DEBUG_SWITCH "-DSYSV"
-#define C_OPTIMIZE_SWITCH "-DSYSV "
-#define LD_SWITCH_MACHINE
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/mips-siemens.h
--- a/src/m/mips-siemens.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-/* m- file for Mips machines.
- Copyright (C) 1987, 1992, 1993, 1995 Free Software Foundation, Inc.
-
- This file contains some changes for our SVR4 based SINIX-Mips 5.4.
- I hope this is helpful to port the emacs to our RM?00 series and
- maybe to the DC/OSx (Mips-based) machines of Pyramid Inc.
- (Marco.Walther@mch.sni.de)
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Use m-mips4.h for RISCOS version 4; use s-bsd4-3.h with the BSD world.
-Note that the proper m- file for the Decstation is m-pmax.h.
-This is the m- file for SNI RM*00 machines. Use s- sinix5-4.h file!
-With this the file mips-siemens.h is obsolete.
-NOTE-END */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-#ifndef mips
-# define mips
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / 256.0)
-
-/* CDC EP/IX 1.4.3 uses /unix */
-
-#undef KERNEL_FILE
-#define KERNEL_FILE "/unix"
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* Describe layout of the address space in an executing process. */
-/* MARCO ???
-*/
-#define TEXT_START 0x400000
-
-#ifdef UNEXEC
-#undef UNEXEC
-#endif
-#define UNEXEC "unexsni.o"
-
-#undef ORDINARY_LINK
-
-#undef LIBS_DEBUG
-
-/* Alter some of the options used when linking. */
-
-#undef LIBS_MACHINE
-/* #define LIBS_MACHINE "-lmld" */ /* mrb */
-#define START_FILES "pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o"
-
-#ifdef LIB_STANDARD
-#undef LIB_STANDARD
-#endif
-#define LIB_STANDARD "-lc /usr/ccs/lib/crtn.o"
-
-#ifdef __GNUC__
-#define C_DEBUG_SWITCH
-#define C_OPTIMIZE_SWITCH "-O"
-#define LD_SWITCH_MACHINE
-#else
-#define C_DEBUG_SWITCH "-DSYSV"
-#define C_OPTIMIZE_SWITCH "-DSYSV "
-#define LD_SWITCH_MACHINE
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/mips.h
--- a/src/m/mips.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/m/mips.h Wed Nov 18 08:49:14 2009 -0700
@@ -77,7 +77,7 @@
/* Alter some of the options used when linking. */
-#if !defined(NEWSOS5) && !defined(linux)
+#if !defined(linux)
#ifdef BSD
/* DECstations don't have this library. */
@@ -100,9 +100,9 @@
#define C_DEBUG_SWITCH "-O -g3"
#endif /* not BSD */
-#endif /* !NEWSOS5 && !linux */
+#endif /* !linux */
-#if !defined(NEWSOS5) && !defined(linux)
+#if !defined(linux)
#ifdef USG
/* Don't try to use SIGIO even though it is defined. */
@@ -127,4 +127,4 @@
#define TERMINFO
#undef MAIL_USE_FLOCK /* Someone should check this. */
#endif /* BSD */
-#endif /* !NEWSOS5 && !linux */
+#endif /* !linux */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/mips4.h
--- a/src/m/mips4.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* machine description file for Mips running RISCOS version 4. */
-
-#include "mips.h"
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Use -opsystem=usg5-2-2 normally, or -opsystem=bsd4-3 with the BSD
-world.
-NOTE-END */
-
-#if 0
-/* Define MIPS2 if you have an R6000 or R4000. */
-#define MIPS2
-#endif
-
-#ifdef __GNUC__
-#define C_DEBUG_SWITCH "-g -O"
-#else
-/* We used to have -systype bsd43, but a configure change
- now takes care of that option. */
-#ifdef MIPS2
-#define C_DEBUG_SWITCH "-DMips -g3 -Wf,-XNd4000 -O -Olimit 2000 -mips2"
-#else
-#define C_DEBUG_SWITCH "-DMips -g3 -Wf,-XNd4000 -O -Olimit 2000"
-#endif
-#endif
-
-#ifdef TERMINFO
-#undef TERMINFO
-#endif
-
-#define START_FILES "pre-crt0.o /lib/crt1.o"
-/* Used to have -lisode, but jlp@math.byu.edu says remove it
- (for RISCOS 4.52). */
-/* ethanb@ptolemy.astro.washington.edu says crtn.o uses _ctype
- and therefore we must search libc again after crtn.o.
- The -L is used to force second -lc to find the sysv version
- of libc.a, which is needed because the BSD libc.a
- doesn't have _ctype. */
-#define LIB_STANDARD "-lc /lib/crtn.o -L/usr/lib -lc"
-
-
-#define COFF
-#undef LD_SWITCH_MACHINE
-#define LD_SWITCH_MACHINE "-systype bsd43 -g3 -D 800000"
-
-#define NO_MODE_T
-
-/* These are needed on Riscos 4.0.
- It appears that's the only system which uses mips4.h and defined BSD. */
-#ifdef BSD
-#undef HAVE_XRMSETDATABASE
-#undef HAVE_XSCREENRESOURCESTRING
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/ncr386.h
--- a/src/m/ncr386.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "intel386.h"
-
-/* Allow emacs to link with "bcopy()" unresolved. Works around a
- problem where /usr/lib/libX11.so provides bcopy, but
- /usr/ccs/lib/libX11.so does not. */
-#define LD_SWITCH_X_DEFAULT "-Wl,-z,nodefs"
-
-#endif /* __GNUC__ */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/news-risc.h
--- a/src/m/news-risc.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* news-risc.h is for the "RISC News". */
-
-#include "mips.h"
-
-#ifdef NEWSOS5
-
-/* NEWS-OS 5.0.2 */
-
-#undef LIBS_MACHINE
-
-#ifdef __GNUC__
-#define C_DEBUG_SWITCH "-g"
-#define C_OPTIMIZE_SWITCH "-g -O"
-#define LD_SWITCH_MACHINE "-g -Xlinker -D -Xlinker 800000"
-#else
-#define C_DEBUG_SWITCH "-g3"
-#define C_OPTIMIZE_SWITCH "-g3"
-#define LD_SWITCH_MACHINE "-g3 -D 800000 -non_shared"
-#endif
-
-#else /* not NEWSOS5 */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-3" */
-
-#define COFF
-#undef LD_SWITCH_MACHINE
-#define LD_SWITCH_MACHINE "-x -D 800000"
-
-/* #define C_OPTIMIZE_SWITCH -O2 */
-#define C_OPTIMIZE_SWITCH "-O"
-
-#ifndef __GNUC__
-#define C_DEBUG_SWITCH "-g3"
-#endif
-
-#undef TERMINFO
-
-/* We have no mode_t. */
-#define NO_MODE_T
-
-/* Don't use the definitions in m/mips.h. */
-#undef LINKER
-#undef LIBS_MACHINE
-
-#undef KERNEL_FILE
-#define KERNEL_FILE "/vmunix"
-
-#endif /* not NEWSOS5 */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/news.h
--- a/src/m/news.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/* machine description file for Sony's NEWS workstations, NEWS-OS 3.0.
- Copyright (C) 1985, 1986, 1989 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Use -opsystem=bsd4-2, or -opsystem=bsd4-3 for system release 3.
-NOTE-END */
-
-/* Say this machine is a 68000 */
-
-#ifndef m68000
-#define m68000
-#endif
-
-/* One CRT0 Dummy variable */
-
-#if 0 /* larry@mitra.com says Sony's as doesn't like this. */
-#define CRT0_DUMMIES one_dummy,
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* Must use the system's termcap. It does special things. */
-
-#define LIBS_TERMCAP "-ltermcap"
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/next.h
--- a/src/m/next.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/* Configuration file for the NeXT machine.
- Copyright (C) 1990 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. and Emacs for NeXTstep 4.1 */
-
-/* Say this machine is a next if not previously defined */
-
-#ifndef NeXT
-#define NeXT
-#endif
-
-/* Say that the text segment of a.out includes the header;
- the header actually occupies the first few bytes of the text segment
- and is counted in hdr.a_text. */
-
-#define A_TEXT_OFFSET(HDR) sizeof (HDR)
-
-/* Mask for address bits within a memory segment */
-
-#define SEGSIZ 0x20000
-#define SEGMENT_MASK (SEGSIZ - 1)
-
-#define HAVE_UNIX_DOMAIN
-
-#define LIB_X11_LIB "-L/usr/lib/X11 -lX11"
-
-/* This avoids a problem in Xos.h when using co-Xist 3.01. */
-#define X_NOT_POSIX
-
-/* Conflicts in process.c between ioctl.h & tty.h use of t_foo fields */
-
-#define NO_T_CHARS_DEFINES
-
-/* Use our own unexec routines */
-
-#define UNEXEC "unexnext.o"
-
-/* We don't have a g library either, so override the -lg LIBS_DEBUG switch */
-
-#define LIBS_DEBUG
-
-/* We don't have a libgcc.a, so we can't let LIB_GCC default to -lgcc */
-
-#define LIB_GCC
-
-/* Link this program just by running cc. */
-#define ORDINARY_LINK
-
-/* start_of_text isn't actually used, so make it compile without error. */
-#define TEXT_START 0
-
-/* Defining KERNEL_FILE causes lossage because sys/file.h
- stupidly gets confused by it. */
-#undef KERNEL_FILE
-
-#define LD_SWITCH_MACHINE
-
-/* #define environ _environ */
-
-/* XEmacs change from Barry Warsaw. */
-#ifndef NOT_C_CODE
-/* this is only typedef'd in types.h if _POSIX_SOURCE is defined
- * but the problem with that is that compiling with -posix links
- * in -lposix instead of -lsys_s, and the latter defines some
- * important NeXT AppKit symbols.
- */
-typedef unsigned short mode_t;
-#endif /* ! NOT_C_CODE */
-
-#define ASSERT_VALID_POINTER(pnt) (assert ((((int) pnt) & 1) == 0))
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/nh3000.h
--- a/src/m/nh3000.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/* machine description for Harris Night Hawk Series 1200 and Series 3000
- MC68030-based systems (FPP on these is custom). These systems are
- also known as "ecx" and "gcx".
- Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* This file manually constructed for Harris Night Hawk 4000 (and 5000)
- * series Motorola 88100 and 88110 based machines.
- */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-#ifndef gcx
-#define gcx
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/nh4000.h
--- a/src/m/nh4000.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/* machine description for Harris NightHawk 88k based machines
- (includes nh4000 and nh5000 machines).
- Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* This file manually constructed for Harris Night Hawk 4000 (and 5000)
- * series Motorola 88100 and 88110 based machines.
- */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-#ifndef m88000
-#define m88000
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/ns16000.h
--- a/src/m/ns16000.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/* machine description file for ns16000.
- Copyright (C) 1985 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-For the Encore, use `-opsystem=umax'.
-For a Tektronix 16000 box (a 6130, perhaps?), use `-opsystem=bsd4-2'.
-Use `-machine=ns16000' for both.
-NOTE-END */
-
-/* Say this machine is a 16000 */
-
-#define ns16000 1
-
-/* Data type of load average, as read out of kmem. */
-
-#ifndef USG
-#define LOAD_AVE_TYPE double
-#endif
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#ifndef USG
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-#endif
-
-#ifdef USG
-
-/* Control assembler syntax used in alloca.s. */
-#define NS5
-
-/* On early NS systems ulimit was buggy. If set emacs uses this value
- * for the maximum sbrk value instead of getting it from ulimit.
- */
-#define ULIMIT_BREAK_VALUE 0x7E0000
-
-/* Early NS compilers have this bug. I believe it has been fixed in later
- * releases.
- */
-#define SHORT_CAST_BUG
-
-#define SEGMENT_MASK (NBPS - 1)
-
-/* Variables to get crt0.c to come out correctly */
-#define CRT0_DUMMIES bogus_fp,
-#define DOT_GLOBAL_START
-
-/* Set this to /bin/mail unless you have a better mail posting program */
-#define MAIL_PROGRAM_NAME "/usr/local/bin/remail"
-
-/* This avoids problems with uninitialized static variables going in .data. */
-#define NO_REMAP
-
-#endif /* USG */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/ns32000.h
--- a/src/m/ns32000.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/* machine description file for National Semiconductor 32000, running Genix.
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-/* Data type of load average, as read out of kmem. */
-
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) */
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-/* #define NO_REMAP */
-
-#define TEXT_START 0
-
-#ifndef __NetBSD__
-#define EXEC_MAGIC 0410
-
-#define START_FILES "pre-crt0.o /lib/crt0.o"
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/nu.h
--- a/src/m/nu.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/* machine description file for TI Nu machines using system V.
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000 are the ones defined so far. */
-
-#ifndef m68000
-#define m68000
-#endif
-
-#ifndef NU
-#define NU
-#endif
-
-/* Data type of load average, as read out of kmem. */
-/* These are commented out since it does not really work in uniplus */
-
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0) */
-
-/* Change some things to avoid bugs in compiler */
-
-#define SWITCH_ENUM_BUG 1
-
-/* Specify alignment requirement for start of text and data sections
- in the executable file. */
-
-#define SECTION_ALIGNMENT pagemask
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/orion.h
--- a/src/m/orion.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/* machine description file for HLH Orion.
- Copyright (C) 1985 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically. */
-
-#ifndef orion
-#define orion
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#ifndef FSCALE
-#define FSCALE 1.0
-#endif
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* It is necessary to use the portable imitation of alloca,
- since a true stack-allocating one is impossible. */
-
-#define C_ALLOCA
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/orion105.h
--- a/src/m/orion105.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/* machine description file for HLH Orion 1/05 (Clipper).
- Copyright (C) 1985 Free Software Foundation, Inc.
- Lee McLoughlin <lmjm%doc.imperial.ac.uk@nss.cs.ucl.ac.uk>
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-2" */
-
-/* Data type of load average, as read out of kmem. */
-/* This used to be `double'. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* This used to be 1.0. */
-#ifndef FSCALE
-#define FSCALE 256
-#endif
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Here is where programs actually start running */
-#define TEXT_START 0x8000
-#define LD_TEXT_START_ADDR 8000
-
-/* Arguments to ignore before argc in crt0.c. */
-#define DUMMIES dummy1, dummy2,
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/paragon.h
--- a/src/m/paragon.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* m/ file for Paragon i860 machine. */
-
-#include "i860.h"
-#define COFF
-#define SYSTEM_MALLOC
-#define TEXT_START 0x10000
-#define LIB_STANDARD "-lc -lic -lmach"
-#define KEEP_OLD_TEXT_SCNPTR
-#define KEEP_OLD_PADDR
-#define drem fmod
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/pfa50.h
--- a/src/m/pfa50.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* Machine description file for PFU A-series.
- Copyright (C) 1988 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* Say this machine is a 68000 */
-
-#define m68000
-#define mc68000 1
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* Define TEXT_START_ADDR if your linker don't set execute point to _start.
- If it needed, temacs always CORE-DUMP. */
-
-#define TEXT_START_ADDR __start
-
-/* Define START_FILES if your machine used _start.
- */
-
-#define START_FILES "crt0.o"
-
-/* Define LD_SWITCH_MACHINE if your linker needs it.
- */
-
-#define LD_SWITCH_MACHINE "-e __start"
-
-/* SX/A has alloca in the PW library. */
-
-#define LIB_STANDARD "-lPW -lc"
-
-/* SX/A uses terminfo and lib/curses */
-
-#define TERMINFO
-
-/* SX/A use SystemV style getdents/readdir. */
-
-#define NO_SIOCTL_H
-
-#define BROKEN_SIGIO
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/plexus.h
--- a/src/m/plexus.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/* machine description file for the Plexus running System V.2.
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-/* Plexus predefines m68 instead of m68000. */
-#define m68000 m68
-
-/* Data type of load average, as read out of kmem. */
-
-#undef LOAD_AVE_TYPE
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#undef LOAD_AVE_CVT
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#undef NO_REMAP
-
-/* Use the following on ld so we can use the gnu crt0
- The plexus ld looks for start */
-#define LD_SWITCH_MACHINE "-e __start"
-
-/* Use the PW library, which contains alloca. */
-
-#define LIB_STANDARD "-lPW -lc"
-
-/* crt0.c should use the vax-bsd style of entry, with no dummy args. */
-
-#define CRT0_DUMMIES zero1, zero2,
-
-/* This triggers some stuff to avoid a compiler bug */
-
-#define TAHOE_REGISTER_BUG
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/pmax.h
--- a/src/m/pmax.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* Machine description file for DEC MIPS machines. */
-
-#include "mips.h"
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Use -opsystem=osf1 for OSF/1, and -opsystem=bsd4-3 otherwise.
-NOTE-END */
-
-#undef LIB_STANDARD
-#undef START_FILES
-#undef COFF
-#undef TERMINFO
-#define MAIL_USE_FLOCK
-
-#ifdef MACH
-#define START_FILES "pre-crt0.o /usr/lib/crt0.o"
-#else
-/* This line starts being needed with ultrix 4.0. */
-/* You must delete it for version 3.1. */
-#define START_FILES "pre-crt0.o /usr/lib/cmplrs/cc/crt0.o"
-#endif
-
-/* Supposedly the following will overcome a kernel bug. */
-#undef LD_SWITCH_MACHINE
-#undef DATA_START
-#define DATA_START 0x10000000
-
-#if 0
-/* I don't see any such conflict in Ultrix 4.2, 4.2a, or 4.3. And
- the relocating allocator is a real win. -JimB */
-
-/* In Ultrix 4.1, XvmsAlloc.o in libX11.a seems to insist
- on defining malloc itself. This should avoid conflicting with it. */
-#define SYSTEM_MALLOC
-#endif
-
-/* Override what mips.h says about this. */
-#undef LINKER
-
-/* Ultrix 4.2 (perhaps also 4.1) implements O_NONBLOCK
- but it doesn't work right;
- and it causes hanging in read_process_output. */
-#define BROKEN_O_NONBLOCK
-
-/* mcc@timessqr.gc.cuny.edu says this makes Emacs work with DECnet. */
-#ifdef HAVE_LIBDNET
-#define LIBS_MACHINE "-ldnet"
-#endif
-
-/* mcc@timessqr.gc.cuny.edu says it is /vmunix on Ultrix 4.2a. */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/vmunix"
-
-#ifndef MACH
-/* Jim Wilson writes:
- [...] The X11 include files that Dec distributes with Ultrix
- are bogus.
-
- When __STDC__ is defined (which is true with gcc), the X11 include files
- try to define prototypes. The prototypes however use types which haven't
- been defined yet, and thus we get syntax/parse errors.
-
- You can not fix this by changing the include files, because the prototypes
- create circular dependencies, in particular Xutil.h depends on types defined
- in Xlib.h, and Xlib.h depends on types defined in Xutil.h. So, no matter
- which order you try to include them in, it will still fail.
-
- Compiling with -DNeedFunctionPrototypes=0 will solve the problem by
- directly inhibiting the bad prototypes. This could perhaps just be put in
- an a Ultrix configuration file.
-
- Using the MIT X11 distribution instead of the one provided by Dec will
- also solve the problem, but I doubt you can convince everyone to do this. */
-
-/* Addendum: the MIT X11 distribution neglects to define certain symbols
- when NeedFunctionPrototypes is 0, but still tries to use them when
- NeedVarargsPrototypes is 1 (which is its default value). So if we're
- going to disable non-variadic prototypes, we also need to disable
- variadic prototypes. --kwzh@gnu.ai.mit.edu */
-#define C_SWITCH_X_MACHINE "-DNeedFunctionPrototypes=0 -DNeedVarargsPrototypes=0"
-#endif
-
-/* XEmacs: the following does nothing at all any more due to cleanup
- of the create_process() code. */
-
-/* Enable a fix in process.c. */
-#define SET_CHILD_PTY_PGRP
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/pyramid.h
--- a/src/m/pyramid.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/* machine description file for pyramid.
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-2" */
-
-/* pyramid preprocessor defines "pyr", however the following is clearer */
-#define pyramid
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* Don't use the ordinary -g for debugging in cc */
-
-#define C_DEBUG_SWITCH "-gx"
-
-/* Reenable this #define for old versions of the Pyramid system. */
-
-/* #define PYRAMID_OLD */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/pyrmips.h
--- a/src/m/pyrmips.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* Configuration file for the Pyramid machine that uses the MIPS cpu. */
-/* This does not fully work. */
-
-#include "m-pyramid.h"
-
-#define SYSTEM_MALLOC
-#define CANNOT_DUMP
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sequent-ptx.h
--- a/src/m/sequent-ptx.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/* machine description file for SEQUENT machines running DYNIX/ptx
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="ptx" */
-
-#include "intel386.h"
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others. */
-
-/* BTW: ptx defines _SEQUENT_, i386 */
-
-/* crt0.c should use the vax-bsd style of entry, with these dummy args. */
-/* Already defined. Assume prior definition works for PTX. */
-#if 0
-#undef CRT0_DUMMIES
-#define CRT0_DUMMIES dummy1, dummy2, dummy3,
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE unsigned long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define FSCALE 1000.0
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-/* On PTX, can't seem to get a valid executable unless NO_REMAP is
- defined. This did work in the Sequent patched Emacs 18.57. */
-#ifndef NO_REMAP
-#define NO_REMAP
-#endif
-/* #undef NO_REMAP */
-
-/* If a valid PTX executable could be dumped without NO_REMAP defined,
- here's a guess at some defines to make it work. */
-#ifndef NO_REMAP
-
-/* PTX has getpagesize() but it returns 296. Using the default method of
- including getpagesize.h in unexec.c returns 4096 which seems more
- reasonable. */
-#undef HAVE_GETPAGESIZE
-
-/* Override magic number for a.out header. */
-#define EXEC_MAGIC 0411 /* from a.out.h: separated I&D */
-
-#define ADJUST_TEXT_SCNHDR_SIZE
-#define ADJUST_TEXTBASE
-
-/* The file sections in the Symmetry a.out must be on 4K boundaries. */
-/* #define DATA_SECTION_ALIGNMENT (4096-1) */
-
-#endif /* ifndef NO_REMAP */
-
-/* Avoids a compiler bug. */
-#define TAHOE_REGISTER_BUG
-
-/* (short) negative-int doesn't sign-extend correctly. */
-#define SHORT_CAST_BUG
-
-/* Cause compilations to be done in parallel in ymakefile. */
-#define MAKE_PARALLEL $&
-
-/* Use terminfo library. */
-#define LIBS_TERMCAP "-ltermlib"
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sequent.h
--- a/src/m/sequent.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/* machine description file for SEQUENT BALANCE machines
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Use -opsystem=bsd4-2, or -opsystem=bsd4-3 on newer systems.
-NOTE-END */
-
-/* NOTE: this file works for DYNIX release 2.0
- (not tested on 1.3) on NS32000's */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-
-/* BTW: DYNIX defines sequent, ns32000, and ns16000 (GENIX compatibility) */
-#ifndef sequent /* pre DYNIX 2.1 releases */
-# define sequent
-#endif
-
-/* crt0.c should use the vax-bsd style of entry, with these dummy args. */
-
-#define CRT0_DUMMIES bogus_fp,
-
-/* crt0.c should define a symbol `start' and do .globl with a dot. */
-
-#define DOT_GLOBAL_START
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE unsigned long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define FSCALE 1000.0
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Name of file the to look in
- for the kernel symbol table (for load average) */
-
-#undef KERNEL_FILE
-#define KERNEL_FILE "/dynix"
-
-/* Avoids a compiler bug */
-
-#define TAHOE_REGISTER_BUG
-
-/* Say that the text segment of a.out includes the header;
- the header actually occupies the first few bytes of the text segment
- and is counted in hdr.a_text. Furthermore, the value written
- in the a_text in the file must have N_ADDRADJ added to it. */
-
-#define A_TEXT_OFFSET(HDR) (sizeof (HDR) + N_ADDRADJ (HDR))
-
-/* This is the offset of the executable's text, from the start of the file. */
-
-#define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
-
-/* (short) negative-int doesn't sign-extend correctly */
-#define SHORT_CAST_BUG
-
-/* Cause compilations to be done in parallel in ymakefile. */
-#define MAKE_PARALLEL &
-
-/* Say that mailer interlocking uses flock. */
-#define MAIL_USE_FLOCK
-
-/* On many 4.2-based systems, there's a rather tricky bug
- * with the interpretation of the pid/pgrp value given to
- * the F_SETOWN fcntl() call. It works as documented EXCEPT
- * when applied to filedescriptors for sockets, in which case
- * the sign must be reversed. If your emacs subprocesses get
- * SIGIO's when they shouldn't, while running on a socket
- * (e.g. under X windows), you should probably define this.
- */
-
-#define F_SETOWN_SOCK_NEG
-
-/* Some really obscure 4.2-based systems (like Sequent DYNIX)
- * do not support asynchronous I/O (using SIGIO) on sockets,
- * even though it works fine on tty's. If you have one of
- * these systems, define the following, and then use it in
- * config.h (or elsewhere) to decide when (not) to use SIGIO.
- */
-
-/* Note: This definition not used under XEmacs */
-#define NO_SOCK_SIGIO
-
-/* Define how to search all pty names.
- This is for Dynix 3.0; delete next 5 definitions for older systems. */
-
-#define PTY_MAJOR "pqrstuvwPQRSTUVW"
-#define PTY_MINOR "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-#define PTY_ITERATION \
- register int ma, mi; \
- for (ma = 0; ma < sizeof(PTY_MAJOR) - 1; ma++) \
- for (mi = 0; mi < sizeof(PTY_MINOR) - 1; mi++)
-#define PTY_NAME_SPRINTF \
- sprintf (ptyname, "/dev/pty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
-#define PTY_TTY_NAME_SPRINTF \
- sprintf (ptyname, "/dev/tty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sgi-challenge.h
--- a/src/m/sgi-challenge.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/* machine description file for sgi challange and onyx machines running
- Irix 5.1. It will probably work with other new SGI machines.
- Use with s-iris5-1.h
- by Hayden Schultz <haydens@ll.mit.edu> for XEmacs
-
- Copyright (C) 1987, 1994 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not in FSF. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="irix3-3" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-#ifndef mips
-#define mips
-#endif
-
-#ifndef IRIS_4D
-#define IRIS_4D
-#endif
-
-/*
- * For some reason I don't understand, the most expensive machines
- * SGI makes are the only SGI machines that don't come with sound
- */
-#ifdef HAVE_NATIVE_SOUND
-#undef HAVE_NATIVE_SOUND
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long /* This doesn't quite work on the 4D */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int)(((double)(x)*100)/1024.0)
-
-/* s-iris3-6.h uses /vmunix */
-
-#undef KERNEL_FILE
-#define KERNEL_FILE "/unix"
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* This machine requires completely different unexec code
- which lives in a separate file. Specify the file name. */
-
-#ifdef UNEXEC
-#undef UNEXEC
-#endif
-#define UNEXEC "unexelfsgi.o"
-
-#define TEXT_START 0x400000
-#define DATA_START 0x10000000
-
-#undef LIBS_MACHINE
-/* -lsun in case using Yellow Pages for passwords. */
-#define LIBS_DEBUG
-
-/* Define this if you have a fairly recent system,
- in which crt1.o and crt1.n should be used. */
-#define HAVE_CRTN
-
-#ifdef HAVE_CRTN
-/* Must define START-FILES so that the linker can find /usr/lib/crt0.o. */
-#define START_FILES "pre-crt0.o /usr/lib/crt1.o"
-#define LIB_STANDARD "-lbsd -nocount -lc_s -lc /usr/lib/crtn.o"
-#else
-#define START_FILES "pre-crt0.o /usr/lib/crt0.o"
-/* The entry-point label (start of text segment) is `start', not `__start'. */
-#define DEFAULT_ENTRY_ADDRESS start
-#define LIB_STANDARD "-lbsd -lc"
-#endif
-
-/* Use terminfo instead of termcap. */
-
-#define TERMINFO
-
-/* sioctl.h should be included where appropriate. */
-
-#define NEED_SIOCTL
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'a' means it is /dev/ptya0 */
-
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER 'q'
-
-/* By Tor Arntsen <tor@spacetec.no> for XEmacs. */
-#ifdef USE_GCC
-#define C_SWITCH_MACHINE "-D_BSD_TYPES -mcpu=r4000 -mips2"
-#else
-/* Turn off some "helpful" error checks for type mismatches
- that we can't fix without breaking other machines. */
-#define C_SWITCH_MACHINE "-D_BSD_TYPES -cckr -acpp -mips2"
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sgi3000.h
--- a/src/m/sgi3000.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#include "irist.h"
-/* Synched up with: FSF 19.31. */
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sps7.h
--- a/src/m/sps7.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/* machine description file for Bull SPS-7.
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2" */
-
-/* Say this machine is a 68000 */
-
-#ifndef m68000
-#define m68000
-#endif
-
-#define sps7
-
-/* Data type of load average, as read out of kmem. */
-/* Suspect there is something weird about this machine, so turn it off. */
-
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0) */
-
-#define SMX
-#define V3x
-
-/* Have the socketpair call
-*/
-
-#define SKTPAIR
-
-/* Define this to cause -N to be passed to ld. This is needed
- * in uniplus because of its funny memory space layout.
- * SMX--If you are using 32 bit (COFF) use "-N", else don't use anything.
- */
-
-#define LD_SWITCH_MACHINE "-N -T32 -e __start"
-
-/* If you are compiling for a 68020, then use -lc32 else use -lc */
-
-#define LIB_STANDARD "-lc32"
-
-/* Fore 16 bit, -linet, for 32 bit -linet32 (be sure you have it!). */
-
-#define LIBS_MACHINE "-linet32"
-
-/* Use -T32 for 68020, -T16 otherwise */
-
-#define C_SWITCH_MACHINE "-T32"
-
-#define BROKEN_SIGIO
-
-/* Other than 68020 use ld16, as32, or undefine (defaults ld and as). */
-
-#define ASS as32
-
-#ifdef V3x
-#define EXEC_MAGIC 0x10b
-#define SEGMENT_MASK (NBPS-1)
-#define ADJUST_EXEC_HEADER f_hdr.f_magic = SMROMAGIC;\
- f_ohdr.stsize = 0;
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/stride.h
--- a/src/m/stride.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/* Definitions file for GNU Emacs running on Stride Micro System-V.2.2
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe, APOLLO and STRIDE
- are the ones defined so far. */
-
-#define m68000 /* because the SGS compiler defines "m68k" */
-#ifndef STRIDE
-#define STRIDE
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* The STRIDE system is more powerful than standard USG5. */
-
-#define SKTPAIR
-
-#define MAIL_USE_FLOCK
-#undef TERMINFO
-#define EXEC_MAGIC 0413
-
-/* USG wins again: Foo! I can't get SIGIO to work properly on the Stride, because I'm
- running a System V variant, and don't have a reliable way to block SIGIO
- signals without losing them. So, I've gone back to non-SIGIO mode, so
- please append this line to the file "stride.h":
- */
-#define BROKEN_SIGIO
-
-/* Specify alignment requirement for start of text and data sections
- in the executable file. */
-
-#define SECTION_ALIGNMENT (getpagesize() - 1)
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sun1.h
--- a/src/m/sun1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/* machine description file for Sun 68000's
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Sun 1, 2 and 3 (-machine=sun1, -machine=sun2, -machine=sun3;
- -opsystem=bsd4-2 or -opsystem=sunos4)
-
- Whether you should use sun1, sun2 or sun3 depends on the
- VERSION OF THE OPERATING SYSTEM
- you have. There are three machine types for different versions of
- SunOS. All are derived from Berkeley 4.2, meaning that you should
- use -opsystem=bsd4-2. Emacs 17 has run on all of them. You will
- need to use sun3 on Sun 2's running SunOS release 3.
-
- For SunOS release 4 on a Sun 3, use -machine=sun3 and
- -opsystem=sunos4. See the file share-lib/SUNBUG for how to solve
- problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END */
-
-/* Say this machine is a 68000 */
-
-#define m68000
-
-/* Sun can't write competent compilers */
-#define COMPILER_REGISTER_BUG
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Must use the system's termcap. It does special things. */
-
-#define LIBS_TERMCAP "-ltermcap"
-
-/* Mask for address bits within a memory segment */
-
-#define SEGMENT_MASK (SEGSIZ - 1)
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sun2.h
--- a/src/m/sun2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/* machine description file for Sun 68000's OPERATING SYSTEM version 2.
- Note that "sun2.h" refers to the operating system version, not the
- CPU model number. See the MACHINES file for details.
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Sun 1, 2 and 3 (-machine=sun1, -machine=sun2, -machine=sun3;
- -opsystem=bsd4-2 or -opsystem=sunos4)
-
- Whether you should use sun1, sun2 or sun3 depends on the
- VERSION OF THE OPERATING SYSTEM
- you have. There are three machine types for different versions of
- SunOS. All are derived from Berkeley 4.2, meaning that you should
- use -opsystem=bsd4-2. Emacs 17 has run on all of them. You will
- need to use sun3 on Sun 2's running SunOS release 3.
-
- For SunOS release 4 on a Sun 3, use -machine=sun3 and
- -opsystem=sunos4. See the file share-lib/SUNBUG for how to solve
- problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END */
-
-/* Say this machine is a 68000 */
-
-#ifndef m68000
-#define m68000
-#endif
-
-/* Sun can't write competent compilers */
-#define COMPILER_REGISTER_BUG
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Say that this is a Sun 2; must check for and maybe reinitialize
- the "sky" board. */
-
-#define sun2
-
-/* Must use the system's termcap. It does special things. */
-
-#define LIBS_TERMCAP "-ltermcap"
-
-/* Mask for address bits within a memory segment */
-
-#define SEGMENT_MASK (SEGSIZ - 1)
-
-/* Arrange to link with sun windows, if requested. */
-/* For details on emacstool and sunfns, see etc/SUN-SUPPORT */
-/* These programs require Sun UNIX 4.2 Release 3.2 or greater */
-
-#ifdef HAVE_SUN_WINDOWS
-#define OTHER_FILES " ${libsrc}emacstool"
-#define LIBS_MACHINE "-lsuntool -lsunwindow -lpixrect"
-#define OBJECTS_MACHINE "sunfns.o"
-#define SYMS_MACHINE syms_of_sunfns ()
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sun3-68881.h
--- a/src/m/sun3-68881.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* sun3-68881.h, for a Sun 3, using the 68881. */
-
-#include "sun3.h"
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Sun with 68881 co-processor (-machine=sun3-68881;
- -opsystem=bsd4-2 or -opsystem=sunos4)
-
- Versions 1, 2, and 3 of the operating system are derived from
- Berkeley 4.2, meaning that you should use -opsystem=bsd4-2.
-
- For SunOS release 4 on a Sun 3 with a 68881, use -machine=sun3-68881
- and -opsystem=sunos4. See the file share-lib/SUNBUG for how to
- solve problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END */
-
-/* In case we are using floating point, work together with crt0.c. */
-
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE "-f68881"
-#endif
-
-#define sun_68881
-#define START_FILES "crt0.o /usr/lib/Mcrt1.o"
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sun3-fpa.h
--- a/src/m/sun3-fpa.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* sun3-fpa.h, for a Sun 3, using the Sun fpa. */
-
-#include "sun3.h"
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Sun with FPA co-processor (-machine=sun3-fpa;
- -opsystem=bsd4-2 or -opsystem=sunos4)
-
- Versions 1, 2, and 3 of the operating system are derived from
- Berkeley 4.2, meaning that you should use -opsystem=bsd4-2.
-
- For SunOS release 4 on a Sun 3 with an FPA, use -machine=sun3-fpa
- and -opsystem=sunos4. See the file share-lib/SUNBUG for how to
- solve problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END */
-
-/* In case we are using floating point, work together with crt0.c. */
-
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE "-ffpa"
-#endif
-
-#define sun_fpa
-#define START_FILES "crt0.o /usr/lib/Wcrt1.o"
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sun3-soft.h
--- a/src/m/sun3-soft.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* sun3-soft.h, for a Sun 3, using the Sun with software floating point. */
-
-#include "sun3.h"
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Sun with software floating point (-machine=sun3-soft;
- -opsystem=bsd4-2 or -opsystem=sunos4)
-
- Versions 1, 2, and 3 of the operating system are derived from
- Berkeley 4.2, meaning that you should use -opsystem=bsd4-2.
-
- If you want to use software floating point on SunOS release 4 on a
- Sun 3, use -machine=sun3-68881 and -opsystem=sunos4. See the file
- share-lib/SUNBUG for how to solve problems caused by bugs in the
- "export" version of SunOS 4.
-NOTE-END */
-
-/* In case we are using floating point, work together with crt0.c. */
-
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE "-fsoft"
-#endif
-
-#define sun_soft
-#define START_FILES "crt0.o /usr/lib/Fcrt1.o"
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sun3.h
--- a/src/m/sun3.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* machine description file for Sun 68000's OPERATING SYSTEM version 3
- (for either 68000 or 68020 systems). */
-
-#include "sun2.h"
-#undef sun2
-#ifndef sun3
-#define sun3
-#endif
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Sun 1, 2 and 3 (-machine=sun1, -machine=sun2, -machine=sun3;
- -opsystem=bsd4-2 or -opsystem=sunos4)
-
- Whether you should use sun1, sun2 or sun3 depends on the
- VERSION OF THE OPERATING SYSTEM
- you have. There are three machine types for different versions of
- SunOS. All are derived from Berkeley 4.2, meaning that you should
- use -opsystem=bsd4-2. Emacs 17 has run on all of them. You will
- need to use sun3 on Sun 2's running SunOS release 3.
-
- For SunOS release 4 on a Sun 3, use -machine=sun3 and
- -opsystem=sunos4. See the file share-lib/SUNBUG for how to solve
- problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END */
-
-/* Say that the text segment of a.out includes the header;
- the header actually occupies the first few bytes of the text segment
- and is counted in hdr.a_text. */
-
-#define A_TEXT_OFFSET(HDR) sizeof (HDR)
-
-/* This is the offset of the executable's text, from the start of the file. */
-
-#define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
-
-/* In case we are using floating point, work together with crt0.c. */
-
-#ifndef __GNUC__
-#define C_SWITCH_MACHINE "-fsoft"
-#endif
-
-/* This line is needed if you are linking with X windows
- and the library xlib was compiled to use the 68881.
- For maximum cleanliness, don't edit this file;
- instead, insert this line in config.h. */
-/* #define START_FILES crt0.o /usr/lib/Mcrt1.o */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/sun386.h
--- a/src/m/sun386.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/* machine description file for Sun's 386-based RoadRunner. This file borrows heavily from
- "sun2.h", but since that file is heavily cpu-specific, it was easier
- not to include it.
-
- Copyright (C) 1988 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
- Use s-sunos4-0.h for operating system version 4.0, and s-sunos4-1.h
- for later versions. See the file share-lib/SUNBUG for how to solve
- problems caused by bugs in the "export" version of SunOS 4.
-NOTE-END */
-
-/* Say this machine is a bird */
-#ifndef roadrunner
-#define roadrunner
-#endif
-
-/* Actual cpu-specific defs */
-#include "intel386.h"
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Underscores are not prepended to C symbols on this machine. */
-#undef LDAV_SYMBOL
-#define LDAV_SYMBOL "avenrun"
-
-/* Must use the system's termcap. It does special things. */
-
-#define LIBS_TERMCAP "-ltermcap"
-
-/* Arrange to link with sun windows, if requested. */
-/* For details on emacstool and sunfns, see etc/SUN-SUPPORT */
-/* These programs require Sun UNIX 4.2 Release 3.2 or greater */
-
-#ifdef HAVE_SUN_WINDOWS
-#define OTHER_FILES " ${etcdir}emacstool"
-#define LIBS_MACHINE "-lsuntool -lsunwindow -lpixrect"
-#define OBJECTS_MACHINE "sunfns.o"
-#define SYMS_MACHINE syms_of_sunfns ()
-#endif
-
-/* Roadrunner uses 'COFF' format */
-#define COFF
-
-/* XEmacs change: from Thomas.Tornblom@nexus.comm.se */
-#ifdef USE_GCC
-#define C_SWITCH_MACHINE "-static -Dmode_t=\"unsigned short\"" /* avoid dynamic linking */
-#define LD_SWITCH_MACHINE "-Wl,-N -static"
-#else
-#define C_SWITCH_MACHINE "-Bstatic -Dmode_t=\"unsigned short\""/* avoid dynamic linking */
-#define LD_SWITCH_MACHINE "-N -Bstatic"
-#endif
-
-/* Get rid of the -e __start that s-sunos4.h does. */
-#undef LD_SWITCH_SYSTEM
-
-/* XEmacs addition? */
-#undef RUN_TIME_REMAP
-#undef UNEXEC
-#define UNEXEC "unexec.o"
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/symmetry.h
--- a/src/m/symmetry.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/* machine description file for SEQUENT SYMMETRY machines
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* CHANGE: [Eric H. Herrin II; eric@ms.uky.edu - 15 Sept 1988]
- * Modified the sequent.h file for the Sequent Symmetry machine.
- * Biggest change was to align the sections in the a.out to 4K
- * boundaries (this is the page size).
- */
-
-
-/* NOTICE: this file works for DYNIX release 3.0.12 on Sequent Symmetry
- * (Intel 80386) machines. Hasn't been tested on anything else.
- */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-3" */
-
-#include "intel386.h"
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE unsigned long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define FSCALE 1000.0
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Name of file the to look in
- for the kernel symbol table (for load average) */
-
-#undef KERNEL_FILE
-#define KERNEL_FILE "/dynix"
-
-/* Avoids a compiler bug */
-
-#define TAHOE_REGISTER_BUG
-
-/* Say that the text segment of a.out includes the header;
- the header actually occupies the first few bytes of the text segment
- and is counted in hdr.a_text. Furthermore, the value written
- in the a_text in the file must have N_ADDRADJ added to it. */
-
-#define A_TEXT_OFFSET(HDR) (sizeof (HDR) + N_ADDRADJ (HDR))
-
-/* This is the offset of the executable's text, from the start of the file. */
-
-#define A_TEXT_SEEK(HDR) (N_TXTOFF (hdr) + sizeof (hdr))
-
-/* The file sections in the Symmetry a.out must be on 4K boundaries.
- */
-#define SEGSIZ 4096
-#define SECTION_ALIGNMENT (SEGSIZ-1)
-
-/* (short) negative-int doesn't sign-extend correctly */
-#define SHORT_CAST_BUG
-
-/* Cause compilations to be done in parallel in ymakefile. */
-#define MAKE_PARALLEL &
-
-/* Define how to search all pty names.
- This is for Dynix 3.0; delete next 5 definitions for older systems. */
-
-#define PTY_MAJOR "pqrstuvwPQRSTUVW"
-#define PTY_MINOR "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-#define PTY_ITERATION \
- register int ma, mi; \
- for (ma = 0; ma < sizeof(PTY_MAJOR) - 1; ma++) \
- for (mi = 0; mi < sizeof(PTY_MINOR) - 1; mi++)
-#define PTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/pty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
-#define PTY_TTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/tty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/tad68k.h
--- a/src/m/tad68k.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-3" */
-
-/* Data type of load average, as read out of kmem. */
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) */
-
-/* SysV has alloca in the PW library */
-
-#define LIB_STANDARD "-lPW -lc"
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-/* #define NO_REMAP */
-
-/* Use Terminfo, not Termcap. */
-
-#define TERMINFO
-
-/* TPIX extras */
-
-#define TPIX /* used in various source files */
-#undef ADDR_CORRECT /* don't need this bug fix */
-#define fchmod /* we don't have fchmod() */
-#define SECTION_ALIGNMENT (2048-1) /* 2k boundaries required in unexec */
-#define SEGMENT_MASK (128*1024-1) /* 128k offsets required in unexec */
-#define C_DEBUG_SWITCH "-O" /* build with -O (TPIX has GCC 1.34) */
-
-#define BROKEN_TIOCGWINSZ /* Don't try to use TIOCGWINSZ. */
-
-/* omit next three lines if no TCP installed */
-
-#if 0 /* XEmacs */
-#define select gnu_select /* avoid select() name clash */
-#endif
-#define LIBS_SYSTEM "-lsocket" /* get TCP networking functions */
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/tahoe.h
--- a/src/m/tahoe.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/* machine description file for tahoe.
- Copyright (C) 1985 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Use -opsystem=bsd4-2 or -opsystem=bsd4-3, depending on the version of
-Berkeley you are running.
-NOTE-END */
-
-/* Say this machine is a tahoe */
-
-#ifndef tahoe
-#define tahoe
-#endif /* not tahoe */
-
-/* crt0.c should use the vax-bsd style of entry, with no dummy args. */
-
-#define CRT0_DUMMIES
-
-/* crt0.c should define a symbol `start' and do .globl with a dot. */
-
-#define DOT_GLOBAL_START
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* This triggers some stuff to avoid a compiler bug */
-
-#define TAHOE_REGISTER_BUG
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/tandem-s2.h
--- a/src/m/tandem-s2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* machine description file for the Tandem Integrity S2. */
-
-#include "mips.h"
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-3" */
-
-/* This overrides some of the usual support for the mips and system V.3. */
-
-/* The operating system apparently defines TIOCGETC
- but it doesn't work. */
-#undef BROKEN_TIOCGETC
-
-/* rs@ai.mit.edu said this was necessary for it to work. However, some
- user of this machine ought to try to get subprocesses to work. */
-#define NO_SUBPROCESSES
-
-/* Correct some library file names. */
-#define START_FILES "pre-crt0.o /usr/lib/crt1.o1.31"
-#define LIB_STANDARD "-lbsd -lc /usr/lib/crtn.o1.31"
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/targon31.h
--- a/src/m/targon31.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/* targon31 machine description file
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-
-/* #define m68k is defined by the Compiler */
-/* #define m68000 */
-
-/* Data type of load average, as read out of kmem. */
-
-/* #define LOAD_AVE_TYPE double */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-/* #define NO_REMAP */
-/* Supposedly NO_REMAP is not needed with the following change. */
-#define SEGMENT_MASK 0xffff
-
-#define SWITCH_ENUM_BUG 1
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/tek4300.h
--- a/src/m/tek4300.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/* machine description file for tek4300.
- Copyright (C) 1988 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="bsd4-3" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically. */
-
-#ifndef tek4300
-#define tek4300
-#endif
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (x)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-
-/* Define C_ALLOCA if this machine does not support a true alloca
- and the one written in C should be used instead. */
-
-#define C_ALLOCA
-
-/* The text segment always starts at a fixed address.
- This way we don't need to have a label _start defined. */
-
-#define TEXT_START 0
-
-/* The Tektronix exec struct for ZMAGIC files is struct zexec */
-
-#define EXEC_HDR_TYPE struct zexec
-
-/* The entry-point label (start of text segment) is `start', not `__start'. */
-
-#define DEFAULT_ENTRY_ADDRESS start
-
-/* Use the system's malloc calls, gmalloc.c won't work for us. */
-
-#define SYSTEM_MALLOC
-
-/* In building xmakefile, "cc -E -g" forcibly reads from stdin. Since we
- can't remove the CFLAGS from that "cc -E" invocation, make sure we
- never pass -g. If you want to debug, remove the following, and fix
- src/Makefile.in so it doesn't pass ${CFLAGS} when creating xmakefile. */
-
-#define C_DEBUG_SWITCH
-
-/* eirik@elf.ithaca.ny.us said this was needed in 19.22. */
-#define NO_MODE_T
-
-/* Formerly "BSD_PGRPS" */
-
-#define SIGIO_REQUIRES_SEPARATE_PROCESS_GROUP
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/tekxd88.h
--- a/src/m/tekxd88.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/* Configuration file for the Tektronix XD88 running UTekV 3.2e,
- contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 1/15/93.
- You probably need to use gnu make (version 3.63 or higher.)
- Copyright (C) 1993 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-#ifndef m88000 /* Some 88k C compilers already define this */
-#define m88000
-#endif
-
-/* Data type of load average, as read out of kmem. */
-/* #define LOAD_AVE_TYPE double */ /* No load average on XD88. */
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-/* #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0)) */
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-#define NO_REMAP
-
-#ifndef __GNUC__
-# define C_OPTIMIZE_SWITCH -O
-#endif /* __GNUC__ */
-
-#undef LIB_X11_LIB /* Don't use shared libraries defined in usg5-3.h */
-#undef LIBX11_SYSTEM
-
-#ifdef ghs /* Stands for "Green Hills Software", defined only in /bin/cc */
-/* -X18 means do not allocate programmer-defined local variables to a
- register unless they are declared register. (Copied from perl-4.036
- Green Hills C hints file. Might be needed for setjmp, I don't know.) */
-# define C_SWITCH_MACHINE "-X18"
-/* We need /lib/default.ld so that /bin/ld can read its link directives. */
-# define LD_SWITCH_SYSTEM "/lib/default.ld"
-#endif /* ghs */
-
-/* We need this to get dumping to work */
-#define KEEP_OLD_TEXT_SCNPTR
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/tower32.h
--- a/src/m/tower32.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/* machine description file for the NCR Tower 32 running System V.2.
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-#define m68000
-
-/* Data type of load average, as read out of kmem. */
-
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) */
-
-/* Change some things to avoid bugs in compiler */
-
-#define SWITCH_ENUM_BUG 1
-
-/* The standard C library is -lcieee, not -lc.
- Also use the PW library, which contains alloca. */
-
-#define LIB_STANDARD "-lPW -lcieee"
-
-/* crt0.c should use the vax-bsd style of entry. Beware that if you have
- OS release 2.00.00 or later, *and* change src/ymakefile so that CFLAGS
- includes C_OPTIMIZE_SWITCH rather than C_DEBUG_SWITCH, you need to
- uncomment CRT0_DUMMIES and C_OPTIMIZE_SWITCH below. */
-
-/* With the optimizer OFF */
-
-#define CRT0_DUMMIES zero, bogus_fp,
-
-/* With the optimizer ON */
-
-/* #define CRT0_DUMMIES */
-/* #define C_OPTIMIZE_SWITCH -O2 */
-
-/* emacs's magic number isn't temacs's;
- temacs is writable text (the default!). */
-
-#include <asld.h>
-#define EXEC_MAGIC AOUT1MAGIC
-#define EXEC_PAGESIZE DATACLICK
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/tower32v3.h
--- a/src/m/tower32v3.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/* machine description file for the NCR Tower 32 running System V.3.
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-3" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-#define m68000
-
-/* Data type of load average, as read out of kmem. */
-
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) */
-
-#ifdef __GNUC__
-#define C_OPTIMIZE_SWITCH "-O -fstrength-reduce -fomit-frame-pointer"
-#define LIB_STANDARD "-lc /lib/crtn.o"
-#else
-/* This section is correct if you do *not* change src/ymakefile so that
- CFLAGS includes C_OPTIMIZE_SWITCH rather than C_DEBUG_SWITCH. */
-#define C_DEBUG_SWITCH "-g -O0"
-#define LIB_STANDARD "-lc -lPW /lib/crtn.o"
-/* This section is correct if you do enable C_OPTIMIZE_SWITCH. */
-/* #define C_OPTIMIZE_SWITCH -O2 */
-/* #define LIB_STANDARD -lc /lib/crtn.o */
-#endif
-
-/* The OS maps the data section far away from the text section. */
-#define NO_REMAP
-#define TEXT_START 0
-#define START_FILES "pre-crt0.o /lib/crt1.o"
-
-/* The OS has an implementation of symlinks that is semantically different
- from BSD, but for some silly reason it partly has the same syntax. */
-#undef S_IFLNK
-
-/* The OS needs stream.h+ptem.h included in sysdep.c. */
-#define NO_SIOCTL_H
-#define NEED_PTEM_H
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/ustation.h
--- a/src/m/ustation.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/* machine description file for U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30).
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-3" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO
- are the ones defined so far. */
-/* Masscomp predefines mc68000. */
-
-#define m68000 mc68000
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#undef NO_REMAP
-
-/* Name of file the to look in
- for the kernel symbol table (for load average) */
-
-#define KERNEL_FILE "/unix"
-
-/* This triggers some stuff to avoid a compiler bug */
-
-#define MASSC_REGISTER_BUG
-
-/* Prevent -lg from being used for debugging. Not implemented? */
-
-#define LIBS_DEBUG
-
-/* -lnet is not standard library */
-
-#undef LIBS_SYSTEM
-
-/* Compiler's bug */
-
-#define SWITCH_ENUM_BUG
-
-/* Termcap is available */
-
-#define LIBS_TERMCAP "-ltermcap"
-
-#define EXEC_PAGESIZE 1024
-
-
-#undef SIGTSTP
-#undef HAVE_TIMEVAL
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/vax.h
--- a/src/m/vax.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/* machine description file for vax.
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-The vax (-machine=vax) runs zillions of different operating systems.
-
-Vax running Berkeley Unix (-opsystem=bsd4-1, -opsystem=bsd4-2 or
- -opsystem=bsd4-3)
-
- Works.
-
-Vax running Ultrix (-opsystem=bsd4-2)
-
- Works. See under Ultrix in share-lib/MACHINES for problems using X
- windows on Ultrix.
-
-Vax running System V rel 2 (-opsystem=usg5-2)
-
- 18.27 Works.
-
-Vax running System V rel 0 (-opsystem=usg5-0)
-
- Works as of 18.36.
-
-Vax running VMS (-opsystem=vms)
-
- 18.36 believed to work. Addition of features is necessary to make
- this Emacs version more usable.
-
-NOTE-END */
-
-/* #define vax -- appears to be done automatically */
-
-/* crt0.c should use the vax-bsd style of entry, with no dummy args. */
-
-#define CRT0_DUMMIES
-
-/* crt0.c should define a symbol `start' and do .globl with a dot. */
-
-#define DOT_GLOBAL_START
-
-#ifdef BSD
-/* USG systems I know of running on Vaxes do not actually
- support the load average, so disable it for them. */
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
-
-#endif /* BSD */
-
-
-/* Vax sysV has alloca in the PW library. */
-
-#ifdef USG
-#define LIB_STANDARD "-lPW -lc"
-
-/* There is some bug in unexec in for usg 5.2 on a vax
- which nobody who runs such a system has yet tracked down. */
-#ifndef USG5_0
-#define NO_REMAP
-#endif /* USG 5_0 */
-
-#define TEXT_START 0
-#endif /* USG */
-
-#ifdef BSD4_2
-#define HAVE_FTIME
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/wicat.h
--- a/src/m/wicat.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/* machine description file for WICAT machines.
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- vax, m68000, ns16000 are the ones defined so far. */
-
-#ifndef m68000
-#define m68000
-#endif
-
-/* This flag is used only in alloca.s. */
-#define WICAT
-
-/* Data type of load average, as read out of kmem. */
-
-#undef LOAD_AVE_TYPE
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#undef LOAD_AVE_CVT
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#undef NO_REMAP
-
-/* For WICAT, define TAHOE_REGISTER_BUG if you have a pre-4.2 C compiler */
-
-#define TAHOE_REGISTER_BUG
-
-/* pagesize definition */
-
-#define EXEC_PAGESIZE 0x1000
-
-/* Delete this for WICAT sys V releases before 2.0. */
-
-#define LIB_STANDARD "-lc-nofp"
-
-/* Special magic number */
-
-#define EXEC_MAGIC MC68ROMAGIC
-
-/* Special switches to give to ld. */
-
-#define LD_SWITCH_MACHINE "-e __start -N"
-
-/*
- * Define optimflags if you want to optimize.
- * - Set to null string for pre-4.2 C compiler
- * - Set to "-O -Wopt,-O-f" for 4.2
- */
-
-#define C_OPTIMIZE_SWITCH /* -O -Wopt,-O-f */
-
-/* For WICAT version supporting PTYs and select (currently internal only) */
-
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER 'q'
-#endif
-
-/* there is a select() in libcurses.a that causes a conflict so use termlib */
-#ifdef HAVE_SELECT
-#undef TERMINFO
-#define LIBS_TERMCAP "select.o -ltermlib"
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/m/xps100.h
--- a/src/m/xps100.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/* xps100.h for the Honeywell XPS100 running UNIX System V.2
- Mark J. Hewitt (mjh@uk.co.kernel)
-
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="usg5-2" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically:
- Ones defined so far include vax, m68000, ns16000, pyramid,
- orion, tahoe, APOLLO and many others */
-
-/* Data type of load average, as read out of kmem. */
-
-/* #define LOAD_AVE_TYPE long */
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-/* #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) */
-
-/* Define NO_REMAP if memory segmentation makes it not work well
- to change the boundary between the text section and data section
- when Emacs is dumped. If you define this, the preloaded Lisp
- code will not be sharable; but that's better than failing completely. */
-
-#define NO_REMAP
-#define TERMINFO
-#define SWITCH_ENUM_BUG
-#define LIB_STANDARD " -lc"
-#define LD_SWITCH_MACHINE "-X"
-#define SECTION_ALIGNMENT (0x3ff)
diff -r 75975fd0b7fc -r aa5ed11f473b src/nsselect.m
--- a/src/nsselect.m Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/* NeXTstep Selection processing for XEmacs
- Copyright (C) 1995 Carl Edman
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not in FSF. */
-
-/* Author: Carl Edman */
diff -r 75975fd0b7fc -r aa5ed11f473b src/process-unix.c
--- a/src/process-unix.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/process-unix.c Wed Nov 18 08:49:14 2009 -0700
@@ -32,10 +32,6 @@
#include <config.h>
-#if !defined (NO_SUBPROCESSES)
-
-/* The entire file is within this conditional */
-
#include "lisp.h"
#include "buffer.h"
@@ -429,22 +425,12 @@
{
int sv[2];
-#ifdef SKTPAIR
- if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv) < 0)
- return -1;
- *outchannel = *inchannel = sv[0];
- *forkout = *forkin = sv[1];
-#else /* not SKTPAIR */
- int temp;
- temp = pipe (sv);
- if (temp < 0) return -1;
+ if (pipe (sv) < 0) return -1;
*inchannel = sv[0];
*forkout = sv[1];
- temp = pipe (sv);
- if (temp < 0) return -1;
+ if (pipe (sv) < 0) return -1;
*outchannel = sv[1];
*forkin = sv[0];
-#endif /* not SKTPAIR */
return 0;
}
@@ -902,10 +888,8 @@
nice (- emacs_priority);
#endif
-#if !defined (NO_SUBPROCESSES)
/* Close Emacs's descriptors that this process should not have. */
close_process_descs ();
-#endif /* not NO_SUBPROCESSES */
close_load_descs ();
/* [[Note that use of alloca is always safe here. It's obvious for systems
@@ -1172,10 +1156,6 @@
process, and I don't feel like messing with
this now. */
- /* There was some weirdo, probably wrong,
- conditionalization on RTU and UNIPLUS here.
- I deleted it. So sue me. */
-
/* SunOS has TIOCSCTTY but the close/open method
also works. */
@@ -1998,18 +1978,6 @@
continue;
}
-#ifdef CONNECT_NEEDS_SLOWED_INTERRUPTS
- /* Slow down polling. Some kernels have a bug which causes retrying
- connect to fail after a connect. (Note that the entire purpose
- for this code is a very old comment concerning an Ultrix bug that
- requires this code. We used to do this ALWAYS despite this!
- This messes up C-g out of connect() in a big way. So instead we
- just assume that anyone who sees such a kernel bug will define
- this constant, which for now is only defined under Ultrix.) --ben
- */
- slow_down_interrupts ();
-#endif
-
loop:
/* A system call interrupted with a SIGALRM or SIGIO comes back
@@ -2017,14 +1985,8 @@
SETJMP (break_system_call_jump);
if (QUITP)
{
-#ifdef CONNECT_NEEDS_SLOWED_INTERRUPTS
- speed_up_interrupts ();
-#endif
QUIT;
/* In case something really weird happens ... */
-#ifdef CONNECT_NEEDS_SLOWED_INTERRUPTS
- slow_down_interrupts ();
-#endif
}
/* Break out of connect with a signal (it isn't otherwise possible).
@@ -2066,11 +2028,6 @@
failed_connect = 1;
retry_close (s);
s = -1;
-
-#ifdef CONNECT_NEEDS_SLOWED_INTERRUPTS
- speed_up_interrupts ();
-#endif
-
continue;
}
@@ -2097,10 +2054,6 @@
#endif /* USE_GETADDRINFO */
} /* address loop */
-#ifdef CONNECT_NEEDS_SLOWED_INTERRUPTS
- speed_up_interrupts ();
-#endif
-
#ifdef USE_GETADDRINFO
freeaddrinfo (res);
#endif
@@ -2239,10 +2192,6 @@
instead of 'sendto'. Consequently, we 'connect' this socket. */
/* See open-network-stream-internal for comments on this part of the code */
-#ifdef CONNECT_NEEDS_SLOWED_INTERRUPTS
- slow_down_interrupts ();
-#endif
-
loop:
/* A system call interrupted with a SIGALRM or SIGIO comes back
@@ -2250,14 +2199,8 @@
SETJMP (break_system_call_jump);
if (QUITP)
{
-#ifdef CONNECT_NEEDS_SLOWED_INTERRUPTS
- speed_up_interrupts ();
-#endif
QUIT;
/* In case something really weird happens ... */
-#ifdef CONNECT_NEEDS_SLOWED_INTERRUPTS
- slow_down_interrupts ();
-#endif
}
/* Break out of connect with a signal (it isn't otherwise possible).
@@ -2288,19 +2231,12 @@
retry_close (rs);
retry_close (ws);
-#ifdef CONNECT_NEEDS_SLOWED_INTERRUPTS
- speed_up_interrupts ();
-#endif
errno = xerrno;
report_network_error ("error connecting socket", list3 (Qunbound, name,
port));
}
-#ifdef CONNECT_NEEDS_SLOWED_INTERRUPTS
- speed_up_interrupts ();
-#endif
-
/* scope */
if (setsockopt (ws, IPPROTO_IP, IP_MULTICAST_TTL,
&thettl, sizeof (thettl)) < 0)
@@ -2361,5 +2297,3 @@
{
Fprovide (intern ("unix-processes"));
}
-
-#endif /* !defined (NO_SUBPROCESSES) */
diff -r 75975fd0b7fc -r aa5ed11f473b src/process.c
--- a/src/process.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/process.c Wed Nov 18 08:49:14 2009 -0700
@@ -35,10 +35,6 @@
#include <config.h>
-#if defined (NO_SUBPROCESSES)
-#error "We don't support this anymore."
-#endif
-
#include "lisp.h"
#include "buffer.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/process.h
--- a/src/process.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/process.h Wed Nov 18 08:49:14 2009 -0700
@@ -22,20 +22,6 @@
#ifndef INCLUDED_process_h_
#define INCLUDED_process_h_
-#if defined (NO_SUBPROCESSES)
-#undef XPROCESS
-#undef CHECK_PROCESS
-#define PROCESSP(x) 0
-#define PROCESS_LIVE_P(x) 0
-#define Fprocess_status(x) Qnil
-#define Fget_process(x) Qnil
-#define Fget_buffer_process(x) Qnil
-#define kill_buffer_processes(x) 0
-#define close_process_descs() 0
-#define init_xemacs_process() 0
-
-#else /* not NO_SUBPROCESSES */
-
BEGIN_C_DECLS
/* struct Lisp_Process is defined in procimpl.h; only process-*.c need
@@ -122,8 +108,6 @@
END_C_DECLS
-#endif /* not NO_SUBPROCESSES */
-
/* The name of the file open to get a null file, or a data sink.
MS-DOS, and OS/2 redefine this. */
#ifndef NULL_DEVICE
diff -r 75975fd0b7fc -r aa5ed11f473b src/regex.c
--- a/src/regex.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/regex.c Wed Nov 18 08:49:14 2009 -0700
@@ -172,13 +172,6 @@
# define gettext(msgid) (msgid)
#endif
-/* Under XEmacs, this is needed because we don't define it elsewhere. */
-#ifdef SWITCH_ENUM_BUG
-#define SWITCH_ENUM_CAST(x) ((int)(x))
-#else
-#define SWITCH_ENUM_CAST(x) (x)
-#endif
-
/* Get the interface, including the syntax bits. */
#include "regex.h"
@@ -3764,7 +3757,7 @@
/* We should never be about to go beyond the end of the pattern. */
assert (p < pend);
- switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++))
+ switch ((re_opcode_t) *p++)
{
/* I guess the idea here is to simply not bother with a fastmap
@@ -5232,7 +5225,7 @@
}
/* Otherwise match next pattern command. */
- switch (SWITCH_ENUM_CAST ((re_opcode_t) *p++))
+ switch ((re_opcode_t) *p++)
{
/* Ignore these. Used to ignore the n of succeed_n's which
currently have n == 0. */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/3700.h
--- a/src/s/3700.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/386-ix.h
--- a/src/s/386-ix.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* Interactive 386/ix. */
-
-#include "usg5-3.h"
-
-#define BROKEN_TIOCGETC
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/386bsd.h
--- a/src/s/386bsd.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* s/ file for 386bsd system. */
-
-/* Get most of the stuff from bsd4.3 */
-#include "bsd4-3.h"
-
-#undef LIB_STANDARD
-#define LIB_STANDARD "-lc $(GNULIB_VAR)"
-
-/* The following should be set to /netbsd if you are running netbsd > 0.8
- Or just link /netbsd -> /386bsd */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/386bsd"
-
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-
-#define LIBS_DEBUG
-
-/* For mem-limits.h. */
-#define BSD4_2
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/aix3-1.h
--- a/src/s/aix3-1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-/* Definitions file for XEmacs running on IBM AIX version 3.1
- Copyright (C) 1985, 1986, 1990 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG /* System III, System V, etc */
-#define USG5
-
-/* Specify IBM AIX version of system */
-
-#ifndef AIX
-#define AIX
-#endif
-
-/* turn off c prototypes */
-/* XEmacs change: XEmacs compiles fine with prototypes under AIX, dkeller@vnet.ibm.com
-#ifndef _NO_PROTO
-#define _NO_PROTO
-#endif
-*/
-
-/* This symbol should be defined on AIX Version 3 ??????? */
-#ifndef _AIX
-#define _AIX
-#endif
-
-/* Specify "_BSD" to invoke Berkeley compatibility in header files */
-/*#ifndef _BSD
-#define _BSD
-#endif
-*/
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "aix"
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* The file containing the kernel's symbol table is called /unix. */
-
-#define KERNEL_FILE "/unix"
-
-/* The symbol in the kernel where the load average is found
- is named avenrun. */
-
-#define LDAV_SYMBOL "avenrun"
-/* Special itemss needed to make Emacs run on this system. */
-
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch. Thus the system call
- must be retried in these cases. To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
-/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
-
-/* #define ADDR_CORRECT(x) (x) */
-
-#ifndef __GNUC__
-#define LINKER "cc"
-#endif
-
-/* Prevent -lg from being used for debugging. Not needed. */
-
-#define LIBS_DEBUG
-
-/* No need to specify -lc when linking. */
-
-#define LIB_STANDARD
-
-/* Use terminfo instead of termcap. */
-
-#define TERMINFO
-
-/* The following definition seems to be needed in AIX version 3.1.6.8.
- It may not have been needed in certain earlier versions. */
-#define HAVE_TCATTR
-
-#define SYSTEM_MALLOC
-
-/* AIX doesn't define this. */
-#define unix 1
-
-/* AIX 3.1 has the HFT features. */
-#define AIXHFT
-
-/* For unexaix.c. */
-#define ALIGN_DATA_RELOC
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/aix3-2-5.h
--- a/src/s/aix3-2-5.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-/* s- file for building Emacs on AIX 3.2.5. */
-
-/* Synched up with: FSF 19.31. */
-
-#include "aix3-2.h"
-
-/* For AIX, it turns out compiling emacs under AIX 3.2.4 REQUIRES "cc -g"
- because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because
- "cc -g" crashes. Go figure. --floppy@merlin.mit.edu */
-#ifndef __GNUC__
-#undef C_DEBUG_SWITCH
-#undef C_OPTIMIZE_SWITCH
-#define C_DEBUG_SWITCH
-#define C_OPTIMIZE_SWITCH "-O"
-#endif
-
-#define MAIL_USE_LOCKF
-
-/* XEmacs: from dkeller@VNET.IBM.COM */
-#define BROKEN_SIGIO
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/aix3-2.h
--- a/src/s/aix3-2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* s- file for building Emacs on AIX 3.2. */
-
-#include "aix3-1.h"
-
-#define AIX3_2
-
-/* No need to define this--the header files indicate X11R4,
- and that's supposedly what 3.2 will come with. */
-#undef SPECIFY_X11R4
-
-#ifndef __GNUC__
-/* Some programs in src produce warnings saying certain subprograms
- are to comples and need a MAXMEM value greater than 2000 for
- additional optimization. --nils@exp-math.uni-essen.de */
-/* XEmacs change: maxmem=-1 means unlimited. Suggested by
- dkeller@VNET.IBM.COM */
-#if 0 /* mrb */
-#define C_SWITCH_SYSTEM "-ma -qmaxmem=-1"
-#endif /* mrb */
-#else
-/* Otherwise, XEmacs is just too big ... */
-#define C_SWITCH_SYSTEM "-mminimal-toc"
-#endif
-
-#define HAVE_ALLOCA
-/* Adrian Colley <Adrian.Colley@three.serpentine.com> says this is needed. */
-#ifndef NOT_C_CODE
-#ifndef AIX4
- #pragma alloca
-#endif
-#endif
-
-/* With this defined, a gcc-compiled Emacs crashed in realloc under AIX
- 3.2, and a cc-compiled Emacs works with this undefined.
- --karl@cs.umb.edu. */
-#undef SYSTEM_MALLOC
-
-/* For AIX, it turns out compiling emacs under AIX 3.2.4 REQUIRES "cc -g"
- because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because
- "cc -g" crashes. Go figure. --floppy@merlin.mit.edu */
-/* XEmacs change: no evidence of this in XEmacs */
-#if 0
-#ifndef __GNUC__
-#define C_SWITCH_DEBUG "-g"
-#define C_SWITCH_OPTIMIZE
-#endif
-#endif
-
-/* The character-composition stuff is broken in X11R5.
- Even with XIMStatusNothing aliased to XIMStatusNone,
- tranle@intellicorp.com (Minh Tran-Le) reports that enabling
- the internationalization code causes the modifier keys C, M and Shift
- to beep after a mouse click. */
-#define X11R5_INHIBIT_I18N
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/aix4-1.h
--- a/src/s/aix4-1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#define AIX4_1
-
-#include "aix4.h"
-
-#ifdef __GNUC__
-#undef _NO_PROTO
-#endif
-
-/* For AIX, it turns out compiling emacs under AIX 3.2.4 REQUIRES "cc -g"
- because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because
- "cc -g" crashes. Go figure. --floppy@merlin.mit.edu.
- 4.1 seems to need -g again. -- larry@vaquita.mitra.com. */
-/* David Edelsohn <dje@watson.ibm.com> says that this actually depends
- on the version of XLC, which can't be predicted from the system version.
- What a mess! */
-#ifndef __GNUC__
-#undef C_DEBUG_SWITCH
-#undef C_OPTIMIZE_SWITCH
-#define C_DEBUG_SWITCH "-g"
-#endif
-
-/* The X internationalization stuff is still broken in AIX 4.1, so
- don't #undef X11R5_INHIBIT_I18N
- It still causes shift, ctrl, and alt to resend the last character,
- if it was a control character like tab, enter, backspace, or ESC.
- Bill_Mann @ PraxisInt.com */
-/* #undef X11R5_INHIBIT_I18N */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/aix4-2.h
--- a/src/s/aix4-2.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/s/aix4-2.h Wed Nov 18 08:49:14 2009 -0700
@@ -1,4 +1,172 @@
-#include "aix4-1.h"
+/* Definitions file for XEmacs running on IBM AIX version 4.2
+ * Copyright (C) 1985, 1986, 1990 Free Software Foundation, Inc.
+ *
+ * This file is part of XEmacs.
+ *
+ * XEmacs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * XEmacs is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with XEmacs; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA. */
+
+/* Synched up with: FSF 19.31. */
+
+/*
+ * Define symbols to identify the version of Unix this is.
+ * Define all the symbols that apply correctly.
+ */
+
+#define USG /* System III, System V, etc */
+#define USG5
+
+/* Specify IBM AIX version of system */
+
+#ifndef AIX
+#define AIX
+#define AIX4
+#define AIX4_1
+#endif
+
+/* This symbol should be defined on AIX Version 3 ??????? */
+#ifndef _AIX
+#define _AIX
+#endif
+
+/* SYSTEM_TYPE should indicate the kind of system you are using.
+ * It sets the Lisp variable system-type. */
+
+#define SYSTEM_TYPE "aix"
+
+/* The file containing the kernel's symbol table is called /unix. */
+
+#define KERNEL_FILE "/unix"
+
+/* The symbol in the kernel where the load average is found
+ * is named avenrun. */
+
+#define LDAV_SYMBOL "avenrun"
+
+/* Special itemss needed to make Emacs run on this system. */
+
+/* On USG systems the system calls are interruptible by signals
+ * that the user program has elected to catch. Thus the system call
+ * must be retried in these cases. To handle this without massive
+ * changes in the source code, we remap the standard system call names
+ * to names for our own functions in sysdep.c that do the system call
+ * with retries. */
+
+#define INTERRUPTIBLE_OPEN
+#define INTERRUPTIBLE_IO
+
+#ifndef __GNUC__
+#define LINKER "cc"
+#endif
+
+/* Prevent -lg from being used for debugging. Not needed. */
+
+#define LIBS_DEBUG
+
+/* No need to specify -lc when linking. */
+
+#define LIB_STANDARD
+
+/* Use terminfo instead of termcap. */
+
+#define TERMINFO
-#undef ALIGN_DATA_RELOC
+/* AIX doesn't define this. */
+#define unix 1
+
+#ifndef __GNUC__
+/* Otherwise, XEmacs is just too big ... */
+#define C_SWITCH_SYSTEM "-mminimal-toc"
+#endif
+
+#define HAVE_ALLOCA
+
+/* FIXME: This was needed for AIX 4.1. Is it for AIX 4.2? */
+/* The character-composition stuff is broken in X11R5.
+ * Even with XIMStatusNothing aliased to XIMStatusNone,
+ * tranle@intellicorp.com (Minh Tran-Le) reports that enabling
+ * the internationalization code causes the modifier keys C, M and Shift
+ * to beep after a mouse click. */
+#define X11R5_INHIBIT_I18N
+
+/* For AIX, it turns out compiling emacs under AIX 3.2.4 REQUIRES "cc -g"
+ * because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because
+ * "cc -g" crashes. Go figure. --floppy@merlin.mit.edu */
+#ifndef __GNUC__
+#undef C_DEBUG_SWITCH
+#undef C_OPTIMIZE_SWITCH
+#define C_DEBUG_SWITCH
+#define C_OPTIMIZE_SWITCH "-O"
+#endif
+
+#define MAIL_USE_LOCKF
+
+/* XEmacs: from dkeller@VNET.IBM.COM */
+#define BROKEN_SIGIO
+
+#ifndef NOT_C_CODE
+#define _XFUNCS_H_ 1
+
+/* #### we don't use either any more. some AIX user should delete the include
+ * and see if anything breaks. --ben */
+/* AIX is happier when bzero and strcasecmp are declared */
+#include "strings.h"
+/* Forward declarations for xlc warning suppressions */
+struct ether_addr;
+struct sockaddr_dl;
+
+#ifdef __xlC__ /* "eXceLlent C compiler" ?! */
+#if __xlC__ >= 1200
+/* IBM's C compiler option `-O3' is too aggressive.
+ * We recommend instead the combination `-O3 -qstrict', which seems safe.
+ *
+ * cc -O3 miscompiles at least two functions. From IBM's docs:
+ *
+ * IBM> -qstrict turns off the following optimizations:
+ *
+ * IBM> Performing code motion and scheduling on computations such as loads
+ * IBM> and floating-point computations that may trigger an exception.
+ *
+ * Nevertheless, we try to work with these compiler options. */
+#pragma option_override (bytecount_to_charcount, "opt(strict,yes)")
+#pragma option_override (Fexpand_file_name, "opt(strict,yes)")
+#endif /* recent IBM C compiler */
+#endif /* IBM's C compiler */
+
+#endif /* C code */
+
+/* getaddrinfo is broken in AIX 4.3 as per IY04165.
+ * At this time (2/21/2000), there's no PTF available.
+ * -- Mike Sperber <mike@xemacs.org> */
+
+#undef HAVE_GETADDRINFO
+
+#ifdef __GNUC__
+#undef _NO_PROTO
+#endif
+
+/* For AIX, it turns out compiling emacs under AIX 3.2.4 REQUIRES "cc -g"
+ * because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because
+ * "cc -g" crashes. Go figure. --floppy@merlin.mit.edu.
+ * 4.1 seems to need -g again. -- larry@vaquita.mitra.com. */
+/* David Edelsohn <dje@watson.ibm.com> says that this actually depends
+ * on the version of XLC, which can't be predicted from the system version.
+ * What a mess! */
+#ifndef __GNUC__
+#undef C_DEBUG_SWITCH
+#undef C_OPTIMIZE_SWITCH
+#define C_DEBUG_SWITCH "-g"
+#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/aix4.h
--- a/src/s/aix4.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#define AIX4
-
-#include "aix3-2-5.h"
-
-/* AIX 4 does not have HFT any more. */
-#undef AIXHFT
-
-#ifndef NOT_C_CODE
-#define _XFUNCS_H_ 1
-
-/* #### we don't use either any more. some AIX user should delete the include
- and see if anything breaks. --ben */
-/* AIX is happier when bzero and strcasecmp are declared */
-#include "strings.h"
-
-/* Forward declarations for xlc warning suppressions */
-struct ether_addr;
-struct sockaddr_dl;
-
-#ifdef __xlC__ /* "eXceLlent C compiler" ?! */
-#if __xlC__ >= 1200
-/* IBM's C compiler option `-O3' is too aggressive.
- We recommend instead the combination `-O3 -qstrict', which seems safe.
-
- cc -O3 miscompiles at least two functions. From IBM's docs:
-
- IBM> -qstrict turns off the following optimizations:
-
- IBM> Performing code motion and scheduling on computations such as loads
- IBM> and floating-point computations that may trigger an exception.
-
- Nevertheless, we try to work with these compiler options. */
-#pragma option_override (bytecount_to_charcount, "opt(strict,yes)")
-#pragma option_override (Fexpand_file_name, "opt(strict,yes)")
-#endif /* recent IBM C compiler */
-#endif /* IBM's C compiler */
-
-#endif /* C code */
-
-/* getaddrinfo is broken in AIX 4.3 as per IY04165.
- At this time (2/21/2000), there's no PTF available.
- -- Mike Sperber <mike@xemacs.org> */
-
-#undef HAVE_GETADDRINFO
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/alliant-2800.h
--- a/src/s/alliant-2800.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/alliant.h
--- a/src/s/alliant.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/altos.h
--- a/src/s/altos.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/amdahl.h
--- a/src/s/amdahl.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/bsd386.h
--- a/src/s/bsd386.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* s/ file for bsd386 system. */
-
-#include "bsd4-3.h"
-
-#ifndef __bsdi__
-#define __bsdi__ 1
-#endif
-
-#define DECLARE_GETPWUID_WITH_UID_T
-
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-#define A_TEXT_OFFSET(x) (sizeof (struct exec))
-#define A_TEXT_SEEK(hdr) (N_TXTOFF(hdr) + A_TEXT_OFFSET(hdr))
-
-#define LIBS_DEBUG
-#define LIBS_SYSTEM "-lutil -lcompat"
-
-/* This silences a few compilation warnings. */
-#ifndef NOT_C_CODE
-#undef BSD
-#include <sys/param.h> /* To get BSD defined consistently. */
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/bsd4-1.h
--- a/src/s/bsd4-1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/* Definitions file for XEmacs running on bsd 4.1.
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define BSD4_1
-
-#define BSD
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "berkeley-unix"
-
-/* First pty name is /dev/ptyp0. */
-
-#define FIRST_PTY_LETTER 'p'
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* The file containing the kernel's symbol table is called /vmunix. */
-
-#define KERNEL_FILE "/vmunix"
-
-/* The symbol in the kernel where the load average is found
- is named _avenrun. */
-
-#define LDAV_SYMBOL "_avenrun"
-
-/* Special hacks needed to make Emacs run on this system. */
-
-#define lstat stat
-
-/* sys_open handles the necessary 4.2 features for open. */
-
-#define ENCAPSULATE_OPEN
-
-/* Names of flags for open. */
-#define O_RDONLY 0
-#define O_WRONLY 1
-#define O_RDWR 2
-#define O_EXCL 2000
-#define O_CREAT 1000
-
-/* Special library needed for linking for 4.1. */
-#define LIBS_SYSTEM "-ljobs"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/bsd4-2.h
--- a/src/s/bsd4-2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/* Definitions file for XEmacs running on bsd 4.2
- Copyright (C) 1985, 1986, 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#ifndef BSD4_2
-#define BSD4_2 1
-#endif /* BSD4_2 */
-
-#ifndef BSD
-#define BSD_WAS_DEFINED
-#define BSD 42
-#endif /* BSD */
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "berkeley-unix"
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* The file containing the kernel's symbol table is called /vmunix. */
-
-#define KERNEL_FILE "/vmunix"
-
-/* The symbol in the kernel where the load average is found
- is named _avenrun. */
-
-#define LDAV_SYMBOL "_avenrun"
-
-/* Formerly "BSD_PGRPS" */
-
-#define SIGIO_REQUIRES_SEPARATE_PROCESS_GROUP
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/bsd4-3.h
--- a/src/s/bsd4-3.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/s/bsd4-3.h Wed Nov 18 08:49:14 2009 -0700
@@ -1,5 +1,5 @@
/* Definitions file for XEmacs running on bsd 4.3
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+ Copyright (C) 1985, 1986, 1994 Free Software Foundation, Inc.
This file is part of XEmacs.
@@ -20,9 +20,23 @@
/* Synched up with: FSF 19.31. */
-#include "bsd4-2.h"
+#ifndef BSD
+#define BSD 43
+#endif /* BSD */
+
+/* SYSTEM_TYPE should indicate the kind of system you are using.
+ * It sets the Lisp variable system-type. */
+
+#define SYSTEM_TYPE "berkeley-unix"
-#undef BSD4_2
+/* The file containing the kernel's symbol table is called /vmunix. */
+
+#define KERNEL_FILE "/vmunix"
+
+/* The symbol in the kernel where the load average is found
+ * is named _avenrun. */
+
+#define LDAV_SYMBOL "_avenrun"
/* We give these symbols the numeric values found in <sys/param.h> to
avoid warnings about redefined macros. */
@@ -30,21 +44,9 @@
#define BSD4_3 1
#endif /* BSD4_3 */
-#ifdef BSD_WAS_DEFINED
-#undef BSD
-#endif
-
-#ifndef BSD
-#define BSD 43
-#endif /* BSD */
-
/* define MAIL_USE_FLOCK if the mailer uses flock
to interlock access to /usr/spool/mail/$USER.
The alternative is that a lock file named
/usr/spool/mail/$USER.lock. */
#define MAIL_USE_FLOCK
-
-/* Apparently not needed any more? */
-
-#undef SIGIO_REQUIRES_SEPARATE_PROCESS_GROUP
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/bsdos2-1.h
--- a/src/s/bsdos2-1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#include "bsdos2.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/bsdos2.h
--- a/src/s/bsdos2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* s/ file for BSDI BSD/OS 2.x system. */
-
-#include "bsd386.h"
-
-/* mrb was here */
-
-#define ORDINARY_LINK
-
-#if 0
-#define START_FILES "pre-crt0.o /usr/lib/crt0.o"
-#endif
-
-#define TEXT_START 0x1020 /* for QMAGIC */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/bsdos3.h
--- a/src/s/bsdos3.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-/* Synched up with: not in FSF. */
-
-/* s/ file for BSDI BSD/OS 3.0 system. */
-
-/* unlike BSD/OS 2.1, 3.0 does not require -lipc */
-#include "bsdos2.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/bsdos4.h
--- a/src/s/bsdos4.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#include "bsdos3.h"
-
-/* BSD/OS seems to have switched to ELF format for executables. */
-#ifdef __ELF__
-
-#undef ORDINARY_LINK
-#define ORDINARY_LINK 1
-#define UNEXEC unexelf.o
-
-#endif /* ELF */
-
-/* The declaration for openpty is missing. Where is libutil.h? */
-#ifndef NOT_C_CODE
-struct termios;
-struct winsize;
-int openpty (int *, int *, char *, struct termios *, struct winsize *);
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/cxux.h
--- a/src/s/cxux.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/* Header file for Harris CXUX.
- Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG5
-#define USG
-
-#ifndef _CX_UX
-#define _CX_UX 1
-#endif
-
-/* Define this symbol if you are running CX/UX 7.0 or later (7.0 introduced
- * support for ELF files, and while we still build emacs in COFF format, the
- * way it is linked is different for 7.0).
- */
-/* #define USING_CX_UX_7 */
-
-#ifdef USING_CX_UX_7
-#define LINKER "/usr/sde/coff/usr/bin/ld"
-#define LD_SWITCH_SYSTEM "-L/usr/sde/coff/usr/lib -zzero_word"
-#define START_FILES "pre-crt0.o /usr/sde/coff/usr/lib/crt0.o /usr/sde/coff/usr/lib/m88100.o"
-#else /* !USING_CX_UX_7 */
-#ifdef _M88K
-#define START_FILES "pre-crt0.o /lib/crt0.o"
-#else
-#define START_FILES "cxux-crt0.o /lib/crt0.o"
-#endif
-#endif /* USING_CX_UX_7 */
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "usg-unix-v"
-
-#define C_SWITCH_SYSTEM "-Xa"
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'a' means it is /dev/ptya0 */
-
-#define FIRST_PTY_LETTER 'A'
-#define PTY_ITERATION for (c = 'A'; c <= 'P'; c++) for (i = 0; i < 16; i++)
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-#define COFF
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-#define MAIL_USE_FLOCK
-
-
-/* The symbol in the kernel where the load average is found
- is named _avenrun. */
-
-#define LDAV_SYMBOL "_avenrun"
-
-#define KERNEL_FILE "/unix"
-
-/* There are too many kludges required to redefine malloc - use the system
- one */
-#define SYSTEM_MALLOC
-
-/* const really does work, but I can't get configure to run the C compiler
- * with the right options so it figures that out.
- */
-#undef const
-
-/*
- * <pwd.h> already declares getpwuid, and with a uid_t argument in ANSI C
- * mode. Define this so xrdb.c will compile
- */
-#ifdef __STDC__
-#define DECLARE_GETPWUID_WITH_UID_T
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/cxux7.h
--- a/src/s/cxux7.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* Define this symbol if you are running CX/UX 7.0 or later (7.0 introduced
- * support for ELF files, and while we still build emacs in COFF format, the
- * way it is linked is different for 7.0).
- */
-#define USING_CX_UX_7
-
-#include "cxux.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/decosf1-2.h
--- a/src/s/decosf1-2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-#define OSF1
-
-#ifndef NOT_C_CODE
-#include <sys/param.h>
-#endif
-
-#include "bsd4-3.h"
-
-/* Identify OSF1 for the m- files. */
-
-
-
-/* Define _BSD to tell the include files we're running under
- the BSD universe and not the SYSV universe. */
-
-#ifdef __GNUC__
-#define C_SWITCH_SYSTEM "-D_BSD"
-#else
-#define C_SWITCH_SYSTEM "-std -D_BSD"
-#endif
-#define LIBS_SYSTEM "-lbsd"
-#define SYSTEM_MALLOC
-
-/* This to get rid of the -X that ymakefile inserts */
-#undef LD_SWITCH_SYSTEM
-#define LD_SWITCH_SYSTEM
-
-/* XEmacs change */
-#define GMALLOC_NEEDS_SBRK_DECL
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/decosf1-3.h
--- a/src/s/decosf1-3.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-#include "decosf1-2.h"
-
-/* Supposedly gmalloc and rel_alloc will work now
- (grunwald@foobar.cs.colorado.edu) */
-#undef SYSTEM_MALLOC
-#undef NO_REMAP
-
-#define _NO_MALLOC_WARNING_
-
-#ifdef NOT_C_CODE
-
-#undef LD_SWITCH_SYSTEM
-#define LD_SWITCH_SYSTEM
-
-#undef LD_SWITCH_SHARED
-#define LD_SWITCH_SHARED "-shared"
-#endif /* NOT_C_CODE */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/decosf3-1.h
--- a/src/s/decosf3-1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-#include "decosf1-3.h"
-
-/* It seems that read() and write() are affected, but not open() and
- close() */
-
-#define INTERRUPTIBLE_IO
-
-/* XEmacs change from "Andrew G. Cohen, 617-353-6051" <cohen@andy.bu.edu> */
-
-/* XEmacs: moved the following four declarations from decosf3-2.h, as
- suggested by srivasta@pilgrim.umass.edu (Manoj Srivastava) */
-
-/* apparently this breaks things under OSF 3.2 */
-#undef GMALLOC_NEEDS_SBRK_DECL
-
-/* XEmacs: from Stephen Carney <carney@gvc.dec.com> */
-
-/* #### why the hell is configure so broken on this system? */
-#ifndef HAVE_SELECT
-#define HAVE_SELECT 1
-#endif
-
-#define BROKEN_SIGIO
-
-#ifndef TERMINFO
-#define TERMINFO
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/decosf3-2.h
--- a/src/s/decosf3-2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-#include "decosf3-1.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/decosf4-0.h
--- a/src/s/decosf4-0.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-#include "decosf3-2.h"
-
-/* etext and edata are only available when compiling in non-ANSI mode,
- while _etext and _edata are always available, hence more portable.
- This allows `configure --compiler=cc --cflags=-std1' to work. */
-#define etext _etext
-#define edata _edata
-
-#ifndef NOT_C_CODE
-#include "sys/lc_core.h"
-#include "reg_types.h"
-#endif /* C code */
-
-#define re_compile_pattern sys_re_compile_pattern
-#define re_search sys_re_search
-#define re_search_2 sys_re_search_2
-#define re_match_2 sys_re_match_2
-#define re_max_failures sys_re_max_failures
-#define re_set_syntax sys_re_set_syntax
-#define re_set_registers sys_re_set_registers
-#define re_compile_fastmap sys_re_compile_fastmap
-#define re_match sys_re_match
-#define regcomp sys_regcomp
-#define regexec sys_regexec
-#define regerror sys_regerror
-#define regfree sys_regfree
-#define regex_t sys_regex_t
-#define regoff_t sys_regoff_t
-#define regmatch_t sys_regmatch_t
-
-#undef C_SWITCH_SYSTEM
-#undef LIBS_SYSTEM
-#undef LIBS_DEBUG
-/* #define ORDINARY_LINK */
-
-#undef SYSTEM_MALLOC
-
-#if 0 /* martin */
-/* Some V4.0* versions before V4.0B don't detect rename properly. */
-#ifndef HAVE_RENAME
-#define HAVE_RENAME
-#endif
-
-#define LIBS_DEBUG
-#endif /* 0 */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/dgux.h
--- a/src/s/dgux.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,241 +0,0 @@
-/* Definitions file for XEmacs running on Data General's DG/UX
- version 4.32 upto and including 5.4.1.
- Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-/* #define UNIPLUS */
-/* #define USG5 */
-/* #define USG */
-/* #define HPUX */
-/* #define UMAX */
-/* #define BSD4_1 */
-#define BSD4_2
-#define BSD4_3
-#define BSD4_4
-#define BSD
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "dgux"
-
-/* XEmacs: There is apparently a bug in DGUX involving a SIGTTOU getting
- sent to the process if a background write is attempted when we're
- started under a job-control shell, if we turn on FASYNC (which we
- do when SIGIO is working). So don't use SIGIO. */
-#define BROKEN_SIGIO
-
-/*
- * Define HAVE_UNIX_DOMAIN if the system supports Unix
- * domain sockets.
- */
-
-#define HAVE_UNIX_DOMAIN
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF".
-
- DGUX can use either COFF or ELF; the default is ELF.
- To compile for COFF (or BCS) use the TARGET_BINARY_INTERFACE
- environment variable. */
-
-#if defined(_DGUXCOFF_TARGET) || defined(_DGUXBCS_TARGET)
-#undef ELF
-#ifndef COFF
-#define COFF
-#endif /* COFF */
-#else /* defined(_DGUXCOFF_TARGET) || defined(_DGUXBCS_TARGET) */
-#undef COFF
-#ifndef ELF
-#define ELF
-#endif /* ELF */
-#endif /* defined(_DGUXCOFF_TARGET) || defined(_DGUXBCS_TARGET) */
-
-#ifndef COFF /* People will probably find this apparently unreliable
- till the NFS dumping bug is fixed. */
-
-/* It is possible to undump to ELF with DG/UX 5.4, but for revisions below
- 5.4.1 the undump MUST be done on a local file system, or the kernel will
- panic. ELF executables have the advantage of using shared libraries,
- while COFF executables will still work on 4.2x systems. */
-
-#define UNEXEC "unexelf.o"
-
-/* This makes sure that all segments in the executable are undumped,
- not just text, data, and bss. In the case of Mxdb and shared
- libraries, additional information is stored in other sections.
- It does not hurt to have this defined if you don't use Mxdb or
- shared libraries. In fact, it makes no difference. */
-
-/* Necessary for shared libraries and Mxdb debugging information. */
-#define USG_SHARED_LIBRARIES
-#endif
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* Define a replacement for the baud rate switch, since DG/UX uses a different
- from BSD. */
-
-#define BAUD_CONVERT { 0, 110, 134, 150, 300, 600, 1200, 1800, 2400, \
- 4800, 9600, 19200, 38400 }
-
-/*
- * Make WM Interface Compliant.
- */
-
-#define XICCC
-
-
-/* DG/UX SPECIFIC ADDITIONS TO TEMPLATE FOLLOW: */
-
-/* Use the Berkeley flavors of the library routines, instead of System V. */
-
-#define setpgrp(pid, pgrp) setpgrp2 (pid, pgrp)
-#define getpgrp(pid) getpgrp2 (pid)
-
-/* Use TERMINFO instead of termcap */
-
-#define TERMINFO
-
-/*
- * Use a Berkeley style sys/wait.h.
- * This makes WIF* macros operate on structures instead of ints.
- */
-
-#define _BSD_WAIT_FLAVOR
-
-/* #define SYSTEM_MALLOC */
-
-/* MAKING_MAKEFILE must be defined in "ymakefile" before including config.h */
-#ifndef NOT_C_CODE
-
-/* Define this if you use System 5 Release 4 Streams */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_CLOSE
-/* can't hurt to define these, even though read/write should auto restart */
-#define INTERRUPTIBLE_IO
-
-#endif /* not NOT_C_CODE */
-
-#ifndef __GNUC__
-#error You must use GCC to compile Emacs on DGUX
-#endif
-
-#define ORDINARY_LINK
-#define START_FILES "pre-crt0.o"
-#define LIB_GCC "/usr/lib/gcc/libgcc.a"
-
-#ifdef _M88KBCS_TARGET
-/* Karl Berry says: the environment
- recommended by gcc (88/open, a.k.a. m88kbcs) doesn't support some system
- functions, and gcc doesn't make it easy to switch environments. */
-#define NO_GET_LOAD_AVG
-#endif
-
-/* definitions for xmakefile production */
-#ifdef COFF
-
-/* Define the following to use all of the available pty's. */
-
-#define PTY_ITERATION \
- for (c = 'p'; c < 't'; c++) \
- for (i = 0; (((c == 'p') && (i < 64)) || ((c != 'p') && (i < 16))); i++)
-
-#define PTY_NAME_SPRINTF \
- if (c == 'p') \
- sprintf (pty_name, "/dev/pty%c%d", c, i); \
- else \
- sprintf (pty_name, "/dev/pty%c%x", c, i);
-
-#define PTY_TTY_NAME_SPRINTF \
- if (c == 'p') \
- sprintf (pty_name, "/dev/tty%c%d", c, i); \
- else \
- sprintf (pty_name, "/dev/tty%c%x", c, i);
-
-#define C_DEBUG_SWITCH "-g"
-
-#else /* not COFF */
-
-/* We are generating ELF object format. This makes the system more
- SVR4 like. */
-
-#define SVR4
-
-/* Pseudo-terminal support under SVR4 only loops to deal with errors. */
-
-#define PTY_ITERATION for (i = 0; i < 1; i++)
-
-/* This sets the name of the master side of the PTY. */
-
-#define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx");
-
-/* This sets the name of the slave side of the PTY. On SysVr4,
- grantpt(3) forks a subprocess, so keep sigchld_handler() from
- intercepting that death. If any child but grantpt's should die
- within, it should be caught after EMACS_UNBLOCK_SIGNAL. */
-
-#define PTY_TTY_NAME_SPRINTF \
- { \
- char *ptyname; \
- \
- EMACS_BLOCK_SIGCHLD; \
- if (grantpt (fd) == -1) \
- { close (fd); return -1; } \
- EMACS_UNBLOCK_SIGCHLD; \
- if (unlockpt (fd) == -1) \
- { close (fd); return -1; } \
- if (!(ptyname = ptsname (fd))) \
- { close (fd); return -1; } \
- strncpy (pty_name, ptyname, sizeof (pty_name)); \
- pty_name[sizeof (pty_name) - 1] = 0; \
- }
-
-/* Push various streams modules onto a PTY channel. */
-
-#define SETUP_SLAVE_PTY \
- if (ioctl (xforkin, I_PUSH, "ptem") == -1) \
- fatal ("ioctl I_PUSH ptem", errno); \
- if (ioctl (xforkin, I_PUSH, "ldterm") == -1) \
- fatal ("ioctl I_PUSH ldterm", errno); \
- if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \
- fatal ("ioctl I_PUSH ttcompat", errno);
-
-#ifdef __GNUC__
-#define C_DEBUG_SWITCH "-g -V2 -mversion-03.00 -mstandard"
-#endif
-
-#endif /* ELF */
-
-/* Formerly "BSD_PGRPS" */
-
-#define SIGIO_REQUIRES_SEPARATE_PROCESS_GROUP
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/dgux5-4r2.h
--- a/src/s/dgux5-4r2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/* Definitions file for XEmacs running on Data General's DG/UX
- 5.4 Release 2.xx systems.
- Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-#include "dgux.h"
-
-/* In DGUX 5.4R2.xx the function inet_addr() returns a `struct
- in_addr' instead of the more common `unsigned long'.
- -pmr@pajato.com */
-
-#define HAVE_BROKEN_INET_ADDR
-
-#if 0 /* Shawn M. Carey <smcarey@mailbox.syr.edu> found this
- caused trouble on DGUX 5.4.2. */
-#define LIBS_SYSTEM "-ldgc"
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/dgux5-4r3.h
--- a/src/s/dgux5-4r3.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/* Definitions file for XEmacs running on Data General's DG/UX
- version 5.4 Release 3.00 and above.
- Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* NOTE: DGUX5.4R3.00 will not build with the delivered gcc-2.4.5
- compiler. You must upgraded to at least gcc-2.5.8. If you are
- running DGUX 5.4R3.00 check on the system dg-rtp.dg.com:/pub/gnu
- for gcc-2.5.8 or later compiler.
- -pmr@pajato.com */
-
-#include "dgux5-4r2.h"
-
-/* DGUX 5.4R3.00 brought the definition of `struct inet_addr' into
- compliance with the majority of Unix systems. The workaround
- introduced in 5.4R2 is no longer necessary. */
-
-#ifdef HAVE_BROKEN_INET_ADDR
-#undef HAVE_BROKEN_INET_ADDR
-#endif
-
-/* Under DGUX 5.4R3.00, getting a debuggable executable has been
- greatly simplified and applies to either COFF or ELF
- environments. */
-
-#ifdef C_DEBUG_SWITCH
-#undef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH "-g"
-#endif
-
-/* Define the following to avoid conflicts resulting from the fact
- that conflicting baud rate definitions occur when loading both
- termio.h and termios.h, which is unavoidable because of the need to
- load curses.h. */
-#define _POSIX_BAUD_RATE_FLAVOR
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/dgux5-4r4.h
--- a/src/s/dgux5-4r4.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/* Definitions file for XEmacs running on Data General's DG/UX
- version 5.4 Release 4.00 and above.
- Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-#include "dgux5-4r3.h"
-
-/* wait() is better off not operating as a struct. Things go a bit pear. */
-#undef _BSD_WAIT_FLAVOR
-
-/* Some things won't compile for me with these (in dgux.h): */
-#undef setpgrp
-/*#undef getpgrp*/
-
-/* Symbols missing - I suspect this is the culprit... */
-#define LIBS_SYSTEM "-lsocket -lnsl -lelf -lgen"
-
-/* Prevent use of a (non-existent) debugging library. */
-#define LIBS_DEBUG
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/domain.h
--- a/src/s/domain.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "bsd4-3.h"
-
-/* Inhibit using -X, which is the default. */
-#define LD_SWITCH_SYSTEM
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/esix.h
--- a/src/s/esix.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* Definitions for ESIX, a variant of v.5.3 for the 386. */
-/* These are based on reports for ESIX 5.3.2 D. */
-
-#include "usg5-3.h"
-
-/* Have -lg be used for debugging. */
-#undef LIBS_DEBUG
-#define LIBS_DEBUG "-lg"
-
-/* If using Roell's X server, define X11R4 */
-#ifdef X11R4 /* Roell's X server */
-#if 0 /* XEmacs */
-#define select sys_select /* Emacs select() not good enough? */
-#endif
-#endif /* X11R4 */
-
-/* ESIX does not need <sys/sioctl.h>, but needs <sys/ptem.h> */
-#define NO_SIOCTL_H
-#define NEED_PTEM_H
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/esix5r4.h
--- a/src/s/esix5r4.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* Definitions for ESIX System V 4.0.4, a variant of V.4 for the 386. */
-/* Redone by zircon!joe@uunet.uu.net (Joe Kelsey). */
-
-#include "usg5-4.h"
-
-#define SYSTEM_MALLOC 1
-#if defined (HAVE_XFREE386)
-# undef LIB_STANDARD
-# define LIB_STANDARD "-lc"
-#else
-# undef LIB_STANDARD
-# ifdef ORDINARY_LINK
-# define LIB_STANDARD "-lnsl -lns -lelf /usr/ucblib/libucb.a"
-# else
-# define LIB_STANDARD "-lnsl -lns -lelf /usr/ucblib/libucb.a /usr/ccs/lib/crtn.o"
-# endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/ewsux5r4.h
--- a/src/s/ewsux5r4.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/* Synched up with: Mule 2.0. Not in FSF. */
-
-/* Definitions file for XEmacs running on NEC's EWS-UX/V(Rel4.2)
- (System V Release 4.2) */
-
-#include "usg5-4-2.h"
-
-#ifndef nec_ews
-#define nec_ews
-#endif
-#ifndef nec_ews_svr4
-#define nec_ews_svr4
-#endif
-
-#define XOS_NEEDS_TIME_H
-#define HAVE_CLOCK
-
-#ifdef __STDC__
-#define MKDIR_PROTOTYPE int mkdir(char *dpath, mode_t dmode)
-#endif
-
-#ifndef __GNUC__
-#define C_DEBUG_SWITCH "-O -KOlimit=2000 -ZXNd=5000"
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/hpux.h
--- a/src/s/hpux.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-/* Definitions file for XEmacs running on HPUX release 7.0.
- Based on AT&T System V.2.
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG /* System III, System V, etc */
-
-#define USG5
-
-#define HPUX
-
-/* XEmacs change: HPUX_PRE_8_0 needs to be defined for HP-UX 7.X and
- earlier. DO NOT UNCOMMENT THE FOLLOWING IF HP-UX 8.0 OR LATER IS
- BEING USED; HPUX_PRE_8_0 will be automatically #undef'd later, if
- necessary. */
-#define HPUX_PRE_8_0
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "hpux"
-
-/* `nomultiplejobs' should be defined if your system's shell
- does not have "job control" (the ability to stop a program,
- run some other program, then continue the first one).
-
- On hpux this depends on the precise kind of machine in use,
- so the m- file defines this symbol if appropriate. */
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */
-
-#define FIRST_PTY_LETTER 'p'
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* The file containing the kernel's symbol table is called /hp-ux. */
-
-#define KERNEL_FILE "/hp-ux"
-
-/* The symbol in the kernel where the load average is found
- depends on the cpu type, so we let the m- files define LDAV_SYMBOL. */
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch. Thus the system call
- must be retried in these cases. To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-/* XEmacs change */
-#define INTERRUPTIBLE_CLOSE
-
-/* Use the system provided termcap(3) library */
-#define TERMINFO
-
-/* The 48-bit versions are more winning for Emacs;
- the ordinary ones don't give even 32 bits. */
-#define random lrand48
-#define srandom srand48
-
-/* In hpux, the symbol SIGIO is defined, but the feature
- doesn't work in the way Emacs needs it to.
-
- XEmacs change: XEmacs has patches Darryl Okhahata (?) submitted to
- the FSF which allow interrupt input in emacs. */
-
-/* #define BROKEN_SIGIO */
-
-/* USG systems tend to put everything declared static
- into the initialized data area, which becomes pure after dumping Emacs.
- Foil this by defining NO_REMAP, which makes the purespace not pure.
- (Formerly this was avoided by doing '#define static' but this just
- fails with inline functions.) */
-
-#ifndef DONT_DEFINE_NO_REMAP
-#define NO_REMAP
-#endif
-
-/* Define extra libraries to load.
- This should have -lBSD, but that library is said to make
- `signal' fail to work. */
-
-#ifdef HPUX_NET
-#define LIBS_SYSTEM "-ln"
-#else
-#define LIBS_SYSTEM
-#endif
-
-/* Some additional system facilities exist. */
-
-/* XEmacs change */
-/* #define HAVE_PERROR */ /* Delete this line for version 6. */
-
-/* The following maps shared exec file to demand loaded exec.
- Don't do this as demand loaded exec is broken in hpux. */
-
-#if 0
-
-/* Adjust a header field for the executable file about to be dumped. */
-
-#define ADJUST_EXEC_HEADER \
- hdr.a_magic = ((ohdr.a_magic.file_type == OLDMAGIC.file_type) ? \
- NEWMAGIC : ohdr.a_magic);
-
-#endif
-
-/* Baud-rate values in tty status have nonstandard meanings. */
-
-#define BAUD_CONVERT \
-{ 0, 50, 75, 110, 135, 150, 200, 300, 600, 900, 1200, \
- 1800, 2400, 3600, 4800, 7200, 9600, 19200, 38400 }
-
-/* This is needed for HPUX version 6.2; it may not be needed for 6.2.1. */
-#define SHORT_CAST_BUG
-
-/* This is how to get the device name of the tty end of a pty. */
-#define PTY_TTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/pty/tty%c%x", c, i);
-
-/* This is how to get the device name of the control end of a pty. */
-#define PTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/ptym/pty%c%x", c, i);
-
-/* This triggers a conditional in xfaces.c. */
-#define XOS_NEEDS_TIME_H
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/hpux10-shr.h
--- a/src/s/hpux10-shr.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* For building XEmacs under HPUX 10.0 with dynamic libraries. */
-
-#define ORDINARY_LINK
-
-/* XEmacs change */
-/* Only support for hp9000s300 currently */
-#if !defined(__hp9000s300)
-#define HPUX_USE_SHLIBS
-#endif /* !hp9000s300 */
-
-/* XEmacs: */
-/* Don't tell the linker to link statically */
-#ifdef NOT_C_CODE
-#define START_FILES
-#define LINKER "$(CC)"
-#endif /* THIS IS YMAKEFILE */
-
-/* get call to brk() when rerunning XEmacs */
-#define RUN_TIME_REMAP
-
-#include "hpux10.h"
-
-/* We must turn off -g since it forces -static. */
-#ifdef __GNUC__
-#undef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/hpux10.h
--- a/src/s/hpux10.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* System description file for hpux version 10. */
-
-#include "hpux9-shr.h"
-
-/* We have to go this route, rather than hpux9's approach of renaming the
- functions via macros. The system's stdlib.h has fully prototyped
- declarations, which yields a conflicting definition of srand48; it
- tries to redeclare what was once srandom to be srand48. So we go
- with HAVE_LRAND48 being defined. */
-#undef srandom
-#undef srand48
-#undef HAVE_RANDOM
-#define HPUX10
-/* AlainF 20-Jul-1996 -- fixes for 10.10, untested for 10.0x */
-/* Fix kernel file name for 10.10 */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/stand/vmunix"
-
-/* XEmacs: -lcurses includes a broken select() call on some 10.X systems. */
-#undef LIBS_TERMCAP
-#define LIBS_TERMCAP "-ltermcap"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/hpux11-shr.h
--- a/src/s/hpux11-shr.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/s/hpux11-shr.h Wed Nov 18 08:49:14 2009 -0700
@@ -1,14 +1,11 @@
/* Synched up with: FSF 19.31. */
-/* For building XEmacs under HPUX 10.0 with dynamic libraries. */
+/* For building XEmacs under HPUX 11.0 with dynamic libraries. */
#define ORDINARY_LINK
/* XEmacs change */
-/* Only support for hp9000s300 currently */
-#if !defined(__hp9000s300)
#define HPUX_USE_SHLIBS
-#endif /* !hp9000s300 */
/* XEmacs: */
/* Don't tell the linker to link statically */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/hpux11.h
--- a/src/s/hpux11.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/s/hpux11.h Wed Nov 18 08:49:14 2009 -0700
@@ -1,8 +1,133 @@
+/* Definitions file for XEmacs running on HPUX release 11.0.
+ * Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+ *
+ * This file is part of XEmacs.
+ *
+ * XEmacs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * XEmacs is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with XEmacs; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA. */
+
/* Synched up with: FSF 19.31. */
-/* System description file for hpux version 11. */
+/* Only support for hp9000s800 currently */
+
+#define ORDINARY_LINK
+
+/* XEmacs: */
+/* Don't tell the linker to link statically */
+#ifdef NOT_C_CODE
+#define START_FILES
+#define LINKER "$(CC)"
+#endif /* THIS IS YMAKEFILE */
+
+/* get call to brk() when rerunning XEmacs */
+/* #ifndef USE_GCC */
+#define RUN_TIME_REMAP
+/* #endif */
+
+#define USG /* System III, System V, etc */
+
+#define USG5
+
+#define HPUX
+
+/* SYSTEM_TYPE should indicate the kind of system you are using.
+ * It sets the Lisp variable system-type. */
+
+#define SYSTEM_TYPE "hpux"
+
+/* `nomultiplejobs' should be defined if your system's shell
+ * does not have "job control" (the ability to stop a program,
+ * run some other program, then continue the first one).
+ *
+ * On hpux this depends on the precise kind of machine in use,
+ * so the m- file defines this symbol if appropriate. */
+
+/* Letter to use in finding device name of first pty,
+ * if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */
+
+#define FIRST_PTY_LETTER 'p'
+
+/* The symbol in the kernel where the load average is found
+ * depends on the cpu type, so we let the m- files define LDAV_SYMBOL. */
+
+/* Special hacks needed to make Emacs run on this system. */
+
+/* On USG systems the system calls are interruptible by signals
+ * that the user program has elected to catch. Thus the system call
+ * must be retried in these cases. To handle this without massive
+ * changes in the source code, we remap the standard system call names
+ * to names for our own functions in sysdep.c that do the system call
+ * with retries. */
-#include "hpux9-shr.h"
+#define INTERRUPTIBLE_OPEN
+#define INTERRUPTIBLE_IO
+/* XEmacs change */
+#define INTERRUPTIBLE_CLOSE
+
+/* Use the system provided termcap(3) library */
+#define TERMINFO
+
+/* The 48-bit versions are more winning for Emacs;
+ * the ordinary ones don't give even 32 bits. */
+#define random lrand48
+#define srandom srand48
+
+/* Define extra libraries to load.
+ * This should have -lBSD, but that library is said to make
+ * `signal' fail to work. */
+
+#ifdef HPUX_NET
+#define LIBS_SYSTEM "-ln"
+#else
+#define LIBS_SYSTEM
+#endif
+
+/* Some additional system facilities exist. */
+
+/* Baud-rate values in tty status have nonstandard meanings. */
+
+#define BAUD_CONVERT \
+{ 0, 50, 75, 110, 135, 150, 200, 300, 600, 900, 1200, \
+ 1800, 2400, 3600, 4800, 7200, 9600, 19200, 38400 }
+
+/* This is how to get the device name of the tty end of a pty. */
+#define PTY_TTY_NAME_SPRINTF \
+ sprintf (pty_name, "/dev/pty/tty%c%x", c, i);
+
+/* This is how to get the device name of the control end of a pty. */
+#define PTY_NAME_SPRINTF \
+ sprintf (pty_name, "/dev/ptym/pty%c%x", c, i);
+
+#ifdef HPUX_USE_SHLIBS
+#define LD_SWITCH_SYSTEM
+#else
+#define LD_SWITCH_SYSTEM "-Xlinker -a -Xlinker archive"
+#endif
+
+#ifndef __GNUC__
+/* Make room for enough symbols, so dispnew.c does not fail. */
+/* XEmacs: cognot@ensg.u-nancy.fr: C_SWITCH_SYSTEM already defined in hpux8.h,
+ * -D_BSD makes hp CC choke on process.c
+ * #define C_SWITCH_SYSTEM "-Wp,-H200000 -D_BSD"
+ * */
+#undef C_SWITCH_SYSTEM
+#define C_SWITCH_SYSTEM "-Aa -D_HPUX_SOURCE"
+#endif
+
+/* mrb */
+#undef LD_SWITCH_SYSTEM
/* We have to go this route, rather than hpux9's approach of renaming the
functions via macros. The system's stdlib.h has fully prototyped
@@ -12,13 +137,8 @@
#undef srandom
#undef srand48
#undef HAVE_RANDOM
-#define HPUX10
#define HPUX11
+
/* AlainF 20-Jul-1996 -- fixes for 10.10, untested for 10.0x */
/* Fix kernel file name for 10.10 and later */
-#undef KERNEL_FILE
#define KERNEL_FILE "/stand/vmunix"
-
-/* XEmacs: -lcurses includes a broken select() call on some 10.X systems. */
-/* #undef LIBS_TERMCAP */
-/* #define LIBS_TERMCAP "-ltermcap" */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/hpux8-shr.h
--- a/src/s/hpux8-shr.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-/* For building XEmacs under HPUX 8.0 with dynamic libraries. */
-
-/* Don't tell the linker to link statically */
-#ifdef NOT_C_CODE
-/* now done in hpux8.h */
-/* #define LD_SWITCH_SYSTEM -L/usr/lib/X11R4 -L/usr/lib/Motif1.1 */
-#ifdef __GNUC__
-#define LIB_STANDARD
-#endif
-#endif /* THIS IS YMAKEFILE */
-
-/* get call to brk() when rerunning XEmacs */
-#define RUN_TIME_REMAP
-
-#define HPUX_USE_SHLIBS
-
-#include "hpux8.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/hpux8.h
--- a/src/s/hpux8.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* system description file for hpux version 8.
- This contains changes that were suggested "for the hp700".
- They were not needed for the 800.
- Our conjecture that they are needed for hpux version 8,
- which is what runs on the 700. */
-
-/* XEmacs change -- suggested by hamish@bnr.ca */
-#define DONT_DEFINE_NO_REMAP /* `static' hack not needed */
-
-#include "hpux.h"
-
-#define HPUX8
-
-/* XEmacs change -- suggested by hamish@bnr.ca */
-#undef HPUX_PRE_8_0
-
-/* XEmacs change -- Ugly, nasty kludge to prevent X11R4 Xos.h from
- redefining struct timeval and struct timezone. */
-#define __TIMEVAL__
-
-/* Don't use shared libraries. unexec doesn't handle them.
- Note GCC automatically passes -a archive to ld, and it has its own
- conflicting -a. */
-#ifdef __GNUC__
-/* No need to specify roundabout way of linking temacs. */
-#define ORDINARY_LINK
-
-#ifdef HPUX_USE_SHLIBS
-#define LD_SWITCH_SYSTEM
-#else
-#define LD_SWITCH_SYSTEM "-Xlinker -a -Xlinker archive"
-#endif
-
-#else /* not __GNUC__ */
-
-#if (defined(hp9000s700) || defined(__hp9000s700))
-#ifdef HPUX_USE_SHLIBS
-#define LD_SWITCH_SYSTEM "-L/lib/pa1.1"
-#else
-#define LD_SWITCH_SYSTEM "-a archive -L/lib/pa1.1"
-#endif
-#else /* not (defined(hp9000s700) || defined(__hp9000s700)) */
-#ifdef HPUX_USE_SHLIBS
-#define LD_SWITCH_SYSTEM
-#else
-#define LD_SWITCH_SYSTEM "-a archive"
-#endif
-#endif /* not (defined(hp9000s700) || defined(__hp9000s700)) */
-
-#endif /* not __GNUC__ */
-
-/* XEmacs change */
-#ifndef __GNUC__
-#define C_SWITCH_SYSTEM "-Aa -D_HPUX_SOURCE"
-#endif
-
-/* Some hpux 8 machines seem to have TIOCGWINSZ,
- and none have sioctl.h, so might as well define this. */
-#define NO_SIOCTL_H
-
-#if 0 /* autoconf should be detecting the presence or absence of
- random and srandom now. */
-/* If you use X11R4 you must define this. If you use
- X11R5 you must comment this out */
-/* #define HAVE_RANDOM */
-#define random foo_random
-#define srandom foo_srandom
-#endif
-
-#if 0 /* This seems to be spurious. */
-/* "X11R5" on hpux8 doesn't have this function, which is supposed to exist
- in X11R5. Maybe things will work if we just don't call it. */
-#define NO_XRM_SET_DATABASE
-#endif
-
-/* Enable a special hack in XTread_socket. */
-/* XEmacs change: we don't use this. */
-#if 0
-#define X_IO_BUG
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/hpux9-shr.h
--- a/src/s/hpux9-shr.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* For building XEmacs under HPUX 9.0 with dynamic libraries. */
-
-#define ORDINARY_LINK
-
-/* XEmacs change */
-/* Only support for hp9000s700 currently */
-#if !defined(__hp9000s300)
-/* #ifndef USE_GCC */
-#define HPUX_USE_SHLIBS
-/* #endif */
-#endif /* !hp9000s300 */
-
-/* XEmacs: */
-/* Don't tell the linker to link statically */
-#ifdef NOT_C_CODE
-#define START_FILES
-#define LINKER "$(CC)"
-#endif /* THIS IS YMAKEFILE */
-
-/* get call to brk() when rerunning XEmacs */
-/* #ifndef USE_GCC */
-#define RUN_TIME_REMAP
-/* #endif */
-
-#include "hpux9.h"
-
-#if 0 /* No longer needed, since in current GCC -g no longer does that. */
-/* We must turn off -g since it forces -static. */
-#ifdef __GNUC__
-#undef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH
-#endif
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/hpux9-x11r4.h
--- a/src/s/hpux9-x11r4.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#include "hpux9.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/hpux9.h
--- a/src/s/hpux9.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* System description file for hpux version 9. */
-
-#include "hpux8.h"
-
-#define HPUX9
-
-/* If Emacs doesn't seem to work when built to use GNU malloc, you
- probably need to get the latest patches to the HP/UX compiler.
- See `etc/MACHINES' for more information. */
-#if 0
-#define SYSTEM_MALLOC 1
-#undef GNU_MALLOC
-#undef REL_ALLOC
-#endif
-
-/* cc1: warning: `-g' not supported by this configuration of GCC
- #### Still needs to be fixed in a more general way... */
-#if 0
-#ifdef __GNUC__
-#undef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH
-#endif
-#endif
-
-#ifndef __GNUC__
-/* Make room for enough symbols, so dispnew.c does not fail. */
-/* XEmacs: cognot@ensg.u-nancy.fr: C_SWITCH_SYSTEM already defined in hpux8.h,
- -D_BSD makes hp CC choke on process.c
-#define C_SWITCH_SYSTEM "-Wp,-H200000 -D_BSD"
-*/
-#undef C_SWITCH_SYSTEM
-#ifdef __hp9000s300
-#define C_SWITCH_SYSTEM "-Aa -D_HPUX_SOURCE"
-#else
-#define C_SWITCH_SYSTEM "-Ae -Wp,-H100000 +Olibcalls"
-#endif
-/* XEmacs: commented out
-#else
-#define C_SWITCH_SYSTEM "-D_BSD"
-*/
-#endif
-
-/* XEmacs: apparently rint() is totally broken in HPUX 9. */
-#undef HAVE_RINT
-
-/* XEmacs: avoid using -lcurses, to make the binary portable from 9.X to 10.X */
-#undef LIBS_TERMCAP
-#define LIBS_TERMCAP "-ltermcap"
-
-/* mrb */
-#undef LD_SWITCH_SYSTEM
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/hpux9shxr4.h
--- a/src/s/hpux9shxr4.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#include "hpux9-shr.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/iris3-5.h
--- a/src/s/iris3-5.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/* Definitions file for XEmacs running on Silicon Graphics 3.5
- Copyright (C) 1987 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG
-#define USG5
-#define IRIS
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "irix"
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'a' means it is /dev/ptya0 */
-
-#define FIRST_PTY_LETTER 'a'
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-#define MAIL_USE_FLOCK
-
-/* The file containing the kernel's symbol table is called /vmunix. */
-
-#define KERNEL_FILE "/vmunix"
-
-/* The symbol in the kernel where the load average is found
- is named _avenrun. */
-
-#define LDAV_SYMBOL "_avenrun"
-
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/* The IRIS defines SIGIO in signal.h, but doesn't implement it. */
-#define BROKEN_SIGIO
-
-#define LIBS_MACHINE "-lbsd -ldbm -lPW"
-#define C_SWITCH_MACHINE "-I/usr/include/bsd"
-
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch. Thus the system call
- must be retried in these cases. To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
-/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
-
-#define ADDR_CORRECT(x) (int)((char *)(x) - (char*)0)
-
-/* some errno.h's don't actually allocate the variable itself */
-
-#define NEED_ERRNO
-
-/* This is how to get the device name of the tty end of a pty. */
-#define PTY_TTY_NAME_SPRINTF \
- sprintf (ptyname, "/dev/ttyq%d", minor (stb.st_rdev));
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/iris3-6.h
--- a/src/s/iris3-6.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/* Definitions file for XEmacs running on Silicon Graphics system 3.6.
- Copyright (C) 1987 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG
-#define USG5
-#define IRIS
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "irix"
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'a' means it is /dev/ptya0 */
-
-#define FIRST_PTY_LETTER 'a'
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-#define MAIL_USE_FLOCK
-
-/* The file containing the kernel's symbol table is called /vmunix. */
-
-#define KERNEL_FILE "/vmunix"
-
-/* The symbol in the kernel where the load average is found
- is named _avenrun. */
-
-#define LDAV_SYMBOL "_avenrun"
-
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/* The IRIS defines SIGIO in signal.h, but doesn't implement it. */
-#define BROKEN_SIGIO
-
-#define LIBS_MACHINE "-lbsd -ldbm -lPW"
-#define C_SWITCH_MACHINE "-I/usr/include/bsd"
-
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch. Thus the system call
- must be retried in these cases. To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
-/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
-
-#define ADDR_CORRECT(x) (int)((char *)(x) - (char*)0)
-
-/* some errno.h's don't actually allocate the variable itself */
-
-#define NEED_ERRNO
-
-/* This is how to get the device name of the tty end of a pty. */
-#define PTY_TTY_NAME_SPRINTF \
- sprintf (ptyname, "/dev/ttyq%d", minor (stb.st_rdev));
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/irix3-3.h
--- a/src/s/irix3-3.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/* Definitions file for XEmacs running on Silicon Graphics Irix system 3.3.
- Copyright (C) 1987,1990 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG
-#define USG5
-#define IRIS
-#ifndef IRIX
-#define IRIX
-#endif
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "irix"
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'a' means it is /dev/ptya0 */
-
-#define FIRST_PTY_LETTER 'a'
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-#define MAIL_USE_FLOCK
-
-/* The file containing the kernel's symbol table is called /unix. */
-
-#define KERNEL_FILE "/unix"
-
-/* The symbol in the kernel where the load average is found
- is named _avenrun. */
-
-#define LDAV_SYMBOL "avenrun"
-
-
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch. Thus the system call
- must be retried in these cases. To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
-/* XEmacs change -- SGI apparently has a bogus version of memmove,
- which causes ralloc.c great pain. However, bcopy works, so use that.
- From Paul Flinders <ptf@delcam.co.uk>
- (Resist the temptation to put parens around the args in the expansion.
- Existence is suffering.)
- */
-#define memmove(to, from, len) bcopy (from, to, len)
-
-/* This is how to get the device name of the tty end of a pty. */
-#define PTY_TTY_NAME_SPRINTF \
- sprintf (ptyname, "/dev/ttyq%d", minor (stb.st_rdev));
-
-
-/* sioctl.h should be included where appropriate. */
-
-#define NEED_SIOCTL
-
-
-/* This was formerly in LIBS_MACHINE in iris4d.h,
- but it is not needed for newer system versions. */
-#define LIBS_SYSTEM "-lsun"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/irix4-0.h
--- a/src/s/irix4-0.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "irix3-3.h"
-
-#define USG5_3
-#define IRIX4
-
-#undef NEED_SIOCTL
-
-/* use K&R C */
-/* XEmacs change -- use ANSI, not K&R */
-#ifndef __GNUC__
-#define C_SWITCH_SYSTEM "-xansi"
-#endif
-
-/* SGI has all the fancy wait stuff, but we can't include sys/wait.h
- because it defines BIG_ENDIAN and LITTLE_ENDIAN (ugh!.) Instead
- we'll just define WNOHANG right here.
- (An implicit decl is good enough for wait3.) */
-/* [XEmacs: Now that we don't use BIG_ENDIAN/LITTLE_ENDIAN, it's safe
- to include wait.h. Should something change here?] */
-
-#define WNOHANG 0x1
-
-/* jpff@maths.bath.ac.uk reports `struct exception' is not defined
- on this system, so inhibit use of matherr. */
-#define NO_MATHERR
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/irix5-0.h
--- a/src/s/irix5-0.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "usg5-4.h"
-
-#define IRIX5
-
-#ifdef LIBS_SYSTEM
-#undef LIBS_SYSTEM
-#endif
-
-#ifdef LIB_STANDARD
-#undef LIB_STANDARD
-#endif
-
-#ifdef SYSTEM_TYPE
-#undef SYSTEM_TYPE
-#endif
-#define SYSTEM_TYPE "irix"
-
-#ifdef SETUP_SLAVE_PTY
-#undef SETUP_SLAVE_PTY
-#endif
-
-/* jpff@maths.bath.ac.uk reports `struct exception' is not defined
- on this system, so inhibit use of matherr. */
-#define NO_MATHERR
-
-/* Ulimit(UL_GMEMLIM) is busted... */
-#define ULIMIT_BREAK_VALUE 0x14000000
-
-/* Tell process_send_signal to use VSUSP instead of VSWTCH. */
-#define PREFER_VSUSP
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-#define MAIL_USE_FLOCK
-
-/* use K&R C */
-/* XEmacs change -- use ANSI, not K&R */
-#ifndef __GNUC__
-#define C_SWITCH_SYSTEM "-xansi"
-#endif
-
-/* jackr@engr.sgi.com says that you can't mix different kinds of
- signal-handling functions under IRIX 5.3. I'm going to assume
- that that was the reason this got broken. Now that the
- signal routines are fixed up, maybe this will work. --ben */
-/* Nope, it doesn't. I've tried lots of things; it must be
- genuinely broken. */
-/* XEmacs addition: People on IRIX 5.2 and IRIX 5.3 systems have
- reported that they can't break out of (while t) using C-g or C-G.
- This does not occur on other systems, so let's assume that SIGIO
- is broken on these systems. */
-#define BROKEN_SIGIO
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/irix5-1.h
--- a/src/s/irix5-1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-/* by Hayden Schultz <haydens@ll.mit.edu> for XEmacs */
-
-#ifndef IRIX5_1_H
-#define IRIX5_1_H
-
-#include "irix5-0.h"
-
-/* #### Questionable defines. */
-#define IRIX
-#define IRIS
-
-/* XEmacs change */
-#if 0
-#define LD_SWITCH_SYSTEM "-elf -_SYSTYPE_SVR4 -require_dynamic_link _rld_new_interface -no_unresolved -Wx,-G 0 -L. -L./lwlib -g0 -call_shared -transitive_link"
-#endif
-
-/* By Tor Arntsen <tor@spacetec.no> for XEmacs.
- With the following kludge the above LD_SWITCH_SYSTEM will still work just
- fine even with USE_GCC, and additional tweaking of config.h or ymakefile
- is avoided. */
-#ifdef NOT_C_CODE
-# ifdef USE_GCC
-# undef LINKER
-# undef LIB_GCC
-# define LINKER "ld"
-# define LIB_GCC "`gcc --print`"
-# endif
-#endif
-
-#endif /* IRIX5_1_H */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/irix5-2.h
--- a/src/s/irix5-2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "irix5-1.h"
-
-/* as of version 5.2, irix no longer uses flock,
- according to jackr@wpd.sgi.com. */
-#undef MAIL_USE_FLOCK
-
-#if 0 /* XEmacs is smarter about dealing with C-g in select */
-/* C-g in select is not handled properly with restartable
- system calls. So don't use them. */
-#undef SA_RESTART
-#endif /* 0 */
-
-/* schoepf@goofy.zdv.Uni-Mainz.de reports he needed -lw with X11R6
- on Irix 5.3. I don't know which Irix version that need starts with. */
-#define NEED_LIBW
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/irix5-3.h
--- a/src/s/irix5-3.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-#include "irix5-2.h"
-
-/* by Hayden Schultz <haydens@ll.mit.edu> for XEmacs: */
-
-/*
- * Limit does work in 5.3
- */
-#ifdef ULIMIT_BREAK_VALUE
-#undef ULIMIT_BREAK_VALUE
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/irix6-0.h
--- a/src/s/irix6-0.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/s/irix6-0.h Wed Nov 18 08:49:14 2009 -0700
@@ -1,8 +1,63 @@
/* Synched up with: FSF 19.31. */
-#include "irix5-3.h"
+#include "usg5-4.h"
+
+#define IRIX6
+
+#ifdef LIBS_SYSTEM
+#undef LIBS_SYSTEM
+#endif
+
+#ifdef LIB_STANDARD
+#undef LIB_STANDARD
+#endif
+
+#ifdef SYSTEM_TYPE
+#undef SYSTEM_TYPE
+#endif
+#define SYSTEM_TYPE "irix"
+
+#ifdef SETUP_SLAVE_PTY
+#undef SETUP_SLAVE_PTY
+#endif
+
+/* jpff@maths.bath.ac.uk reports `struct exception' is not defined
+ * on this system, so inhibit use of matherr. */
+#define NO_MATHERR
+
+/* Tell process_send_signal to use VSUSP instead of VSWTCH. */
+#define PREFER_VSUSP
-/* Irix 6.2 doesn't need -lw */
-#undef NEED_LIBW
+/* use K&R C */
+/* XEmacs change -- use ANSI, not K&R */
+#ifndef __GNUC__
+#define C_SWITCH_SYSTEM "-xansi"
+#endif
-#undef memmove /* Use the standard system memmove() */
+/* jackr@engr.sgi.com says that you can't mix different kinds of
+ * signal-handling functions under IRIX 5.3. I'm going to assume
+ * that that was the reason this got broken. Now that the
+ * signal routines are fixed up, maybe this will work. --ben */
+/* Nope, it doesn't. I've tried lots of things; it must be
+ * genuinely broken. */
+/* XEmacs addition: People on IRIX 5.2 and IRIX 5.3 systems have
+ * reported that they can't break out of (while t) using C-g or C-G.
+ * This does not occur on other systems, so let's assume that SIGIO
+ * is broken on these systems. */
+#define BROKEN_SIGIO
+
+/* #### Questionable define. */
+#define IRIX
+
+/* By Tor Arntsen <tor@spacetec.no> for XEmacs.
+ * With the following kludge the above LD_SWITCH_SYSTEM will still work just
+ * fine even with USE_GCC, and additional tweaking of config.h or ymakefile
+ * is avoided. */
+#ifdef NOT_C_CODE
+# ifdef USE_GCC
+# undef LINKER
+# undef LIB_GCC
+# define LINKER "ld"
+# define LIB_GCC "`gcc --print`"
+# endif
+#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/isc2-2.h
--- a/src/s/isc2-2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* system description file for Interactive (ISC) Unix version 2.2 on
- the 386. */
-
-#include "usg5-3.h"
-
-/* select (in -linet) works okay on X ptys, but not on the serial port.
- karl@cs.umb.edu says that with that select call, subprocesses made by
- (e.g.) M-x grep don't exit cleanly, they just hang. Similar problems
- have been observed in ISC 3.0. */
-#define BROKEN_SELECT_NON_X
-
-/* karl@cs.umb.edu says that ISC's socket support (in -linet) isn't
- what Emacs needs; it makes interrupt-shell-subjob and the like do
- nothing. But that appears to have been another manifestation of
- the broken select, so it should now be safe to define this again. */
-#define HAVE_SOCKETS
-
-#define NO_SOCKETS_IN_FILE_SYSTEM
-#define NEED_NET_ERRNO_H
-
-/* This keeps the .cdbx section that gcc puts out when generating
- stabs-in-coff output, so Emacs can be debugged. --karl@cs.umb.edu. */
-#define USG_SHARED_LIBRARIES
-
-#define NO_FCHMOD
-
-#define MAXNAMLEN 512
-#define O_NDELAY O_NONBLOCK
-#define MEMORY_IN_STRING_H
-
-/* Tell gmalloc.c that we don't have memmove (system include files to the
- contrary!). */
-#define MEMMOVE_MISSING
-
-/* -lPW is only needed if not using Gcc. We used to include -lcposix here
- for the rename function, but some people say ISC's rename doesn't
- work correctly with Emacs so we use Emacs' emulation instead. */
-#if defined (__GNUC__)
-# define LIB_STANDARD_1 -lcposix
-#else /* !__GNUC__ */
-# define LIB_STANDARD_1 -lPW
-#endif /* !__GNUC__ */
-
-/* LIB_STANDARD_1 is used both here and in LIBS_SYSTEM
- (the latter for the sake of configure). */
-#define LIB_STANDARD LIB_STANDARD_1 -lc
-
-#define NO_X_DESTROY_DATABASE
-
-/* -linet may be needed to avoid undefined symbols such as gethostname,
- inet_addr, gethostbyname, socket, connect, ... */
-#define LIBS_SYSTEM -linet LIB_STANDARD_1
-
-/* Inhibit asm code in netinet/in.h. Strictly speaking, only necessary
- when -traditional is being used, but it doesn't hurt to
- unconditionally define this. */
-#define NO_ASM
-
-/* -traditional is not necessary if the system header files are fixed to
- define getc and putc in the absence of _POSIX_SOURCE. GCC's from 2.4.4
- on do this. */
-#if !defined (__GNUC__) || __GNUC__ < 2
-# define C_SWITCH_SYSTEM "-traditional"
-#endif
-
-/* Some versions of ISC are said to define S_IFLNK even tho
- they don't really support symlinks. */
-#undef S_IFLNK
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/isc3-0.h
--- a/src/s/isc3-0.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* s- file for Interactive (ISC) Unix version 3.0 on the 386. */
-
-#include "isc2-2.h"
-
-/* This appears on 3.0, presumably as part of what SunSoft call X2. */
-#undef NO_X_DESTROY_DATABASE
-
-/* People say that using -traditional causes lossage with `const',
- so we might as well try getting rid of -traditional. */
-#undef C_SWITCH_SYSTEM
-
-/* TIOCGWINSZ isn't broken; you just have to know where to find it. */
-#undef BROKEN_TIOCGWINSZ
-#define NEED_SIOCTL
-
-/* We need either _XOPEN_SOURCE or _POSIX_SOURCE to import the posix
- signal symbols; might as well use _XOPEN_SOURCE. Defining _SYSV3
- ensures that we don't lose the traditional symbols as a side effect
- from this or __STDC__ being defined. */
-#define C_SWITCH_SYSTEM "-D_XOPEN_SOURCE -D_SYSV3"
-
-#ifdef __GNUC__ /* Currently we use -lcposix only with gcc */
-/* This works around a bug in ISC 4.0 and 3.0; it fails
- to clear the "POSIX process" flag on an exec.
- It won't be needed for 4.1. */
-#define EXTRA_INITIALIZE __setostype (0)
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/isc4-0.h
--- a/src/s/isc4-0.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "isc3-0.h"
-
-#undef LIBS_SYSTEM
-#define LIBS_SYSTEM "-linet -lcposix"
-
-#define ISC4_0
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/isc4-1.h
--- a/src/s/isc4-1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "isc3-0.h"
-
-/* ISC 4.1 has renamed __setostype, but also has fixed the bug
- for which we needed to call it; so just do nothing. uddeborg@carmen.se. */
-#undef EXTRA_INITIALIZE
-
-#define ISC4_1
-
-#undef LIBS_SYSTEM
-#define LIBS_SYSTEM "-linet"
-
-/* uddeborg@carmen.se recommends the rest of this file. */
-
-/* A special startup file is used when compiling with Posix. */
-#define START_FILES "pre-crt0.o /lib/crtp1.o"
-
-/* -lPW is only needed if not using Gcc. */
-#undef LIB_STANDARD
-#if defined (__GNUC__)
-# define LIB_STANDARD "-lcposix -lc /lib/crtn.o"
-#else /* !__GNUC__ */
-# define LIB_STANDARD "-lPW -lcposix -lc /lib/crtn.o"
-#endif /* !__GNUC__ */
-
-/* We have Posix termios. */
-#define HAVE_TERMIOS
-/* According to template.h HAVE_TERMIO and HAVE_TERMIOS shouldn't be */
-/* defined at the same time. */
-#undef HAVE_TERMIO
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/linux.h
--- a/src/s/linux.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-/* This file is the configuration file for the GNU/Linux operating system,
- prior to version 1.1.56.
- Copyright (C) 1985, 1986, 1992, 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31 (called, ahem ... lignux.h in FSF). */
-
-/* This file was put together by Michael K. Johnson and Rik Faith. */
-
-#define USG
-#define LINUX
-
-/* powerpc gcc 2.8.0 doesn't define __ELF__, but it is */
-
-#if defined(__ELF__) || defined(powerpc)
-#define LINUX_ELF
-#endif
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "linux" /* All the best software is free. */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* Both are used in Linux by different mail programs. I assume that most
- people are using newer mailers that have heard of flock. Change this
- if you need to. */
-
-/*#define MAIL_USE_FLOCK*/
-
-
-/* On POSIX systems the system calls are interruptible by signals
- that the user program has elected to catch. Thus the system call
- must be retried in these cases. To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_CLOSE
-#define INTERRUPTIBLE_IO
-
-/* This is needed for dispnew.c:update_frame */
-
-#ifndef NOT_C_CODE
-#include <stdio.h> /* Get the definition of _IO_STDIO_H. */
-#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
-/* new C libio names */
-#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
- ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
-#else /* !_IO_STDIO_H */
-/* old C++ iostream names */
-#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
- ((FILE)->_pptr - (FILE)->_pbase)
-#endif /* !_IO_STDIO_H */
-#endif /* C_CODE */
-
-/* Ask GCC where to find libgcc.a. */
-#define LIB_GCC "`$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`"
-
-#ifndef LINUX_ELF
-/* Linux has crt0.o in a non-standard place */
-#define START_FILES "pre-crt0.o /usr/lib/crt0.o"
-#else
-/**/
-#if defined(__linux__) && defined(powerpc) /*Added by Fukui*/
-#define START_FILES /*Added by Fukui*/
-#else /*Added by Fukui*/
-#if defined __s390x__ || defined __x86_64__
-#define START_FILES "pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o"
-#else
-#define START_FILES "pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o"
-#endif
-#endif /*Added by Fukui*/
-#endif
-
-/* This is needed for sysdep.c */
-
-#define NO_SIOCTL_H /* don't have sioctl.h */
-
-#define HAVE_SYS_SIGLIST
-#define HAVE_WAIT_HEADER
-
-#define POSIX /* affects getpagesize.h and systty.h */
-
-/* Best not to include -lg, unless it is last on the command line */
-#define LIBS_DEBUG
-#define LIBS_TERMCAP "-ltermcap -lcurses" /* save some space with shared libs*/
-#ifndef LINUX_ELF
-#define LIB_STANDARD "-lc" /* avoid -lPW */
-#else
-/*#undef LIB_GCC
- #define LIB_GCC*/
-#if defined __s390x__ || defined __x86_64__
-#define LIB_STANDARD "-lgcc -lc -lgcc /usr/lib64/crtn.o"
-#else
-#define LIB_STANDARD "-lgcc -lc -lgcc /usr/lib/crtn.o"
-#endif
-#define LINKER "$(CC) -nostdlib"
-#endif
-
-#ifdef TERM
-#define LIBS_SYSTEM "-lclient"
-#define C_SWITCH_SYSTEM "-I/usr/src/term"
-#else
-/* alane@wozzle.linet.org says that -lipc is not a separate library,
- since libc-4.4.1. So -lipc was deleted. */
-#define LIBS_SYSTEM
-#endif
-
-#ifdef LINUX_ELF
-#define UNEXEC "unexelf.o"
-#define UNEXEC_USE_MAP_PRIVATE
-
-/* mrb - Ordinary link is simple and effective */
-/* slb - Not any more ... :-( */
-/* jwj - slb's comment does not seem relevant to current Linuxes */
-#define ORDINARY_LINK
-
-/* I still think ORDINARY_LINK should be the default, but since slb
- insists, ORDINARY_LINK will stay on until we expunge the dump code.
- However, the user (i.e. me!) should be able to specify ORDINARY_LINK via
- configure --cppflags=-DORDINARY_LINK ... */
-#ifdef ORDINARY_LINK
-#undef LIB_STANDARD
-#undef START_FILES
-#undef LIB_GCC
-#endif
-#endif /* LINUX_ELF */
-
-#ifdef LINUX_QMAGIC
-
-#define HAVE_TEXT_START
-#define UNEXEC "unexsunos4.o"
-#define N_PAGSIZ(x) PAGE_SIZE
-
-#else /* not LINUX_QMAGIC */
-
-#define A_TEXT_OFFSET(hdr) (N_MAGIC(hdr) == QMAGIC ? sizeof (struct exec) : 0)
-#define A_TEXT_SEEK(hdr) (N_TXTOFF(hdr) + A_TEXT_OFFSET(hdr))
-#define ADJUST_EXEC_HEADER \
- unexec_text_start = N_TXTADDR(ohdr) + A_TEXT_OFFSET(ohdr)
-
-#endif /* not LINUX_QMAGIC */
-
-/* This is to work around mysterious gcc failures in some system versions.
- It is unlikely that Emacs changes will work around this problem;
- therefore, this should remain permanently. */
-#ifndef HAVE_XRMSETDATABASE
-#define HAVE_XRMSETDATABASE
-#endif
-
-/* The regex.o routines are a part of the GNU C-library used with Linux. */
-/* However, sometimes they disagree with the src/regex.h that comes with Emacs,
- and that can make trouble in etags.c because it gets the regex.h from Emacs
- and the function definitions in libc. So turn this off. */
-/* XEmacs: in any case, Mule uses different regex routines. */
-/* #define REGEXP_IN_LIBC */
-
-/* XEmacs change: the standard linux libc includes regex routines in
- it. We have to use our own and have to avoid name conflicts. */
-
-#define re_compile_pattern sys_re_compile_pattern
-#define re_search sys_re_search
-#define re_search_2 sys_re_search_2
-#define re_match_2 sys_re_match_2
-#define re_max_failures sys_re_max_failures
-#define re_set_syntax sys_re_set_syntax
-#define re_set_registers sys_re_set_registers
-#define re_compile_fastmap sys_re_compile_fastmap
-#define re_match sys_re_match
-#define regcomp sys_regcomp
-#define regexec sys_regexec
-#define regerror sys_regerror
-#define regfree sys_regfree
-
-#if 0 /* mrb - if autoconf 2 is wrong, we should fix the test */
-/* XEmacs: Damon Lipparelli says that he incorrectly gets this
- defined on his system */
-#undef GETTIMEOFDAY_ONE_ARGUMENT
-#endif /* 0 */
-
-/* Use BSD process groups, but use setpgid() instead of setpgrp() to
- actually set a process group. */
-
-/* XEmacs: removed setpgrp() definition because we use setpgid() when
- it's available, and autodetect it. */
-
-/* The in-built malloc does not work on PPC64 or Alpha, so use the system
- malloc for now. */
-#if defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__)
-#define SYSTEM_MALLOC
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/newsos5.h
--- a/src/s/newsos5.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/* Definitions file for XEmacs running on Sony's NEWS-OS 5.0.2
- Copyright (C) 1992, 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* Use the SysVr4 file for at least base configuration. */
-
-#include "usg5-4.h"
-
-#define NEWSOS5
-
-/* These will be defined by "m-mips.h". */
-#undef START_FILES
-#undef LIB_STANDARD
-
-#undef LIBS_SYSTEM
-#define LIBS_SYSTEM "-lsocket -lnsl -lgen"
-
-/* Disable use of "unexelf.c" and shared libraries, because
- "unexelf.c" doesn't work correctly on NEWS-OS. "unexmips.c" does
- work correctly if the program is linked statically without ELF. */
-#undef UNEXEC
-#undef USG_SHARED_LIBRARIES
-
-/* Use `ld' directly rather than ordinary link, because ordinary link
- can't produce a non-ELF executable. */
-#undef ORDINARY_LINK
-#define LINKER "/usr/lib/cmplrs/cc/ld"
-#define START_FILES "pre-crt0.o /usr/ccs/lib/crt1.o"
-#define LIB_STANDARD "-lc /usr/ccs/lib/crtn.o /usr/ccs/lib/values-Xt.o"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/nextstep.h
--- a/src/s/nextstep.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/* Configuration file for the NeXTstep system.
- Copyright (C) 1990, 1995 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-#include "bsd4-3.h"
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. We'll need to undo the bsd one. */
-
-#undef SYSTEM_TYPE
-#define SYSTEM_TYPE "next-mach"
-
-#ifndef NeXT
-#define NeXT
-#endif
-
-
-/* Data type of load average, as read out of kmem. */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0 */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-/* Defining KERNEL_FILE causes lossage because sys/file.h
- stupidly gets confused by it. */
-#undef KERNEL_FILE
-
-#define HAVE_ALLOCA
-
-#define SYSTEM_MALLOC
-
-#define environ _environ
-
-#if 0 /* I think these are never used--let's see. -- rms. */
-/* Mask for address bits within a memory segment */
-
-#define SEGSIZ 0x20000
-#define SEGMENT_MASK (SEGSIZ - 1)
-
-#define HAVE_UNIX_DOMAIN
-
-/* Conflicts in process.c between ioctl.h & tty.h use of t_foo fields */
-
-#define NO_T_CHARS_DEFINES
-
-/* This avoids a problem in Xos.h when using co-Xist 3.01. */
-#define X_NOT_POSIX
-#endif /* 0 */
-
-/* Definitions for how to link. */
-
-/* Link this program just by running cc. */
-#define ORDINARY_LINK
-
-#define LD_SWITCH_SYSTEM "-X -noseglinkedit"
-
-/* Don't use -lc on the NeXT. */
-#define LIB_STANDARD "-lsys_s"
-
-#define START_FILES "pre-crt0.o"
-
-#define LIB_X11_LIB "-L/usr/lib/X11 -lX11"
-
-/* We don't have a g library either, so override the -lg LIBS_DEBUG switch */
-
-#define LIBS_DEBUG
-
-/* We don't have a libgcc.a, so we can't let LIB_GCC default to -lgcc */
-
-#define LIB_GCC
-
-/* Definitions for how to dump. */
-
-#define UNEXEC "unexnext.o"
-
-/* start_of_text isn't actually used, so make it compile without error. */
-#define TEXT_START 0
-/* This seems to be right for end_of_text, but it may not be used anyway. */
-#define TEXT_END get_etext ()
-/* This seems to be right for end_of_data, but it may not be used anyway. */
-#define DATA_END get_edata ()
-/* XEmacs change from Barry Warsaw. */
-#ifndef NOT_C_CODE
-/* this is only typedef'd in types.h if _POSIX_SOURCE is defined
- * but the problem with that is that compiling with -posix links
- * in -lposix instead of -lsys_s, and the latter defines some
- * important NeXT AppKit symbols.
- */
-typedef unsigned short mode_t;
-#endif /* ! NOT_C_CODE */
-#ifdef hppa
-/* The following are glommed from the hp9000s800.h file */
-#define STACK_DIRECTION 1
-#endif
-
-#undef SYSV_SYSTEM_DIR
-#undef NONSYSTEM_DIR_LIBRARY
-#define signal_handler_t int
-#define pid_t int
-#undef HAVE_TERMIOS
-#undef HAVE_TERMIO
-#define C_OPTIMIZE_SWITCH "-pipe"
-#undef HAVE_SETITIMER
-
-/* XEmacs addition from Axel Seibert */
-#ifndef NOT_C_CODE
-#include <sys/types.h>
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/osf1.h
--- a/src/s/osf1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "bsd4-3.h"
-
-/* Identify OSF1 for the m- files. */
-
-#define OSF1
-
-/* Define _BSD to tell the include files we're running under
- the BSD universe and not the SYSV universe. */
-
-#define C_SWITCH_SYSTEM "-D_BSD"
-#define LIBS_SYSTEM "-lbsd"
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_CLOSE
-#define INTERRUPTIBLE_IO
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-#define COFF
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/ptx.h
--- a/src/s/ptx.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/* Definitions file for XEmacs running on Sequent DYNIX/ptx 1.x/2.x
- Copyright (C) 1987, 1990 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* This file was written by Bill Burton <billb@progress.com>. Parts were
- adapted from m-ptx1-2.h and process.c as distributed with the Emacs 18.57
- on the Sequent Public software tape. Other parts were adapted from
- usg5-4.h. */
-
-/* Use the SysVr3 file for base configuration even though much is changed. */
-#define DONT_DEFINE_NO_REMAP /* `static' hack not needed */
-#include "usg5-3.h"
-
-/* Undo these defines because they are incorrect or need to be changed. */
-#undef USG_SHARED_LIBRARIES
-
-/* PTX has System V streams. */
-#define SYSV_STREAMS
-
-/* Leave out -lPW since it conflicts with term.o and because we're not sure
- if the alloca found there by autoconf should be trusted on PTX. */
-#define LIB_STANDARD "-lc"
-
-#ifndef HAVE_SOCKETS /* determined by configure */
-#define NO_SUBPROCESSES
-#endif
-
-#ifdef HAVE_X_WINDOWS
-
-/* This is also defined so that lib-src/profile can link. */
-#define LIBS_SYSTEM "-lseq"
-
-#else /* ! HAVE_X_WINDOWS */
-
-#ifdef HAVE_SOCKETS
-#define LIBS_SYSTEM "-lsocket -linet -lnsl -lseq"
-#else
-#define LIBS_SYSTEM "-lseq"
-#endif
-
-#endif /* ! HAVE_X_WINDOWS */
-
-/* No <sioctl.h> */
-#define NO_SIOCTL_H
-
-/* If we have X windows, configure should find gettimeofday in -lX11.
- Since we emulate gettimeofday below, we really have it anyway. */
-#ifndef HAVE_GETTIMEOFDAY
-#define HAVE_GETTIMEOFDAY
-#endif
-
-#ifdef emacs
-#include <sys/conf.h>
-
-/*#define BROKEN_SIGIO*/ /* SIGIO is already undef'd elsewhere. PTX
- has SIGIO, but it's just an alias for
- SIGPOLL. */
-
-/* Emulate gettimeofday() except for the time zone information which Emacs
- doesn't use anyway. Get_process_stats() is in -lseq. */
-#include <sys/procstats.h>
-#define gettimeofday(tp, tzp) get_process_stats (tp, PS_SELF, 0, 0)
-
-/* Define timezone since it's not in sys/time.h. Unfortunately, this causes
- trouble when building with X since this struct is defined in
- <X11/Xos.h>. */
-struct timezone
-{
- int tz_minuteswest;
- int tz_dsttime;
-};
-
-/* Unfortunately, this define is not checked in all files including
- <X11/Xos.h> so we can't use it. */
-/* #define XOS_NEEDS_TIME_H */
-
-/* In ptx/WINDOWS, this prevents problems with the timezone struct being
- redefined in <X11/Xos.h>. It seems the necessary include files are
- included via systime.h so leaving them out here is not a problem. This
- may not work in X11R5 or X11R6. */
-#define __TIMEVAL__
-
-#endif /* emacs */
-
-/* PTX has termios */
-#undef BROKEN_TIOCGWINSZ
-#undef BROKEN_TIOCGETC
-
-/* Provide pty support which is defined into process.c:allocate_pty.
- Basic ideas for handling getpseudotty were lifted from process.c in
- Emacs 18.57 included on the Sequent Public Software tape. However, this
- implementation bears almost no resemblance to the original and does not
- require that process.c be patched. */
-#define PTY_ITERATION \
- char *mastername, *slavename; \
- while (1)
-
-#define PTY_OPEN \
- if (failed_count++ >= 5) break; \
- if ((fd = getpseudotty (&slavename, &mastername)) < 0) { \
- error("Out of ptys."); \
- continue; \
- } \
- strcpy (pty_name, slavename);
-
-/* Define these to prevent the default logic in process.c:allocate_pty
- from being used. */
-#define PTY_NAME_SPRINTF
-#define PTY_TTY_NAME_SPRINTF
-
-/* PTX doesn't seem to have memmove. */
-#define MEMMOVE_MISSING
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/riscix1-1.h
--- a/src/s/riscix1-1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/* Definitions file for XEmacs running on RISCiX 1.1 (bsd 4.3)
- Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-#define RISCiX_1_1 1
-#define RISCiX 11
-#define CRT0_O /lib/crt0.o
-#include "bsd4-3.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/riscix1-2.h
--- a/src/s/riscix1-2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/* Definitions file for XEmacs running on RISCiX 1.2 (bsd 4.3)
- Copyright (C) 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-#define RISCiX_1_2 1
-#define RISCiX 12
-#define CRT0_O /usr/lib/crt0.o
-#include "bsd4-3.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/riscos5.h
--- a/src/s/riscos5.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "bsd4-3.h"
-
-/* This file has changes that Jost Krieger <x920031@rubb.rz.ruhr-uni-bochum.de>
- says are necessary. */
-
-/* No declaration in system header files. */
-extern double atof ();
-
-#define LD_SWITCH_SYSTEM "-non_shared"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/rtu.h
--- a/src/s/rtu.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/* Definitions file for XEmacs running on RTU 3.0, ucb universe.
- Copyright (C) 1986 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define BSD4_2
-#define BSD
-#define RTU
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "rtu"
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'a' means it is /dev/ptya0 */
-
-#define FIRST_PTY_LETTER 'z' /* i.e. no PTY_LETTERs */
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-#undef COFF
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-#undef MAIL_USE_FLOCK
-
-/* The symbol in the kernel where the load average is found
- is named _avenrun. */
-
-#define LDAV_SYMBOL "_avenrun"
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/* On RTU systems (like USG) the system calls are interruptible by signals
- that the user program has elected to catch. Thus the system call
- must be retried in these cases. To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
-/* The "fsync" call on RTU versions 3.0 and 3.1 is badly broken!
- This hack below isn't the best solution, but without it this
- program will cause the whole system to hang! !@#$#%$ Masscomp! */
-
-#define fsync(x) 0 /* "Comment out" fsync calls */
-
-/* This is how to get the device name of the tty end of a pty. */
-#define PTY_TTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/ttyp%x", i);
-
-/* This is how to get the device name of the control end of a pty. */
-#define PTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/pty%x", i);
-
-/* Formerly "BSD_PGRPS" */
-
-#define SIGIO_REQUIRES_SEPARATE_PROCESS_GROUP
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sco4.h
--- a/src/s/sco4.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/* System description file for SCO 3.2v4.
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* Contributed by Ian Lance Taylor, ian@cygnus.com. */
-
-/* SCO is sort of like SVR3. */
-#include "usg5-3.h"
-#define SC0_R4
-
-#if 0 /* Turned off rather than make the Lisp code check for this. -- rms.
- I am assuming that (at least most of) the tests for usg-unix-v
- do the right thing for sco3.2v4 also. Things that *might* be wrong
- as a result of turning off these lines include the values of
- ange-ftp-remote-shell-file-name (now remsh)
- dired-chown-program (now just chown)
- lpr-command (now lp)
- nntp-buggy-select (now t)
- rmail-spool-directory (now /usr/mail?)
- and the actions of the function print-region-1. */
-
-/* SYSTEM_TYPE should indicate the kind of system you are using. */
-#undef SYSTEM_TYPE
-#define SYSTEM_TYPE "SCO 3.2v4"
-#endif
-
-/* SCO has ptys with unusual names. */
-
-#define PTY_ITERATION \
- for (i = 0; ; i++)
-#define PTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/ptyp%d", i);
-#define PTY_TTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/ttyp%d", i);
-
-/* Must use 'cc' to link when build with motif toolkit. */
-#ifndef __GNUC__
-#define LINKER "cc"
-#endif
-
-#ifdef HAVE_SOCKETS
-#define LIBS_SYSTEM "-lsocket -lPW"
-
-/* SCO has gettimeofday in socket library */
-/* Autoconf should determine this, but for now,
- play safe to avoid error rather than deleting this
- and risking the wrong result. */
-#ifndef HAVE_GETTIMEOFDAY
-#define HAVE_GETTIMEOFDAY
-#endif
-#endif
-
-/* This enables configure to tell that we have alloca. */
-#ifndef LIBS_SYSTEM
-#define LIBS_SYSTEM "-lPW"
-#endif
-
-#ifdef HAVE_X11R5
-/* configure can't get this right linking fails unless -lsocket is used. */
-#undef HAVE_XSCREENNUMBEROFSCREEN
-#define HAVE_XSCREENNUMBEROFSCREEN
-#endif
-
-/* We don't have -loldX, and we don't need it. */
-#define LIB_XMENU_LIB
-
-/* SCO does have TIOCGWINSZ. */
-#undef BROKEN_TIOCGWINSZ
-#define NEED_PTEM_H
-
-/* We need to link with crt1.o and crtn.o. */
-#define START_FILES "pre-crt0.o /lib/crt1.o"
-#define LIB_STANDARD "-lc /lib/crtn.o"
-
-/* Specify program for etc/fakemail to run. Define SMAIL if you are
- using smail, don't for MMDF. */
-
-#ifdef SMAIL
-#define MAIL_PROGRAM_NAME "/bin/smail -q0"
-#else
-#define MAIL_PROGRAM_NAME "/usr/lib/mail/execmail"
-#endif
-
-/* Tell process_send_signal to use VSUSP instead of VSWTCH. */
-#define PREFER_VSUSP
-
-/* wjs@wiis.wang.com says SCO 3.2 v4.2 "has sockets",
- but only for network connections.
- It doesn't have the kind of sockets that emacsclient.c
- and emacsserver.c would use. */
-#define NO_SOCKETS_IN_FILE_SYSTEM
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sco5-shr.h
--- a/src/s/sco5-shr.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-#include "sco5.h"
-
-/* XEmacs change. */
-#undef LINKER
-#undef C_OPTIMIZE_SWITCH
-#undef C_DEBUG_SWITCH
-#undef C_SWITCH_SYSTEM
-
-#ifndef __GNUC__
-#define LINKER "cc -belf -dy -Xc"
-#define C_OPTIMIZE_SWITCH "-O3 -Xc"
-#define C_DEBUG_SWITCH "-g -Xc"
-#define C_SWITCH_SYSTEM "-belf -D_NO_STATIC -D_SCO_ELF"
-#else
-#define LINKER "gcc -melf -Xc"
-#define C_OPTIMIZE_SWITCH "-O99 -m486 -fomit-frame-pointer -Xc"
-#define C_DEBUG_SWITCH "-g -Xc"
-#define C_SWITCH_SYSTEM "-melf -D_NO_STATIC -D_SCO_ELF"
-#endif
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sco5.h
--- a/src/s/sco5.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-/* System description file for SCO OpenServer Release 5
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not in FSF. */
-
-/* Changes for SCO OpenServer 5 by Robert Lipe, robertl@dgii.com
- * Additions, enhancements by J. Kean Johnston, hug@netcom.com
- */
-
-#define DONT_DEFINE_NO_REMAP /* `static' hack not needed */
-
-/* JKJ: Yes its a lot like SCO 4, but different enough that its easier to
- * base it on stock SVR3 and add our stuff
- */
-#include "usg5-3.h"
-#define SCO_R4
-#define SCO_R5
-
-#undef SYSTEM_TYPE
-#define SYSTEM_TYPE "SCO 3.2v5"
-
-/* SCO has ptys, but with weird names */
-#define PTY_ITERATION \
- for (i = 0; ; i++)
-#define PTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/ptyp%d", i);
-#define PTY_TTY_NAME_SPRINTF \
- sprintf (pty_name, "/dev/ttyp%d", i);
-
-/* We have sockets. Always. */
-#ifndef HAVE_SOCKETS
-#define HAVE_SOCKETS
-#endif
-
-#ifndef __GNUC__
-#define LINKER "cc -Xc"
-#else
-#define LINKER "gcc"
-#endif
-
-#define LIBS_SYSTEM "-lsocket -lPW -lgen -lcrypt -lmalloc"
-
-#ifndef MAXPATHLEN
-# define MAXPATHLEN PATHSIZE
-#endif
-
-/* This is necessary to circumvent stupidity in <X11/Xosdefs.h>. That
-file checks a manifest that is only defined by xmkmf. Alternately, we
-could #define sco and I think everything would work. rjl */
-#define ANSICPP 1
-
-#ifndef HAVE_GETTIMEOFDAY
-#define HAVE_GETTIMEOFDAY
-#endif
-
-#undef ADDR_CORRECT
-#define ADDR_CORRECT(x) (int)((char *)(x) - (char*)0)
-
-#define C_SWITCH_SYSTEM "-D_NO_STATIC"
-
-#ifndef __GNUC__
-#define C_OPTIMIZE_SWITCH "-O3 -Xc"
-#define C_DEBUG_SWITCH "-g -Xc"
-#else
-#define C_OPTIMIZE_SWITCH "-O99 -m486 -fomit-frame-pointer"
-#define C_DEBUG_SWITCH "-g"
-#endif
-
-/* configure can't get this right linking fails unless -lsocket is used. */
-#undef HAVE_XSCREENNUMBEROFSCREEN
-#define HAVE_XSCREENNUMBEROFSCREEN
-
-/* We don't have -loldX, and we don't need it. */
-#define LIB_XMENU_LIB
-
-/* SCO does have TIOCGWINSZ. */
-#undef BROKEN_TIOCGWINSZ
-#define NEED_PTEM_H
-
-#ifndef __GNUC__
-#define START_FILES "pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/values-Xc.o"
-#else
-#define START_FILES "pre-crt0.o /usr/ccs/lib/crt1.o"
-#endif
-#define LIB_STANDARD "-lc"
-
-/* Specify program for etc/fakemail to run. Define SMAIL if you are
- using smail, don't for MMDF. */
-
-#ifdef SMAIL
-#define MAIL_PROGRAM_NAME "/usr/bin/smail -q0"
-#else
-#define MAIL_PROGRAM_NAME "/usr/lib/mail/execmail"
-#endif
-
-/* Tell process_send_signal to use VSUSP instead of VSWTCH. */
-#define PREFER_VSUSP
-
-#define POSIX_SIGNALS
-
-#undef PENDING_OUTPUT_COUNT
-#define PENDING_OUTPUT_COUNT(f) ((f)->__ptr - (f)->__base)
-
-#ifndef HAVE_VFORK
-#define HAVE_VFORK
-#endif
-
-#ifdef _SCO_ELF
-#undef COFF /* coz we're NOT */
-#define UNEXEC "unexelf.o"
-#endif
-
-/* For GCC 2.7.2.3 we require the "JKJ" version of gcc.
- Works fine with egcs and gcc 2.8.x. */
-#define LIB_GCC "`$(LD) $(LDFLAGS) -print-libgcc-file-name`"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sunos4-0-shr.h
--- a/src/s/sunos4-0-shr.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/* Synched up with: FSF 19.31. (Split off from sunos4-shr.h.) */
-
-/* This file permits building Emacs with a shared libc on Sunos 4.
- To make this work, you must completely replace your C shared library
- using one of the SunOS 4.1.x jumbo replacement patches from Sun.
- Here are the patch numbers for Sunos 4.1.3:
- 100890-10 SunOS 4.1.3: domestic libc jumbo patch
- 100891-10 SunOS 4.1.3: international libc jumbo patch */
-
-
-#include "sunos4-0.h"
-
-/* Say that the text segment of a.out includes the header;
- the header actually occupies the first few bytes of the text segment
- and is counted in hdr.a_text. */
-
-/* Misleading! Actually gets loaded after crt0.o */
-#undef START_FILES
-#define START_FILES "pre-crt0.o"
-
-/*
- * Kludge! can't get at symbol "start" in std crt0.o
- * Who the #$%&* decided to remove the __ characters!
- * Someone needs to fix this in sysdep.c with an #ifdef BROKEN_START in
- * sysdep.c. We do not use this address so any value should do really. Still
- * may need it in the future?
- */
-#define BROKEN_START
-#ifndef TEXT_START
-#define TEXT_START 0x2020
-#endif
-
-#undef UNEXEC
-#define UNEXEC "unexsunos4.o"
-#ifndef RUN_TIME_REMAP
-#define RUN_TIME_REMAP
-#endif
-#define ORDINARY_LINK
-#define SUNOS4_SHARED_LIBRARIES
-
-#undef LD_SWITCH_SYSTEM
-
-#undef SYSTEM_MALLOC
-#ifndef REL_ALLOC
-#define REL_ALLOC
-#endif
-
-#undef USE_DL_STUBS
-
-#ifndef HAVE_X11R6
-/* With X11R5 it was reported that linking -lXmu dynamically
- did not work. With X11R6, it does work; and since normally
- only the dynamic libraries are available, we should use them. */
-#define LIBXMU "-Bstatic -lXmu -Bdynamic"
-
-#endif /* not HAVE_X11R6 */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sunos4-0.h
--- a/src/s/sunos4-0.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* For building XEmacs under SunOS 4.1.* with static libraries. */
-
-#ifndef _S_SUNOS4_H_
-#define _S_SUNOS4_H_
-
-#include "bsd4-2.h"
-
-#ifndef SUNOS4
-#define SUNOS4
-#endif
-
-#if 0 /* This may have been needed for an earlier version of Sun OS 4.
- It seems to cause warnings in 4.0.3 and 4.1. */
-#define O_NDELAY FNDELAY /* Non-blocking I/O (4.2 style) */
-#endif
-
-#ifdef NOT_C_CODE
- /* The new sunOS unexec eliminates the need for a custom crt0.o, so we
- can just let the compiler invoke the linker and don't have to guess
- what options it might have passed it. */
-# define ORDINARY_LINK
-# define START_FILES
-# define LD_CMD $(CC)
-# ifndef LD_SWITCH_SYSTEM
-# define LD_SWITCH_SYSTEM "-Bstatic"
-# endif
-# define UNEXEC "unexsunos4.o"
-#endif /* NOT_C_CODE */
-
-#define RUN_TIME_REMAP
-
-/* these don't matter, but we have to define something to keep
- sysdep.c from introducing bogus symbols */
-#define TEXT_START 0
-#define DATA_START 0
-
-/* #### XEmacs: #define of SYSTEM_MALLOC removed. Is this OK? FSF says:
-
- In SunOS 4.1, a static function called by tzsetwall reportedly
- clears the byte just past an eight byte region it mallocs, corrupting
- GNU malloc's memory pool. But Sun's malloc doesn't seem to mind. */
-
-/* XEmacs: additions for proper prototyping. */
-#ifndef NOT_C_CODE
-#ifdef __STDC__
-/* Sun's headers are categorically losing.
- Mly uses broken-sun.h to get the protos for this, but lcc provides all
- of the prototypes for the ANSI routines. So I'm just going to put the
- protos of the non-ANSI routines that we use here (I guess that would
- be things that are Posix but not ANSI?) You're in a maze of twisty
- little standards, all alike...
- */
-/* Since lcc is not going to be heavily used anymore if it ever was, I'm
- putting broken-sun.h back in. */
-/* Since Gcc 2.8 appears to have fixed the problem, I'm conditionalizing */
-/* this ugly hack. */
-
-#if defined (__GNUC__)
-#if defined (__GNUC_MINOR__)
-#if ((__GNUC__ == 2) && (__GNUC_MINOR__ > 7)) || ((__GNUC__ > 2))
-/* Don't include for gcc 2.8.0*/
-#else
-#include "../broken-sun.h"
-#endif
-
-#else /* __GNUC_MINOR__ is undefined */
-#include "../broken-sun.h"
-#endif
-
-#else
-/* Not GNU C */
-#endif
-
-extern char *strdup ();
-extern char *ttyname (int);
-extern void tzsetwall (void);
-extern int getpagesize (void);
-
-#include <memory.h>
-#ifdef __SUNPRO_C
-/* Suppress zillions of warnings from outdated SunOS4 prototypes */
-/* Bother! Sun can't even get the arg types right. */
-#include <string.h>
-#define memset(a,b,c) memset((char*) (a), b, c)
-#define memcpy(a,b,c) memcpy((char*) (a), (char*) (b), c)
-#define memcmp(a,b,c) memcmp((char*) (a), (char*) (b), c)
-#define memchr(a,b,c) memchr((char*) (a), b, c)
-void * __builtin_alloca(int);
-#ifdef HAVE_X_WINDOWS
-#include <X11/Xlib.h>
-#define XFree(p) XFree((char*)(p))
-#endif /* X Windows */
-#endif /* __SUNPRO_C */
-
-#endif /* __STDC__ */
-
-# ifdef __GNUC__
- /* XEmacs addition: */
- /* gcc has the bug that it claims to conform to the ANSI C standard
- (which is what setting __STDC__ to 1 means) but does not necessarily
- provide all of the library routines which the standard requires of a
- conforming compiler -- such as memmove. The other Sun ANSI compilers
- (Sun's acc and Lucid's lcc) do not have this bug. */
-# define memmove(to, from, size) bcopy ((char *) (from), (char *) (to), (size))
-/* We must define mkdir with this arg prototype
- to match GCC's fixed stat.h. */
-# define MKDIR_PROTOTYPE \
- int mkdir (const char *dpath, unsigned short dmode)
-# endif /* __GNUC__ */
-
-/* ANSI C requires that realloc accept a null pointer argument,
- but ancient implementations such as SunOS 4 don't allow this.
- We redefine realloc here so that the source code can be written to
- use the ANSI C API. */
-#include <sys/types.h>
-#ifdef __GNUC__
-inline /* Suppress warning: realloc_accepting_nullptr defined but not used */
-#endif
-static void*
-realloc_accepting_nullptr (void *ptr, size_t size)
-{
- extern char *realloc ();
- extern char *malloc ();
- return ptr ? (void *) realloc (ptr, size) : (void *) malloc (size);
-}
-#define realloc(ptr, size) realloc_accepting_nullptr (ptr, size)
-
-#endif /* C_CODE */
-
-#endif /* _S_SUNOS4_H_ */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sunos4-1-1.h
--- a/src/s/sunos4-1-1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-#include "sunos4-1.h"
-
-/* Rodney Peck <rpeck@nas.nasa.gov> 19940608
- the /usr/lib/libresolv.a in sunos 4.1.1 not really a static library and
- will cause linker errors looking for _GLOBAL_OFFSET_TABLE_. The resolver
- routines are in libc however so XEmacs will link without the -lresolv
- */
-#undef LIBS_SYSTEM
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sunos4-1-2-shr.h
--- a/src/s/sunos4-1-2-shr.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-/* For building XEmacs under SunOS 4.1.* with dynamic libraries. */
-
-#ifdef NOT_C_CODE
-
-#define LD_SWITCH_SYSTEM "-Bdynamic"
-
-#endif /* NOT_C_CODE */
-
-#include "sunos4-1-2.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sunos4-1-2.h
--- a/src/s/sunos4-1-2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "sunos4-1.h"
-/* #undef SYSTEM_MALLOC */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sunos4-1-3-shr.h
--- a/src/s/sunos4-1-3-shr.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-/* For building XEmacs under SunOS 4.1.* with dynamic libraries. */
-
-#ifdef NOT_C_CODE
-
-#define LD_SWITCH_SYSTEM "-Bdynamic"
-
-#endif /* NOT_C_CODE */
-
-#include "sunos4-1-3.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sunos4-1-3.h
--- a/src/s/sunos4-1-3.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "sunos4-1.h"
-
-#if 0
-/* XEmacs: FSF 19.31 removes this. Let's just comment it out. */
-/* TERMIOS is broken under SunOS??
-
- Someone says: This causes failure in process_send_signal (tcgetattr
- loses) and may also cause hanging at Emacs startup when parent is
- not a job control shell. */
-/* murray@chemical-eng.edinburgh.ac.uk says this works, and avoids
- the problem of spurious ^M in subprocess output. */
-#undef HAVE_TERMIOS
-#endif /* 0 */
-
-#if 0
-/* XEmacs: FSF 19.31 mistakenly reenables this. */
-/* jik@gza.com says this works now. */
-/* The bug that corrupts GNU malloc's memory pool is fixed in SunOS 4.1.3. */
-
-#undef SYSTEM_MALLOC
-#endif /* 0 */
-
-/* barrie@calvin.demon.co.uk says memmove is missing. */
-#ifndef SYSTEM_MALLOC
-#define MEMMOVE_MISSING
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sunos4-1-4-shr.h
--- a/src/s/sunos4-1-4-shr.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-/* For building XEmacs under SunOS 4.1.* with dynamic libraries. */
-
-#ifdef NOT_C_CODE
-
-#define LD_SWITCH_SYSTEM "-Bdynamic"
-
-#endif /* NOT_C_CODE */
-
-#include "sunos4-1-4.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sunos4-1-4.h
--- a/src/s/sunos4-1-4.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "sunos4-1.h"
-
-#if 0
-/* XEmacs: FSF 19.31 removes this. Let's just comment it out. */
-/* TERMIOS is broken under SunOS??
-
- Someone says: This causes failure in process_send_signal (tcgetattr
- loses) and may also cause hanging at Emacs startup when parent is
- not a job control shell. */
-/* murray@chemical-eng.edinburgh.ac.uk says this works, and avoids
- the problem of spurious ^M in subprocess output. */
-#undef HAVE_TERMIOS
-#endif
-
-#if 0
-/* XEmacs: FSF 19.31 mistakenly reenables this. */
-/* jik@gza.com says this works now. */
-/* The bug that corrupts GNU malloc's memory pool is fixed in SunOS 4.1.3. */
-
-#undef SYSTEM_MALLOC
-#endif /* 0 */
-
-/* barrie@calvin.demon.co.uk says memmove is missing. */
-#ifndef SYSTEM_MALLOC
-#define MEMMOVE_MISSING
-#endif
-
-/* A reliable source says this is broken through SunOS 4.1.3 */
-/* but not SunOS 4.1.4 */
-#ifdef BROKEN_SIGIO
-#undef BROKEN_SIGIO
-#endif
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sunos4-1-shr.h
--- a/src/s/sunos4-1-shr.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-/* Synched up with: Not in FSF. */
-
-/* For building XEmacs under SunOS 4.1.* with dynamic libraries. */
-
-#ifdef NOT_C_CODE
-
-#define LD_SWITCH_SYSTEM "-Bdynamic"
-
-#endif /* NOT_C_CODE */
-
-#include "sunos4-1.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/sunos4-1.h
--- a/src/s/sunos4-1.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-#include "sunos4-0.h"
-
-/* 4.1.1 makes these system calls interruptible. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_CLOSE
-#define INTERRUPTIBLE_IO
-
-/* Cause the compilation of oldxmenu to use the right -I option. */
-#define OLDXMENU_OPTIONS CFLAGS=C_SWITCH_SYSTEM
-
-#if 0 /* RMSmacs */
-FSF says the following, but apparently the HAVE_RES_INIT stuff takes
-care of it properly?
-/* #if 0 This isn't right. Apparently some sites do have -lresolv
- but don't use that. On those systems, the code below loses.
- There's no way to win automatically unless someone
- figures out a way of determining automatically which way is right
- on any given system. */
-#endif
-
-/* Some systems do not run the Network Information Service, but have
- modified the shared C library to include resolver support without
- also changing the C archive library (/usr/lib/libc.a). If we
- detect the presence of libresolv.a, use -lresolv to supplement libc.a.
-
- We used to have #ifdef HAVE_GETHOSTNAME is to prevent configure from
- setting libsrc_libs to -lresolv in lib-src/Makefile. But nowadays
- configure is smarter about computing libsrc_libs, and would not
- be fooled. Anyway, why not use -lresolv in lib-src? */
-/* #ifdef HAVE_GETHOSTNAME */
-/* XEmacs change: -lresolve should be added only if we have RES_INIT,
- not if we don't */
-#ifdef HAVE_RES_INIT
-#define LIBS_SYSTEM "-lresolv"
-#endif
-/* #endif */
-
-#if 0 /* Not necessary, since SYSTEM_MALLOC is defined in sunos4-0.h. */
-/* Tell GNU malloc to compensate for a bug in localtime. */
-#define SUNOS_LOCALTIME_BUG
-#endif
-
-/* Define dlopen, dlclose, dlsym. */
-#define USE_DL_STUBS
-
-/* This appears to be broken on SunOS4.1.[123] */
-#define BROKEN_SIGIO
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/template.h
--- a/src/s/template.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/s/template.h Wed Nov 18 08:49:14 2009 -0700
@@ -32,8 +32,6 @@
/* #define USG */
/* #define HPUX */
/* #define UMAX */
-/* #define BSD4_1 */
-/* #define BSD4_2 */
/* #define BSD4_3 */
/* #define BSD */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/ultrix.h
--- a/src/s/ultrix.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/* Definitions file for XEmacs running on Ultrix (bsd 4.3)
- Copyright (C) 1993 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not in FSF. */
-
-#include "bsd4-3.h"
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#undef SYSTEM_TYPE
-#define SYSTEM_TYPE "ultrix"
-
-/* #### A very old comment in unix_open_network_stream() said this:
-
- Kernel bugs (on Ultrix at least) cause lossage (not just EINTR)
- when connect is interrupted. So let's not let it get interrupted.
-
- Someone using Ultrix (anyone still out there?) should verify this.
-*/
-
-#define CONNECT_NEEDS_SLOWED_INTERRUPTS
-
-/* We don't have a built-in strdup() function */
-#define NEED_STRDUP
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/ultrix4-3.h
--- a/src/s/ultrix4-3.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-/* Ultrix 4.3 system description header file.
- Copyright (C) 1997 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-#include "ultrix.h"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/umax.h
--- a/src/s/umax.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/* Definitions file for XEmacs running on UMAX 4.2
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-/* #define UNIPLUS */
-/* #define USG5 */
-/* #define USG */
-/* #define BSD4_1 */
-#define BSD4_2
-/* #define BSD4_3 */
-#define BSD
-#define UMAX4_2
-#define UMAX
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "berkeley-unix"
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'a' means it is /dev/ptya0 */
-
-#define FIRST_PTY_LETTER 'p'
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-#define COFF
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-#define MAIL_USE_FLOCK
-
-/* The file containing the kernel's symbol table is called /vmunix. */
-
-#define KERNEL_FILE "/vmunix"
-
-/* The symbol in the kernel where the load average is found
- is named _avenrun. */
-
-#define LDAV_SYMBOL "_avenrun"
-
-/* Specify alignment requirement for start of text and data sections
- in the executable file. */
-
-#define SECTION_ALIGNMENT pagemask
-
-
-#define SEGMENT_MASK (64 * 1024 - 1)
-
-
-/* crt0.c needs this for compilation because it uses asm. */
-
-#define C_SWITCH_ASM -q nodirect_code
-
-/* Encore machines with APC processor boards align sections on 4M
- boundaries, so it is not easy to remap the start of the text segment
- in the unexec() routine. For them you need the following two lines.
- For DPC processors you can enable these or not, as you wish, but
- you will get better performance without them. */
-
-/* #define NO_REMAP
- #define TEXT_START 0
-*/
-
-/* Formerly "BSD_PGRPS" */
-
-#define SIGIO_REQUIRES_SEPARATE_PROCESS_GROUP
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/umips.h
--- a/src/s/umips.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* Definitions file for XEmacs running on Mips operating system.
- That system can emulate either BSD or Sys V, in either case with changes.
- If BSD is defined, we assume BSD is being emulated; otherwise, Sys V. */
-
-#ifdef BSD
-#include "bsd4-3.h"
-
-#define C_SWITCH_SYSTEM "-systype bsd43"
-#define LD_SWITCH_SYSTEM "-systype bsd43"
-#undef LIBS_SYSTEM
-#define LIBS_DEBUG
-#define START_FILES "pre-crt0.o /lib/crt1.o"
-#define LIB_STANDARD "-lc /usr/lib/crtn.o"
-
-#define COFF
-#define TERMINFO
-#undef MAIL_USE_FLOCK /* Someone should check this. */
-
-#else /* not BSD */
-
-#define DONT_DEFINE_NO_REMAP /* `static' hack not needed */
-#include "usg5-2-2.h"
-
-#undef LIBS_SYSTEM
-#define LIBS_DEBUG
-#define START_FILES "pre-crt0.o /usr/lib/crt1.o"
-#define LIB_STANDARD "-lbsd -lc /usr/lib/crtn.o"
-/* #define LIBS_TERMCAP -lcurses */
-
-#define C_SWITCH_SYSTEM "-I/usr/include/bsd"
-
-/* Don't try to use SIGIO even though it is defined. */
-#define BROKEN_SIGIO
-
-/* Describe special kernel features. */
-
-#if defined(emacs)
-#include <bsd/sys/time.h>
-#endif
-
-/* The `select' in the system won't work for pipes,
- so don't use it. */
-#define BROKEN_SELECT
-
-/* ??? */
-#define IRIS
-
-#endif /* not BSD */
-
-/* High order bit must be stripped off nlist return values */
-#define FIXUP_KERNEL_SYMBOL_ADDR(NL) (NL)[0].n_value &= 0x7fffffff;
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/unipl5-0.h
--- a/src/s/unipl5-0.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/* Definitions file for XEmacs running on UniSoft's UniPlus 5.0
- Support for this system is not finished; don't expect this to work.
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG /* System III, System V, etc */
-
-#define USG5
-
-#define UNIPLUS
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "unisoft-unix"
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'a' means it is /dev/ptya0 */
-
-/* #define FIRST_PTY_LETTER 'a' */
-
-#define NO_SUBPROCESSES
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* The file containing the kernel's symbol table is called /unix. */
-
-#define KERNEL_FILE "/unix"
-
-/* The symbol in the kernel where the load average is found
- is named avenrun. */
-
-#define LDAV_SYMBOL "avenrun"
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch. Thus the system call
- must be retried in these cases. To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
-/* Compiler bug bites when default ADDR_CORRECT is used. */
-
-#define ADDR_CORRECT(x) (x)
-
-/* Special library needed for linking for Uniplus */
-
-#define LIBS_SYSTEM "-lnet"
-
-/* A system-specific loader switch is needed. */
-
-#define LD_SWITCH_SYSTEM "-N -L/lib/libg /usr/lib/unshared.ld"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/unipl5-2.h
--- a/src/s/unipl5-2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/* Definitions file for XEmacs running on UniSoft's UniPlus 5.2
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG /* System III, System V, etc */
-
-#define USG5
-
-#define UNIPLUS
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "unisoft-unix"
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'p' means it is /dev/ptyp0 */
-
-#define FIRST_PTY_LETTER 'p'
-
-/* Subprocesses are supported under UniPlus System V Release 2. */
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-#define COFF
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* The file containing the kernel's symbol table is called /unix. */
-
-#define KERNEL_FILE "/unix"
-
-/* The symbol in the kernel where the load average is found
- is named avenrun. */
-
-#define LDAV_SYMBOL "avenrun"
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch. Thus the system call
- must be retried in these cases. To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
-/* Compiler bug bites when default ADDR_CORRECT is used. */
-
-#define ADDR_CORRECT(x) (x)
-
-/* Special library needed for linking for Uniplus */
-
-#define LIBS_SYSTEM "-lnet"
-
-/* A system-specific loader switch is needed. */
-
-#define LD_SWITCH_SYSTEM "-N -L/lib/libg /usr/lib/unshared.ld"
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/usg5-0.h
--- a/src/s/usg5-0.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/* Definitions file for XEmacs running on AT&T's System V.0
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-#define USG /* System III, System V, etc */
-
-#define USG5
-#define USG5_0
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "usg-unix-v"
-
-/* Letter to use in finding device name of first pty,
- if system supports pty's. 'p' means it is /dev/ptyp0 */
-
-#define FIRST_PTY_LETTER 'p'
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-#define COFF
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-/* #define MAIL_USE_FLOCK */
-
-/* The file containing the kernel's symbol table is called /unix. */
-
-#define KERNEL_FILE "/unix"
-
-/* The symbol in the kernel where the load average is found
- is named avenrun. */
-
-#define LDAV_SYMBOL "avenrun"
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch. Thus the system call
- must be retried in these cases. To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
-/* USG systems tend to put everything declared static
- into the initialized data area, which becomes pure after dumping Emacs.
- Foil this by defining NO_REMAP, which makes the purespace not pure.
- (Formerly this was avoided by doing '#define static' but this just
- fails with inline functions.) */
-
-#ifndef DONT_DEFINE_NO_REMAP
-#define NO_REMAP
-#endif
-
-/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
-
-#define ADDR_CORRECT(x) (x)
-
-/* Prevent -lg from being used for debugging. Not implemented? */
-
-#define LIBS_DEBUG
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/usg5-2-2.h
--- a/src/s/usg5-2-2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/* Definitions file for XEmacs running on AT&T's System V Release 2.2
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-#include "usg5-2.h"
-
-/* Synched up with: FSF 19.31. */
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/usg5-2.h
--- a/src/s/usg5-2.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/* Definitions file for XEmacs running on AT&T's System V Release 2.0
- Copyright (C) 1985, 1986 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-#include "usg5-0.h"
-
-#undef USG5_0
-
-/* Use terminfo instead of termcap. */
-
-#define TERMINFO
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/usg5-3.h
--- a/src/s/usg5-3.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/* Definitions file for XEmacs running on AT&T's System V Release 3
- Copyright (C) 1987 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-#include "usg5-2-2.h"
-
-#define USG5_3
-
-/* 5.3 apparently makes close() interruptible */
-
-#define INTERRUPTIBLE_CLOSE
-
-/* Apparently -lg is provided in 5.3 */
-
-#undef LIBS_DEBUG
-
-/* Some variants have TIOCGETC, but the structures to go with it
- are not declared. */
-
-#define BROKEN_TIOCGETC
-
-/* Some variants have TIOCGWINSZ, but the structures to go with it
- are not declared. */
-
-#define BROKEN_TIOCGWINSZ
-
-/* Enable support for shared libraries in unexec. */
-
-#define USG_SHARED_LIBRARIES
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/usg5-4.h
--- a/src/s/usg5-4.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/s/usg5-4.h Wed Nov 18 08:49:14 2009 -0700
@@ -25,32 +25,75 @@
* S. Raymond <esr@snark.thyrsus.com>.
*/
-/* Use the SysVr3 file for at least base configuration. */
+#define USG /* System III, System V, etc */
+#define USG5
+#define USG5_4
+
+/* SYSTEM_TYPE should indicate the kind of system you are using.
+ * It sets the Lisp variable system-type. */
+
+#define SYSTEM_TYPE "usg-unix-v"
+
+/* Letter to use in finding device name of first pty,
+ * if system supports pty's. 'p' means it is /dev/ptyp0 */
+
+#define FIRST_PTY_LETTER 'z'
+
+/* define MAIL_USE_FLOCK if the mailer uses flock
+ * to interlock access to /usr/spool/mail/$USER.
+ * The alternative is that a lock file named
+ * /usr/spool/mail/$USER.lock. */
+
+/* #define MAIL_USE_FLOCK */
+
+/* The file containing the kernel's symbol table is called /unix. */
+
+#define KERNEL_FILE "/unix"
+
+/* The symbol in the kernel where the load average is found
+ * is named avenrun. */
+
+#define LDAV_SYMBOL "avenrun"
+
+/* Special hacks needed to make Emacs run on this system. */
-#define DONT_DEFINE_NO_REMAP /* `static' hack not needed */
-#include "usg5-3.h"
+/* On USG systems the system calls are interruptible by signals
+ * that the user program has elected to catch. Thus the system call
+ * must be retried in these cases. To handle this without massive
+ * changes in the source code, we remap the standard system call names
+ * to names for our own functions in sysdep.c that do the system call
+ * with retries. */
+
+#define INTERRUPTIBLE_OPEN
+#define INTERRUPTIBLE_IO
+
+/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
+
+#define ADDR_CORRECT(x) (x)
+
+/* Prevent -lg from being used for debugging. Not implemented? */
-#define USG5_4
+#define LIBS_DEBUG
+
+/* Use terminfo instead of termcap. */
+
+#define TERMINFO
+
+/* 5.3 apparently makes close() interruptible */
+
+#define INTERRUPTIBLE_CLOSE
+
+/* Apparently -lg is provided in 5.3 */
+
+#undef LIBS_DEBUG
+
+/* Enable support for shared libraries in unexec. */
+
+#define USG_SHARED_LIBRARIES
#define LIBS_SYSTEM "-lsocket -lnsl -lelf"
#define ORDINARY_LINK
-
-#if 0
-#ifdef ORDINARY_LINK
-#define LIB_STANDARD "-lc /usr/ucblib/libucb.a"
-#else
-#define START_FILES "pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o"
-#define LIB_STANDARD "-lc /usr/ucblib/libucb.a /usr/ccs/lib/crtn.o"
-#endif
-#else
-
-#ifdef ORDINARY_LINK
#define LIB_STANDARD
-#else
-#define START_FILES "pre-crt0.o /usr/ccs/lib/crt1.o /usr/ccs/lib/crti.o /usr/ccs/lib/values-Xt.o"
-#define LIB_STANDARD "-lc /usr/ccs/lib/crtn.o"
-#endif
-#endif
/* there are no -lg libraries on this system, and no libPW */
@@ -60,10 +103,6 @@
#define NO_SIOCTL_H
-/* Undump with ELF */
-
-#undef COFF
-
#define UNEXEC "unexelf.o"
/* Get <sys/ttold.h> to get struct
@@ -83,23 +122,6 @@
#include <sys/termios.h>
#endif
-#undef BROKEN_SIGIO
-
-/* We need bss_end from emacs.c for undumping */
-
-#ifndef USG_SHARED_LIBRARIES
-#define USG_SHARED_LIBRARIES
-#endif
-
-#undef BROKEN_TIOCGWINSZ
-#undef BROKEN_TIOCGETC
-
-/* This change means that we don't loop through allocate_pty too many
- times in the (rare) event of a failure. */
-
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER 'z'
-
/* This sets the name of the master side of the PTY. */
#define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx");
diff -r 75975fd0b7fc -r aa5ed11f473b src/s/xenix.h
--- a/src/s/xenix.h Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/* Definitions file for XEmacs running SCO Xenix 386 Release 2.2
- Copyright (C) 1988 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/*
- * Define symbols to identify the version of Unix this is.
- * Define all the symbols that apply correctly.
- */
-
-/* Synched up with: FSF 19.31. */
-
-/* #define UNIPLUS */
-#define XENIX
-#define USG5
-#define USG
-/* #define HPUX */
-/* #define UMAX */
-/* #define BSD4_1 */
-/* #define BSD4_2 */
-/* #define BSD4_3 */
-/* #define BSD */
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type. */
-
-#define SYSTEM_TYPE "xenix"
-
-/* If your system uses COFF (Common Object File Format) then define the
- preprocessor symbol "COFF". */
-
-/* #define COFF */
-
-/* Xenix requires completely different unexec code
- which lives in a separate file. Specify the file name. */
-
-#define UNEXEC "unexenix.o"
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
- to interlock access to /usr/spool/mail/$USER.
- The alternative is that a lock file named
- /usr/spool/mail/$USER.lock. */
-
-#define MAIL_USE_FLOCK
-
-/* Compensate for one incompatibility between Xenix and V.0. */
-#define n_zeroes n_name[0]
-
-/* The file containing the kernel's symbol table is called /xenix. */
-
-#define KERNEL_FILE "/xenix"
-
-/* The symbol in the kernel where the load average is found
- is named avenrun. */
-
-#define LDAV_SYMBOL "_avenrun"
-
-/* Special hacks needed to make Emacs run on this system. */
-
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch. Thus the system call
- must be retried in these cases. To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
-/* Compiler bug bites on many systems when default ADDR_CORRECT is used. */
-
-#define ADDR_CORRECT(x) (x)
-
-/* Prevent -lg from being used for debugging. Not implemented? */
-
-#define LIBS_DEBUG
-
-/* Switches for linking temacs. */
-
-#define LD_SWITCH_SYSTEM "-i"
-
-/* Use terminfo instead of termcap. */
-
-/* Tell Emacs to use Terminfo. */
-
-#define TERMINFO
-
-/* Tell Xenix curses to BE Terminfo. */
-#define M_TERMINFO
-
-/* Control program name for etc/fakemail to run. */
-
-#ifdef SMAIL
-#define MAIL_PROGRAM_NAME "/usr/bin/smail -q0"
-#else
-#define MAIL_PROGRAM_NAME "/usr/lib/mail/execmail"
-#endif
-
-/* Some variants have TIOCGETC, but the structures to go with it
- are not declared. */
-
-#define BROKEN_TIOCGETC
diff -r 75975fd0b7fc -r aa5ed11f473b src/strcmp.c
--- a/src/strcmp.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-/* This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not in FSF. */
-
-/* In SunOS 4.1.1 the strcmp and strncmp functions reference memory
- past the last byte of the string! This will core dump if the memory
- following the last byte is not mapped.
-
- Here are correct versions by hbs@lucid.com.
-*/
-
-# include <config.h>
-# ifndef REGISTER /* Strictly enforced in 20.3 */
-# define REGISTER
-# endif
-
-#include <string.h>
-#define ALIGNED(x) (!(((unsigned long) (x)) & (sizeof (unsigned long) - 1)))
-
-#define MAGIC 0x7efefeff
-#define HIGH_BIT_P(c) ((c) & hi_bit)
-#define HAS_ZERO(c) (((((c) + magic) ^ (c)) & not_magic) != not_magic)
-
-int
-strcmp (const char *x, const char *y)
-{
- if (x == y)
- return 0;
- else if (ALIGNED (x) && ALIGNED (y))
- {
- const unsigned long *x1 = (const unsigned long *) x;
- const unsigned long *y1 = (const unsigned long *) y;
- unsigned long c;
- unsigned long magic = MAGIC;
- unsigned long not_magic = ~magic;
- unsigned long hi_bit = 0x80000000;
-
- while ((c = *x1) == *y1)
- {
- if (HAS_ZERO(c))
- {
- if (!HIGH_BIT_P (c))
- return 0;
- else
- {
- x = (const char *) x1;
- y = (const char *) y1;
- goto slow_loop;
- }
- }
-
- x1++;
- y1++;
- }
-
- x = (const char *) x1;
- y = (const char *) y1;
- goto slow_loop;
- }
- else
- {
- char c;
-
- slow_loop:
-
- while ((c = *x) == *y)
- {
- if (c == (char) 0) return 0;
- x++;
- y++;
- }
- return (*x - *y);
- }
-}
-
-
-int
-strncmp (const char *x, const char *y, size_t n)
-{
- if ((x == y) || (n <= 0))
- return 0;
- else if (ALIGNED (x) && ALIGNED (y))
- {
- const unsigned long *x1 = (const unsigned long *) x;
- const unsigned long *y1 = (const unsigned long *) y;
- unsigned long c;
- unsigned long magic = MAGIC;
- unsigned long not_magic = ~magic;
- unsigned long hi_bit = 0x80000000;
-
- while ((c = *x1) == *y1)
- {
- n -= sizeof (unsigned long);
- if (n <= 0)
- return 0;
-
- if (HAS_ZERO(c))
- {
- if (!HIGH_BIT_P (c))
- return 0;
- else
- {
- x = (const char *) x1;
- y = (const char *) y1;
- goto slow_loop;
- }
- }
-
- x1++;
- y1++;
- }
-
- x = (const char *) x1;
- y = (const char *) y1;
- goto slow_loop;
- }
- else
- {
- char c;
-
- slow_loop:
-
- while ((c = *x) == *y)
- {
- n--;
- if (n <= 0)
- return 0;
- if (c == (char) 0)
- return 0;
- x++;
- y++;
- }
- return (*x - *y);
- }
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/strcpy.c
--- a/src/strcpy.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/* This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not in FSF. */
-
-/* In SunOS 4.1.1 the strcpy function references memory past the last byte of
- the string! This will core dump if the memory following the last byte is
- not mapped.
-
- Here are correct versions by hbs@lucid.com.
-*/
-
-# include <config.h>
-# ifndef REGISTER /* Strictly enforced in 20.3 */
-# define REGISTER
-# endif
-
-#define ALIGNED(x) (!(((unsigned long) (x)) & (sizeof (unsigned long) - 1)))
-
-#define MAGIC 0x7efefeff
-#define HIGH_BIT_P(c) ((c) & hi_bit)
-#define HAS_ZERO(c) (((((c) + magic) ^ (c)) & not_magic) != not_magic)
-
-char *
-strcpy (char *to, const char *from)
-{
- char *return_value = to;
- if (to == from)
- return to;
- else if (ALIGNED (to) && ALIGNED (from))
- {
- unsigned long *to1 = (unsigned long *) to;
- const unsigned long *from1 = (const unsigned long *) from;
- unsigned long c;
- unsigned long magic = MAGIC;
- unsigned long not_magic = ~magic;
-/* unsigned long hi_bit = 0x80000000; */
-
- while ((c = *from1) != 0)
- {
- if (HAS_ZERO(c))
- {
- to = (char *) to1;
- from = (const char *) from1;
- goto slow_loop;
- }
- else
- {
- *to1 = c;
- to1++;
- from1++;
- }
- }
-
- to = (char *) to1;
- *to = (char) 0;
- return return_value;
- }
- else
- {
- char c;
-
- slow_loop:
-
- while ((c = *from) != 0)
- {
- *to = c;
- to++;
- from++;
- }
- *to = (char) 0;
- }
- return return_value;
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/sunOS-fix.c
--- a/src/sunOS-fix.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-/* This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not in FSF. */
-
-int sunOS_fix_is_empty;
diff -r 75975fd0b7fc -r aa5ed11f473b src/sunplay.c
--- a/src/sunplay.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/sunplay.c Wed Nov 18 08:49:14 2009 -0700
@@ -45,10 +45,6 @@
init_device (int volume, Binbyte *data, int fd,
unsigned int *header_length)
{
-#ifdef SUNOS4_0_3
- if (header_length) *header_length = 0;
- return 0;
-#else
Audio_hdr file_hdr;
reset_volume_p = 0;
@@ -108,7 +104,6 @@
}
return 0;
-#endif
}
diff -r 75975fd0b7fc -r aa5ed11f473b src/syntax.c
--- a/src/syntax.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/syntax.c Wed Nov 18 08:49:14 2009 -0700
@@ -2069,7 +2069,6 @@
case Sopen:
if (stopbefore) goto stop; /* this arg means stop at sexp start */
depth++;
- /* curlevel++->last ran into compiler bug on Apollo */
curlevel->last = from - 1;
if (++curlevel == endlevel)
stack_overflow ("Nesting too deep for parser",
diff -r 75975fd0b7fc -r aa5ed11f473b src/sysdep.c
--- a/src/sysdep.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/sysdep.c Wed Nov 18 08:49:14 2009 -0700
@@ -83,15 +83,6 @@
#ifdef USG
#include <sys/utsname.h>
-#if defined (TIOCGWINSZ) || defined (ISC4_0)
-#ifdef NEED_SIOCTL
-#include <sys/sioctl.h>
-#endif
-#ifdef NEED_PTEM_H
-#include <sys/stream.h>
-#include <sys/ptem.h>
-#endif
-#endif /* TIOCGWINSZ or ISC4_0 */
#endif /* USG */
/* LPASS8 is new in 4.3, and makes cbreak mode provide all 8 bits. */
@@ -117,12 +108,6 @@
#endif
-#ifdef AIXHFT
-static void hft_init (struct console *c);
-static void hft_reset (struct console *c);
-#include <sys/termio.h>
-#endif
-
#ifdef HAVE_TTY
#define USED_IF_TTY(decl) decl
#else
@@ -231,17 +216,7 @@
less danger of race conditions and some of the comments below
don't apply. This should be updated. */
-#if defined (NO_SUBPROCESSES)
- while (1)
- {
- /* No need to be tricky like below; we can just call wait(). */
- /* #### should figure out how to write a wait_allowing_quit().
- Since hardly any systems don't have subprocess support,
- however, there doesn't seem to be much point. */
- if (wait (0) == pid)
- return;
- }
-#elif defined (HAVE_WAITPID)
+#if defined (HAVE_WAITPID)
/* Note that, whenever any subprocess terminates (asynch. or synch.),
the SIGCHLD handler will be called and it will call wait(). Thus
we cannot just call wait() ourselves, and we can't block SIGCHLD
@@ -383,8 +358,6 @@
#endif /* NEED_SYNC_PROCESS_CODE */
-#if !defined (NO_SUBPROCESSES)
-
/*
* flush any pending output
* (may flush input as well; it does not matter the way we use it)
@@ -544,20 +517,11 @@
#endif /* not HAVE_TERMIO */
emacs_set_tty (out, &s, 0);
-
-#ifdef RTU
- {
- int zero = 0;
- ioctl (out, FIOASYNC, &zero);
- }
-#endif /* RTU */
}
#endif /* WIN32_NATIVE */
-#endif /* not NO_SUBPROCESSES */
-
-#if !defined (SIGTSTP) && !defined (USG_JOBCTRL)
+#if !defined (SIGTSTP)
#define SIG_PARAM_TYPE int
@@ -589,112 +553,7 @@
}
}
-
-/* Fork a subshell. */
-static void
-sys_subshell (void)
-{
- Lisp_Object dir;
- Ibyte *str = 0;
- Bytecount len;
- struct gcpro gcpro1;
- Ibyte *sh = 0;
- Extbyte *shext;
-
- /* Use our buffer's default directory for the subshell. */
-
- /* Note: These calls are spread out to insure that the return values
- of the calls (which may be newly-created strings) are properly
- GC-protected. */
-
- GCPRO1 (dir);
-
- dir = current_buffer->directory;
- /* If the current dir has no terminating slash, we'll get undesirable
- results, so put the slash back. */
- dir = Ffile_name_as_directory (dir);
- dir = Funhandled_file_name_directory (dir);
- dir = expand_and_dir_to_file (dir, Qnil);
-
- str = alloca_ibytes (XSTRING_LENGTH (dir) + 2);
- len = XSTRING_LENGTH (dir);
- memcpy (str, XSTRING_DATA (dir), len);
- if (!IS_ANY_SEP (str[len - 1]))
- str[len++] = DIRECTORY_SEP;
- str[len] = 0;
-
- if (sh == 0)
- sh = egetenv ("SHELL");
- if (sh == 0)
- sh = (Ibyte *) "sh";
-
- PATHNAME_CONVERT_OUT (sh, shext);
-
- UNGCPRO;
-
-#ifdef WIN32_NATIVE
-
- if (str)
- qxe_chdir (str);
-
- /* Waits for process completion */
- if (XEUNICODE_P ?
- _wspawnlp (_P_WAIT, (const wchar_t *) shext,
- (const wchar_t *) shext, NULL) != 0 :
- _spawnlp (_P_WAIT, shext, shext, NULL) != 0)
- report_process_error ("Can't spawn subshell", Qunbound);
- else
- return; /* we're done, no need to wait for termination */
-
-#else /* not WIN32_NATIVE */
-
- {
- int pid;
- struct save_signal saved_handlers[5];
-
- saved_handlers[0].code = SIGINT;
- saved_handlers[1].code = SIGQUIT;
- saved_handlers[2].code = SIGTERM;
-#ifdef SIGIO
- saved_handlers[3].code = SIGIO;
- saved_handlers[4].code = 0;
-#else
- saved_handlers[3].code = 0;
-#endif
-
- pid = fork ();
-
- if (pid == -1)
- report_process_error ("Can't spawn subshell", Qunbound);
- if (pid == 0)
- {
- if (str)
- qxe_chdir (str);
-
-#if !defined (NO_SUBPROCESSES)
- close_process_descs (); /* Close Emacs's pipes/ptys */
-#endif
-
-#ifdef SET_EMACS_PRIORITY
- if (emacs_priority != 0)
- nice (-emacs_priority); /* Give the new shell the default priority */
-#endif
-
- execlp (shext, shext, 0);
- retry_write (1, "Can't execute subshell", 22);
- _exit (1);
- }
-
- save_signal_handlers (saved_handlers);
- synch_process_alive = 1;
- wait_for_termination (pid);
- restore_signal_handlers (saved_handlers);
- }
-
-#endif /* not WIN32_NATIVE */
-}
-
-#endif /* !defined (SIGTSTP) && !defined (USG_JOBCTRL) */
+#endif /* !defined (SIGTSTP) */
@@ -708,18 +567,10 @@
EMACS_KILLPG (pgrp, SIGTSTP);
}
-#elif defined (USG_JOBCTRL)
+#else /* No SIGTSTP */
/* If you don't know what this is don't mess with it */
ptrace (0, 0, 0, 0); /* set for ptrace - caught by csh */
kill (getpid (), SIGQUIT);
-
-#else /* No SIGTSTP or USG_JOBCTRL */
-
- /* On a system where suspending is not implemented,
- instead fork a subshell and let it talk directly to the terminal
- while we wait. */
- sys_subshell ();
-
#endif
}
@@ -734,8 +585,7 @@
)
{
/* I don't doubt that it is possible to suspend processes on
- * VMS machines or thost that use USG_JOBCTRL,
- * but I don't know how to do it, so...
+ * VMS machines, but I don't know how to do it, so...
*/
#if defined (SIGTSTP)
kill(process, SIGTSTP);
@@ -885,15 +735,6 @@
#endif
)
{
-#ifdef IBMRTAIX
- /* On AIX, the parent gets SIGHUP when a pty attached child dies. So, we */
- /* ignore SIGHUP once we've started a child on a pty. Note that this may */
- /* cause EMACS not to die when it should, i.e., when its own controlling */
- /* tty goes away. I've complained to the AIX developers, and they may */
- /* change this behavior, but I'm not going to hold my breath. */
- EMACS_SIGNAL (SIGHUP, SIG_IGN);
-#endif /* IBMRTAIX */
-
#ifdef TIOCPKT
/* In some systems (Linux through 2.0.0, at least), packet mode doesn't
get cleared when a pty is closed, so we need to clear it here.
@@ -941,11 +782,6 @@
sg.c_cflag = B9600;
tcgetattr (input_fd, &sg);
DEVICE_TTY_DATA (d)->ospeed = cfgetospeed (&sg);
-# if defined (USE_GETOBAUD) && defined (getobaud)
- /* m88k-motorola-sysv3 needs this (ghazi@noc.rutgers.edu) 9/1/94. */
- if (DEVICE_TTY_DATA (d)->ospeed == 0)
- DEVICE_TTY_DATA (d)->ospeed = getobaud (sg.c_cflag);
-# endif
#elif defined (HAVE_TERMIO)
struct termio sg;
@@ -1009,12 +845,7 @@
}
#elif defined (F_SETOWN) && !defined (F_SETOWN_BUG)
DEVICE_OLD_FCNTL_OWNER (d) = fcntl (filedesc, F_GETOWN, 0);
-# ifdef F_SETOWN_SOCK_NEG
- /* stdin is a socket here */
- fcntl (filedesc, F_SETOWN, -getpid ());
-# else
fcntl (filedesc, F_SETOWN, getpid ());
-# endif
#endif
}
@@ -1069,7 +900,7 @@
particular need to switch. --ben
*/
-#if defined (I_SETSIG) && !defined (HPUX10) && !defined (LINUX)
+#if defined (I_SETSIG) && !defined (HPUX11) && !defined (LINUX)
{
int events = 0;
ioctl (filedesc, I_GETSIG, &events);
@@ -1109,10 +940,6 @@
ioctl (filedesc, FIOASYNC, &on);
}
#endif
-
-#if defined (_CX_UX) /* #### Is this crap necessary? */
- EMACS_UNBLOCK_SIGNAL (SIGIO);
-#endif
}
static void
@@ -1120,7 +947,7 @@
{
int filedesc = DEVICE_INFD (d);
-#if defined (I_SETSIG) && !defined (HPUX10) && !defined (LINUX)
+#if defined (I_SETSIG) && !defined (HPUX11) && !defined (LINUX)
{
int events = 0;
ioctl (filedesc, I_GETSIG, &events);
@@ -1465,6 +1292,7 @@
/* We cannot use memcmp on the whole structure here because under
* aix386 the termios structure has some reserved field that may
* not be filled in.
+ * FIXME: Now that aix386 is gone, can we memcmp the whole structure?
*/
if ( new_.c_iflag == settings->main.c_iflag
&& new_.c_oflag == settings->main.c_oflag
@@ -1511,18 +1339,6 @@
#ifdef HAVE_TTY
-/* This may also be defined in stdio,
- but if so, this does no harm,
- and using the same name avoids wasting the other one's space. */
-
-#if ((defined(USG) || defined(DGUX)) && !defined(__STDC__))
-char _sobuf[BUFSIZ+8];
-#elif (defined(USG) && !defined(LINUX) && !defined(_SCO_DS)) || defined(IRIX5)
-extern unsigned char _sobuf[BUFSIZ+8];
-#else
-char _sobuf[BUFSIZ];
-#endif
-
#if defined (TIOCGLTC) && defined (HAVE_LTCHARS) /* HAVE_LTCHARS */
static struct ltchars new_ltchars = {-1,-1,-1,-1,-1,-1};
#endif
@@ -1537,15 +1353,9 @@
{
struct emacs_tty tty;
int input_fd;
-#if defined (IBMR2AIX) && defined (AIXHFT)
- int output_fd;
-#endif
struct console *con = XCONSOLE (DEVICE_CONSOLE (d));
input_fd = CONSOLE_TTY_DATA (con)->infd;
-#if defined (IBMR2AIX) && defined (AIXHFT)
- output_fd = CONSOLE_TTY_DATA (con)->outfd;
-#endif
emacs_get_tty (input_fd, &CONSOLE_TTY_DATA (con)->old_tty);
tty = CONSOLE_TTY_DATA (con)->old_tty;
@@ -1555,10 +1365,6 @@
#if defined (HAVE_TERMIO) || defined (HAVE_TERMIOS)
/* after all those years... */
con->tty_erase_char = make_char (tty.main.c_cc[VERASE]);
-#ifdef DGUX
- /* This allows meta to be sent on 8th bit. */
- tty.main.c_iflag &= ~INPCK; /* don't check input for parity */
-#endif
tty.main.c_iflag |= (IGNBRK); /* Ignore break condition */
tty.main.c_iflag &= ~ICRNL; /* Disable map of CR to NL on input */
#ifdef ISTRIP
@@ -1653,11 +1459,6 @@
#ifdef VSTOP
tty.main.c_cc[VSTOP] = _POSIX_VDISABLE;
#endif /* VSTOP */
-#ifdef SET_LINE_DISCIPLINE
- /* Need to explicitly request TERMIODISC line discipline or
- Ultrix's termios does not work correctly. */
- tty.main.c_line = SET_LINE_DISCIPLINE;
-#endif
#ifdef AIX
#ifndef IBMR2AIX
@@ -1705,16 +1506,6 @@
tty.lmode = LDECCTQ | LLITOUT | LPASS8 | LNOFLSH |
CONSOLE_TTY_DATA (con)->old_tty.lmode;
-
-#if defined (ultrix) || defined (__bsdi__)
- /* Under Ultrix 4.2a, leaving this out doesn't seem to hurt
- anything, and leaving it in breaks the meta key. Go figure. */
- /* Turning off ONLCR is enough under BSD/386. Leave the general
- output post-processing flag alone since for some reason it
- doesn't get reset after XEmacs goes away. */
- tty.lmode &= ~LLITOUT;
-#endif
-
#endif /* HAVE_TCHARS */
#endif /* not HAVE_TERMIO */
@@ -1734,37 +1525,12 @@
if (!TTY_FLAGS (con).flow_control) ioctl (input_fd, TIOCSTART, 0);
#endif
-#if defined (HAVE_TERMIOS) || defined (HPUX9)
+#if defined (HAVE_TERMIOS)
#ifdef TCOON
if (!TTY_FLAGS (con).flow_control) tcflow (input_fd, TCOON);
#endif
#endif
-#ifdef AIXHFT
- hft_init (con);
-#ifdef IBMR2AIX
- {
- /* IBM's HFT device usually thinks a ^J should be LF/CR.
- We need it to be only LF. This is the way that is
- done. */
- struct termio tty;
-
- if (ioctl (output_fd, HFTGETID, &tty) != -1)
- retry_write (output_fd, "\033[20l", 5);
- }
-#endif
-#endif
-
-#if 0 /* We do our own buffering with lstreams. */
-#ifdef _IOFBF
- /* This symbol is defined on recent USG systems.
- Someone says without this call USG won't really buffer the file
- even with a call to setbuf. */
- setvbuf (CONSOLE_TTY_DATA (con)->outfd, (char *) _sobuf, _IOFBF,
- sizeof (_sobuf));
-#else
- setbuf (CONSOLE_TTY_DATA (con)->outfd, (char *) _sobuf);
-#endif
-#endif
+
set_tty_modes (con);
}
@@ -1931,28 +1697,17 @@
static void
tty_reset_sys_modes_on_device (struct device *d)
{
-#if defined (BSD) || (defined (IBMR2AIX) && defined (AIXHFT))
+#if defined (BSD)
int output_fd;
#endif
int input_fd;
struct console *con = XCONSOLE (DEVICE_CONSOLE (d));
input_fd = CONSOLE_TTY_DATA (con)->infd;
-#if defined (BSD) || (defined (IBMR2AIX) && defined (AIXHFT))
+#if defined (BSD)
output_fd = CONSOLE_TTY_DATA (con)->outfd;
#endif
-#if defined (IBMR2AIX) && defined (AIXHFT)
- {
- /* HFT consoles normally use ^J as a LF/CR. We forced it to
- do the LF only. Now, we need to reset it. */
- struct termio tty;
-
- if (ioctl (output_fd, HFTGETID, &tty) != -1)
- retry_write (output_fd, "\033[20h", 5);
- }
-#endif
-
tty_redisplay_shutdown (con);
/* reset_tty_modes() flushes the connection at its end. */
reset_tty_modes (con);
@@ -1965,18 +1720,6 @@
while (emacs_set_tty (input_fd, &CONSOLE_TTY_DATA (con)->old_tty, 0)
< 0 && errno == EINTR)
;
-
-#ifdef SET_LINE_DISCIPLINE
- /* Ultrix's termios *ignores* any line discipline except TERMIODISC.
- A different old line discipline is therefore not restored, yet.
- Restore the old line discipline by hand. */
- ioctl (input_fd, TIOCSETD, &old_tty.main.c_line);
-#endif
-
-#ifdef AIXHFT
- hft_reset (con);
-#endif
-
}
#endif /* HAVE_TTY */
@@ -2040,118 +1783,6 @@
}
-/* ------------------------------------------------------ */
-/* extra TTY stuff under AIX */
-/* ------------------------------------------------------ */
-
-#ifdef AIXHFT
-
-/* Called from init_sys_modes. */
-static void
-hft_init (struct console *con)
-{
- int junk;
- int input_fd;
-
- assert (CONSOLE_TTY_P (con));
- input_fd = CONSOLE_TTY_DATA (con)->infd;
-
- /* If we're not on an HFT we shouldn't do any of this. We determine
- if we are on an HFT by trying to get an HFT error code. If this
- call fails, we're not on an HFT. */
-#ifdef IBMR2AIX
- if (ioctl (input_fd, HFQERROR, &junk) < 0)
- return;
-#else /* not IBMR2AIX */
- if (ioctl (input_fd, HFQEIO, 0) < 0)
- return;
-#endif /* not IBMR2AIX */
-
- /* On AIX the default hft keyboard mapping uses backspace rather than delete
- as the rubout key's ASCII code. Here this is changed. The bug is that
- there's no way to determine the old mapping, so in reset_one_console
- we need to assume that the normal map had been present. Of course, this
- code also doesn't help if on a terminal emulator which doesn't understand
- HFT VTD's. */
- {
- struct hfbuf buf;
- struct hfkeymap keymap;
-
- buf.hf_bufp = (char *)&keymap;
- buf.hf_buflen = sizeof (keymap);
- keymap.hf_nkeys = 2;
- keymap.hfkey[0].hf_kpos = 15;
- keymap.hfkey[0].hf_kstate = HFMAPCHAR | HFSHFNONE;
-#ifdef IBMR2AIX
- keymap.hfkey[0].hf_keyidh = '<';
-#else /* not IBMR2AIX */
- keymap.hfkey[0].hf_page = '<';
-#endif /* not IBMR2AIX */
- keymap.hfkey[0].hf_char = 127;
- keymap.hfkey[1].hf_kpos = 15;
- keymap.hfkey[1].hf_kstate = HFMAPCHAR | HFSHFSHFT;
-#ifdef IBMR2AIX
- keymap.hfkey[1].hf_keyidh = '<';
-#else /* not IBMR2AIX */
- keymap.hfkey[1].hf_page = '<';
-#endif /* not IBMR2AIX */
- keymap.hfkey[1].hf_char = 127;
- hftctl (input_fd, HFSKBD, &buf);
- }
- /* #### Should probably set a console TTY flag here. */
-#if 0
- /* The HFT system on AIX doesn't optimize for scrolling, so it's really ugly
- at times. */
- line_ins_del_ok = char_ins_del_ok = 0;
-#endif /* 0 */
-}
-
-/* Reset the rubout key to backspace. */
-
-static void
-hft_reset (struct console *con)
-{
- struct hfbuf buf;
- struct hfkeymap keymap;
- int junk;
- int input_fd;
-
- assert (CONSOLE_TTY_P (con));
- input_fd = CONSOLE_TTY_DATA (con)->infd;
-
-#ifdef IBMR2AIX
- if (ioctl (input_fd, HFQERROR, &junk) < 0)
- return;
-#else /* not IBMR2AIX */
- if (ioctl (input_fd, HFQEIO, 0) < 0)
- return;
-#endif /* not IBMR2AIX */
-
- buf.hf_bufp = (char *)&keymap;
- buf.hf_buflen = sizeof (keymap);
- keymap.hf_nkeys = 2;
- keymap.hfkey[0].hf_kpos = 15;
- keymap.hfkey[0].hf_kstate = HFMAPCHAR | HFSHFNONE;
-#ifdef IBMR2AIX
- keymap.hfkey[0].hf_keyidh = '<';
-#else /* not IBMR2AIX */
- keymap.hfkey[0].hf_page = '<';
-#endif /* not IBMR2AIX */
- keymap.hfkey[0].hf_char = 8;
- keymap.hfkey[1].hf_kpos = 15;
- keymap.hfkey[1].hf_kstate = HFMAPCHAR | HFSHFSHFT;
-#ifdef IBMR2AIX
- keymap.hfkey[1].hf_keyidh = '<';
-#else /* not IBMR2AIX */
- keymap.hfkey[1].hf_page = '<';
-#endif /* not IBMR2AIX */
- keymap.hfkey[1].hf_char = 8;
- hftctl (input_fd, HFSKBD, &buf);
-}
-
-#endif /* AIXHFT */
-
-
/************************************************************************/
/* limits of text/data segments */
/************************************************************************/
@@ -2446,11 +2077,6 @@
systems. However, I don't want to deal with the potential
evil ramifications of this at this point. */
-#ifdef DGUX
- /* This gets us restartable system calls for efficiency.
- The "else" code will work as well. */
- return (berk_signal (signal_number, action));
-#else
sigemptyset (&new_action.sa_mask);
new_action.sa_handler = action;
#if defined (SA_RESTART)
@@ -2463,7 +2089,6 @@
#endif
sigaction (signal_number, &new_action, &old_action);
return (old_action.sa_handler);
-#endif /* DGUX */
#else /* not 0 */
@@ -2511,7 +2136,7 @@
#ifndef HAVE_STRERROR
-#if !defined(NeXT) && !defined(__alpha) && !defined(MACH) && !defined(LINUX) && !defined(IRIX) && !defined(__NetBSD__)
+#if !defined(__alpha) && !defined(MACH) && !defined(LINUX) && !defined(IRIX) && !defined(__NetBSD__)
/* Linux added here by Raymond L. Toy <toy@alydar.crd.ge.com> for XEmacs. */
/* Irix added here by gparker@sni-usa.com for XEmacs. */
/* NetBSD added here by James R Grinter <jrg@doc.ic.ac.uk> for XEmacs */
@@ -3900,12 +3525,6 @@
DEFER_GETTEXT ("LAN I/O interrupt"), /* 25 SIGAIO */
DEFER_GETTEXT ("PTY I/O interrupt"), /* 26 SIGPTY */
DEFER_GETTEXT ("I/O intervention required"), /* 27 SIGIOINT */
-#ifdef AIXHFT
- "HFT grant", /* 28 SIGGRANT */
- "HFT retract", /* 29 SIGRETRACT */
- "HFT sound done", /* 30 SIGSOUND */
- "HFT input ready", /* 31 SIGMSG */
-#endif
/* $$####end-snarf */
0
};
@@ -3959,79 +3578,6 @@
};
#endif /* not AIX */
#endif /* USG */
-#ifdef DGUX
-const char *sys_siglist[NSIG + 1] =
- {
- /* $$####begin-snarf */
- "null signal", /* 0 SIGNULL */
- "hangup", /* 1 SIGHUP */
- "interrupt", /* 2 SIGINT */
- "quit", /* 3 SIGQUIT */
- "illegal instruction", /* 4 SIGILL */
- "trace trap", /* 5 SIGTRAP */
- "abort termination", /* 6 SIGABRT */
- "SIGEMT", /* 7 SIGEMT */
- "floating point exception", /* 8 SIGFPE */
- "kill", /* 9 SIGKILL */
- "bus error", /* 10 SIGBUS */
- "segmentation violation", /* 11 SIGSEGV */
- "bad argument to system call", /* 12 SIGSYS */
- "write on a pipe with no reader", /* 13 SIGPIPE */
- "alarm clock", /* 14 SIGALRM */
- "software termination signal", /* 15 SIGTERM */
- "user defined signal 1", /* 16 SIGUSR1 */
- "user defined signal 2", /* 17 SIGUSR2 */
- "child stopped or terminated", /* 18 SIGCLD */
- "power-fail restart", /* 19 SIGPWR */
- "window size changed", /* 20 SIGWINCH */
- "undefined", /* 21 */
- "pollable event occurred", /* 22 SIGPOLL */
- "sendable stop signal not from tty", /* 23 SIGSTOP */
- "stop signal from tty", /* 24 SIGSTP */
- "continue a stopped process", /* 25 SIGCONT */
- "attempted background tty read", /* 26 SIGTTIN */
- "attempted background tty write", /* 27 SIGTTOU */
- "undefined", /* 28 */
- "undefined", /* 29 */
- "undefined", /* 30 */
- "undefined", /* 31 */
- "undefined", /* 32 */
- "socket (TCP/IP) urgent data arrival", /* 33 SIGURG */
- "I/O is possible", /* 34 SIGIO */
- "exceeded cpu time limit", /* 35 SIGXCPU */
- "exceeded file size limit", /* 36 SIGXFSZ */
- "virtual time alarm", /* 37 SIGVTALRM */
- "profiling time alarm", /* 38 SIGPROF */
- "undefined", /* 39 */
- "file record locks revoked", /* 40 SIGLOST */
- "undefined", /* 41 */
- "undefined", /* 42 */
- "undefined", /* 43 */
- "undefined", /* 44 */
- "undefined", /* 45 */
- "undefined", /* 46 */
- "undefined", /* 47 */
- "undefined", /* 48 */
- "undefined", /* 49 */
- "undefined", /* 50 */
- "undefined", /* 51 */
- "undefined", /* 52 */
- "undefined", /* 53 */
- "undefined", /* 54 */
- "undefined", /* 55 */
- "undefined", /* 56 */
- "undefined", /* 57 */
- "undefined", /* 58 */
- "undefined", /* 59 */
- "undefined", /* 60 */
- "undefined", /* 61 */
- "undefined", /* 62 */
- "undefined", /* 63 */
- "notification message in mess. queue", /* 64 SIGDGNOTIFY */
- /* $$####end-snarf */
- 0
- };
-#endif /* DGUX */
#endif /* (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) */
@@ -4044,7 +3590,7 @@
#include <dirent.h>
-#if defined(BROKEN_CLOSEDIR) || !defined(HAVE_CLOSEDIR)
+#if !defined(HAVE_CLOSEDIR)
int
closedir (DIR *dirp) /* stream from opendir */
{
@@ -4061,7 +3607,7 @@
xfree (dirp, DIR *);
return (rtnval);
}
-#endif /* BROKEN_CLOSEDIR or not HAVE_CLOSEDIR */
+#endif /* not HAVE_CLOSEDIR */
#endif /* SYSV_SYSTEM_DIR */
#ifdef NONSYSTEM_DIR_LIBRARY
diff -r 75975fd0b7fc -r aa5ed11f473b src/sysfile.h
--- a/src/sysfile.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/sysfile.h Wed Nov 18 08:49:14 2009 -0700
@@ -353,7 +353,6 @@
linuxplay.c sgiplay.c sunplay.c
hpplay.c nas.c)
-- all unex* files
- -- hftctl.c
-- lib-src files
*/
diff -r 75975fd0b7fc -r aa5ed11f473b src/sysproc.h
--- a/src/sysproc.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/sysproc.h Wed Nov 18 08:49:14 2009 -0700
@@ -30,8 +30,6 @@
#include <sys/resource.h>
#endif
-#if !defined (NO_SUBPROCESSES)
-
#ifdef MINGW
#include <../mingw/process.h>
#elif defined (CYGWIN)
@@ -53,11 +51,6 @@
# include <netinet/in.h>
# include <arpa/inet.h>
# endif
-# ifdef NEED_NET_ERRNO_H
-# include <net/errno.h>
-# endif /* NEED_NET_ERRNO_H */
-#elif defined (SKTPAIR)
-# include <sys/socket.h>
#endif /* HAVE_SOCKETS */
#ifdef WIN32_NATIVE
@@ -118,12 +111,6 @@
/* Define first descriptor number available for subprocesses. */
#define FIRST_PROC_DESC 3
-#ifdef IRIS
-# include <sys/sysmacros.h> /* for "minor" */
-#endif /* not IRIS */
-
-#endif /* !NO_SUBPROCESSES */
-
#ifdef AIX
#include <sys/select.h>
#endif
@@ -203,7 +190,7 @@
#include "syssignal.h" /* needed for SIGTSTP */
-#if !defined (WIN32_NATIVE) && ((!defined (SIGTSTP) && !defined (USG_JOBCTRL)) || !defined (HAVE_MKDIR) || !defined (HAVE_RMDIR))
+#if !defined (WIN32_NATIVE) && (!defined (SIGTSTP) || !defined (HAVE_MKDIR) || !defined (HAVE_RMDIR))
#define NEED_SYNC_PROCESS_CODE
diff -r 75975fd0b7fc -r aa5ed11f473b src/syssignal.h
--- a/src/syssignal.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/syssignal.h Wed Nov 18 08:49:14 2009 -0700
@@ -107,9 +107,7 @@
Possibly we should use the new "qxe" convention.
*/
-#ifndef NeXT
typedef RETSIGTYPE (XCDECL * signal_handler_t) (int);
-#endif
#if defined (HAVE_SIGPROCMASK)
diff -r 75975fd0b7fc -r aa5ed11f473b src/systty.h
--- a/src/systty.h Wed Nov 18 22:44:28 2009 +0900
+++ b/src/systty.h Wed Nov 18 08:49:14 2009 -0700
@@ -60,9 +60,6 @@
/***** (2) The TERMIO way (system V style) *****/
-# ifdef __DGUX
-# include <sys/ioctl.h>
-# endif
# ifndef NO_TERMIO
# include <termio.h>
# endif /* not NO_TERMIO */
@@ -100,27 +97,15 @@
/* Generally useful to include this file: */
-/* But Sun OS has broken include files and doesn't want it included */
-#if !defined (WIN32_NATIVE) && !defined (SUNOS4)
+#if !defined (WIN32_NATIVE)
# include <sys/ioctl.h>
#endif
-/* UNIPLUS systems may have FIONREAD. */
-#ifdef UNIPLUS
-#include <sys.ioctl.h>
-#endif
/* ----------------------------------------------------- */
/* miscellaneous includes */
/* ----------------------------------------------------- */
-#ifdef AIXHFT /* obsolete - only found in AIX version 3. */
-/* Get files for keyboard remapping */
-#define HFNKEYS 2
-#include <sys/hft.h>
-#include <sys/devinfo.h>
-#endif
-
/* Include files for PTY's */
#if defined (HAVE_SYS_PTYIO_H) /* HP-UX */
@@ -142,18 +127,13 @@
/* ----------------------------------------------------- */
-#if defined (XENIX) || defined (BROKEN_TIOCGETC)
+#if defined (BROKEN_TIOCGETC)
#undef TIOCGETC /* Avoid confusing some conditionals that test this. */
#endif
/* XEmacs: SIGIO is cleaned up so we remove the crap here that messes
with it (and FIONREAD and FASYNC, which are related). */
-#ifdef BROKEN_TIOCGWINSZ /* XEmacs addition */
-#undef TIOCGWINSZ
-#undef TIOCSWINSZ
-#endif
-
/* On TERMIOS systems, the tcmumbleattr calls take care of these
parameters, and it's a bad idea to use them (on AIX, it makes the
tty hang for a long time). */
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexaix.c
--- a/src/unexaix.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/unexaix.c Wed Nov 18 08:49:14 2009 -0700
@@ -588,13 +588,7 @@
LDHDR ldhdr;
LDREL ldrel;
ulong t_reloc = (ulong) &_text - f_ohdr.text_start;
-#ifndef ALIGN_DATA_RELOC
ulong d_reloc = (ulong) &_data - f_ohdr.data_start;
-#else
- /* This worked (and was needed) before AIX 4.2.
- I have no idea why. -- Mike */
- ulong d_reloc = (ulong) &_data - ALIGN(f_ohdr.data_start, 2);
-#endif
int * p;
if (load_scnptr == 0)
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexapollo.c
--- a/src/unexapollo.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,296 +0,0 @@
-/* unexapollo.c -- COFF File UNEXEC for XEmacs on Apollo SR10.x
- Copyright (C) 1988, 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-/* Written by Leonard N. Zubkoff. */
-
-#include <config.h>
-#include <fcntl.h>
-
-
-#include <a.out.h>
-#include <sys/file.h>
-#include <apollo/base.h>
-#include <apollo/ios.h>
-#include <apollo/type_uids.h>
-#include <apollo/dst.h>
-
-
-#define DST_RECORD_HDR_SIZE 2
-#define LONG_ALIGN(X) (((X)+3)&(~3))
-
-
-void
-unexec (target_file_name, source_file_name)
- char *target_file_name, *source_file_name;
-{
- struct filehdr file_header;
- struct aouthdr domain_header;
- struct scnhdr *section, *sections, *sections_limit;
- struct scnhdr *first_data_section, *last_data_section;
- struct scnhdr *rwdi_section, *blocks_section;
- struct reloc reloc_entry;
- unsigned long data_size, old_data_section_size, source_file_offset_past_rwdi;
- unsigned char buffer[4096];
- long delta_before_rwdi, delta_after_rwdi, byte_count;
- long first_changed_vaddr, old_rwdi_vaddr, i;
- ios_$id_t target_file, source_file;
- status_$t status;
- /* Open the Source File. */
- if ((source_file = open (source_file_name, O_RDONLY)) < 0)
- signal_error (Qfile_error, "cannot open source file for input", Qunbound);
- /* Read the File Header. */
- if (read (source_file, &file_header, sizeof (file_header)) != sizeof (file_header))
- signal_error (Qfile_error, "cannot read file header", Qunbound);
-
- /* Read the Domain Header. */
- if (read (source_file, &domain_header, sizeof (domain_header))
- != sizeof (domain_header))
- signal_error (Qfile_error, "cannot read domain header", Qunbound);
- /* Read the Section Headers. */
- sections =
- (struct scnhdr *) malloc (file_header.f_nscns*sizeof (struct scnhdr));
- if (sections == (struct scnhdr *) 0)
- out_of_memory ("cannot allocate section header storage", Qunbound);
- sections_limit = sections + file_header.f_nscns;
- if (read (source_file, sections, file_header.f_nscns*sizeof (struct scnhdr))
- != file_header.f_nscns*sizeof (struct scnhdr))
- signal_error (Qfile_error, "cannot read section headers", Qunbound);
- /* Compute the new Size of the Data Section. */
- data_size = sbrk (0) - domain_header.data_start;
- delta_before_rwdi = delta_after_rwdi = data_size - domain_header.dsize;
- old_rwdi_vaddr = 0;
- /* Find and Deallocate the .rwdi Section Information. */
- for (rwdi_section = sections; rwdi_section != sections_limit; rwdi_section++)
- if (strcmp (rwdi_section->s_name, ".rwdi") == 0)
- {
- /* If there are relocation entries, we cannot "unrelocate" them. */
- if (rwdi_section->s_nreloc > 0)
- signal_error (Qio_error, ".rwdi section needs relocation - cannot dump Emacs", Qunbound);
- delta_after_rwdi = delta_before_rwdi - rwdi_section->s_size;
- old_rwdi_vaddr = rwdi_section->s_vaddr;
- rwdi_section->s_paddr = 0;
- rwdi_section->s_vaddr = 0;
- rwdi_section->s_scnptr = 0;
- rwdi_section->s_size = 0;
- source_file_offset_past_rwdi = (rwdi_section+1)->s_scnptr;
- break;
- }
- /* Skip over the Text Section Headers. */
- for (section = sections; (section->s_flags & STYP_TEXT) != 0; section++) ;
- /*
- Find the First and Last Data Sections and Fixup
- Section Header Relocation Pointers.
- */
- first_data_section = last_data_section = (struct scnhdr *) 0;
- for (; section != sections_limit; section++)
- {
- if ((section->s_flags & STYP_DATA) != 0)
- {
- if (first_data_section == (struct scnhdr *) 0)
- first_data_section = section;
- last_data_section = section;
- }
- if (section->s_relptr != 0)
- section->s_relptr += delta_after_rwdi;
- }
- /* Increment the Size of the Last Data Section. */
- old_data_section_size = last_data_section->s_size;
- last_data_section->s_size += delta_before_rwdi;
-
- /* Update the File Header and Domain Header. */
- file_header.f_symptr += delta_after_rwdi;
- domain_header.dsize = data_size;
- domain_header.bsize = 0;
- /* Skip over subsequent Bss Section Headers. */
- for (section = last_data_section+1;
- (section->s_flags & STYP_BSS) != 0; section++) ;
- /* Update the remaining Section Headers. */
- blocks_section = (struct scnhdr *) 0;
- first_changed_vaddr = 0;
- for (; section != sections_limit; section++)
- {
- long delta = (section < rwdi_section ? delta_before_rwdi : delta_after_rwdi);
- if (section->s_paddr != 0)
- section->s_paddr += delta;
- if (section->s_vaddr != 0)
- {
- if (first_changed_vaddr == 0)
- first_changed_vaddr = section->s_vaddr;
- section->s_vaddr += delta;
- }
- if (section->s_scnptr != 0)
- section->s_scnptr += delta;
- if (strcmp (section->s_name, ".blocks") == 0)
- blocks_section = section;
- else if (strcmp (section->s_name, ".sri") == 0 &&
- domain_header.o_sri != 0)
- domain_header.o_sri += delta;
- else if (strcmp (section->s_name, ".inlib") == 0 &&
- domain_header.o_inlib != 0)
- domain_header.o_inlib += delta;
- }
- /* Open the Target File. */
- ios_$create (target_file_name, strlen (target_file_name), coff_$uid,
- ios_$recreate_mode, ios_$write_opt, &target_file, &status);
- if (status.all != status_$ok)
- signal_error (Qfile_error, "cannot open target file for output", Qunbound);
- /* Write the File Header. */
- if (write (target_file, &file_header, sizeof (file_header)) != sizeof (file_header))
- signal_error (Qfile_error, "cannot write file header", Qunbound);
- /* Write the Domain Header. */
- if (write (target_file, &domain_header, sizeof (domain_header))
- != sizeof (domain_header))
- signal_error (Qfile_error, "cannot write domain header", Qunbound);
- /* Write the Section Headers. */
- if (write (target_file, sections, file_header.f_nscns*sizeof (struct scnhdr))
- != file_header.f_nscns*sizeof (struct scnhdr))
- signal_error (Qfile_error, "cannot write section headers", Qunbound);
- /* Copy the Allocated Sections. */
- for (section = sections; section != first_data_section; section++)
- if (section->s_scnptr != 0)
- CopyData (target_file, source_file, LONG_ALIGN(section->s_size));
- /* Write the Expanded Data Segment. */
- if (write (target_file, first_data_section->s_vaddr, data_size) != data_size)
- signal_error (Qfile_error, "cannot write new data section", Qunbound);
-
- /* Skip over the Last Data Section and Copy until the .rwdi Section. */
- if (lseek (source_file, last_data_section->s_scnptr
- +old_data_section_size, L_SET) == -1)
- signal_error (Qfile_error, "cannot seek past data section", Qunbound);
- for (section = last_data_section+1; section != rwdi_section; section++)
- if (section->s_scnptr != 0)
- CopyData (target_file, source_file, LONG_ALIGN(section->s_size));
- /* Skip over the .rwdi Section and Copy Remainder of Source File. */
- if (lseek (source_file, source_file_offset_past_rwdi, L_SET) == -1)
- signal_error (Qfile_error, "cannot seek past .rwdi section", Qunbound);
- while ((byte_count = read (source_file, buffer, sizeof (buffer))) > 0)
- if (write (target_file, buffer, byte_count) != byte_count)
- signal_error (Qfile_error, "cannot write data", Qunbound);
- /* Unrelocate .data references to Global Symbols. */
- for (section = first_data_section; section <= last_data_section; section++)
- for (i = 0; i < section->s_nreloc; i++)
- {
- if (lseek (source_file, section->s_relptr
- +i*sizeof (struct reloc)-delta_after_rwdi, L_SET) == -1)
- signal_error (Qfile_error, "cannot seek to relocation info", Qunbound);
- if (read (source_file, &reloc_entry, sizeof (reloc_entry))
- != sizeof (reloc_entry))
- signal_error (Qfile_error, "cannot read reloc entry", Qunbound);
- if (lseek (source_file, reloc_entry.r_vaddr-section->s_vaddr
- +section->s_scnptr, L_SET) == -1)
- signal_error (Qfile_error, "cannot seek to data element", Qunbound);
- if (lseek (target_file, reloc_entry.r_vaddr-section->s_vaddr
- +section->s_scnptr, L_SET) == -1)
- signal_error (Qfile_error, "cannot seek to data element", Qunbound);
- if (read (source_file, buffer, 4) != 4)
- signal_error (Qfile_error, "cannot read data element", Qunbound);
- if (write (target_file, buffer, 4) != 4)
- signal_error (Qfile_error, "cannot write data element", Qunbound);
- }
-
- /* Correct virtual addresses in .blocks section. */
- if (blocks_section != (struct scnhdr *) 0)
- {
- dst_rec_t dst_record;
- dst_rec_comp_unit_t *comp_unit;
- unsigned short number_of_sections;
- unsigned long section_base;
- unsigned long section_offset = 0;
- /* Find section tables and update section base addresses. */
- while (section_offset < blocks_section->s_size)
- {
- if (lseek (target_file,
- blocks_section->s_scnptr+section_offset, L_SET) == -1)
- signal_error (Qfile_error, "cannot seek to comp unit record", Qunbound);
- /* Handle pad records before the comp unit record. */
- if (read (target_file, &dst_record, DST_RECORD_HDR_SIZE)
- != DST_RECORD_HDR_SIZE)
- signal_error (Qfile_error, "cannot read dst record tag", Qunbound);
- if (dst_record.rec_type == dst_typ_pad)
- section_offset += DST_RECORD_HDR_SIZE;
- else if (dst_record.rec_type == dst_typ_comp_unit)
- {
- comp_unit = &dst_record.rec_data.comp_unit_;
- if (read (target_file, comp_unit, sizeof (*comp_unit))
- != sizeof (*comp_unit))
- signal_error (Qfile_error, "cannot read comp unit record", Qunbound);
- if (lseek (target_file, blocks_section->s_scnptr
- +section_offset
-#if dst_version_major == 1 && dst_version_minor < 4
- +comp_unit->section_table
-#else
- +comp_unit->section_table.rel_offset
-#endif
- +DST_RECORD_HDR_SIZE,
- L_SET) == -1)
- signal_error (Qfile_error, "cannot seek to section table", Qunbound);
- if (read (target_file, &number_of_sections, sizeof (number_of_sections))
- != sizeof (number_of_sections))
- signal_error (Qfile_error, "cannot read section table size", Qunbound);
- for (i = 0; i < number_of_sections; i++)
- {
- if (read (target_file, §ion_base, sizeof (section_base))
- != sizeof (section_base))
- signal_error (Qfile_error, "cannot read section base value", Qunbound);
- if (section_base < first_changed_vaddr)
- continue;
- else if (section_base < old_rwdi_vaddr)
- section_base += delta_before_rwdi;
- else section_base += delta_after_rwdi;
- if (lseek (target_file, -sizeof (section_base), L_INCR) == -1)
- signal_error (Qfile_error, "cannot seek to section base value", Qunbound);
- if (write (target_file, §ion_base, sizeof (section_base))
- != sizeof (section_base))
- signal_error (Qfile_error, "cannot write section base", Qunbound);
- }
- section_offset += comp_unit->data_size;
- }
- else signal_error (Qfile_error, "unexpected dst record type", Qunbound);
- }
- }
-
- if (close (source_file) == -1)
- signal_error (Qfile_error, "cannot close source file", Qunbound);
- if (close (target_file) == -1)
- signal_error (Qfile_error, "cannot close target file", Qunbound);
-}
-
-
-static
-CopyData (target_file, source_file, total_byte_count)
- int target_file, source_file;
- long total_byte_count;
-{
- unsigned char buffer[4096];
- long byte_count;
- while (total_byte_count > 0)
- {
- if (total_byte_count > sizeof (buffer))
- byte_count = sizeof (buffer);
- else byte_count = total_byte_count;
- if (read (source_file, buffer, byte_count) != byte_count)
- signal_error (Qfile_error, "cannot read data", Qunbound);
- if (write (target_file, buffer, byte_count) != byte_count)
- signal_error (Qfile_error, "cannot write data", Qunbound);
- total_byte_count -= byte_count;
- }
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexconvex.c
--- a/src/unexconvex.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,600 +0,0 @@
-/* Modified version of unexec for convex machines.
- Copyright (C) 1985, 1986, 1988 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-
-/* modified for C-1 arch by jthomp@convex 871103 */
-/* Corrected to support convex SOFF object file formats and thread specific
- * regions. streepy@convex 890302
-*/
-
-/*
- * unexec.c - Convert a running program into an a.out file.
- *
- * Author: Spencer W. Thomas
- * Computer Science Dept.
- * University of Utah
- * Date: Tue Mar 2 1982
- * Modified heavily since then.
- *
- * Synopsis:
- * unexec (new_name, a_name, data_start, bss_start, entry_address)
- * char *new_name, *a_name;
- * unsigned data_start, bss_start, entry_address;
- *
- * Takes a snapshot of the program and makes an a.out format file in the
- * file named by the string argument new_name.
- * If a_name is non-NULL, the symbol table will be taken from the given file.
- * On some machines, an existing a_name file is required.
- *
- * The boundaries within the a.out file may be adjusted with the data_start
- * and bss_start arguments. Either or both may be given as 0 for defaults.
- *
- * Data_start gives the boundary between the text segment and the data
- * segment of the program. The text segment can contain shared, read-only
- * program code and literal data, while the data segment is always unshared
- * and unprotected. Data_start gives the lowest unprotected address.
- * The value you specify may be rounded down to a suitable boundary
- * as required by the machine you are using.
- *
- * Specifying zero for data_start means the boundary between text and data
- * should not be the same as when the program was loaded.
- * If NO_REMAP is defined, the argument data_start is ignored and the
- * segment boundaries are never changed.
- *
- * Bss_start indicates how much of the data segment is to be saved in the
- * a.out file and restored when the program is executed. It gives the lowest
- * unsaved address, and is rounded up to a page boundary. The default when 0
- * is given assumes that the entire data segment is to be stored, including
- * the previous data and bss as well as any additional storage allocated with
- * break (2).
- *
- * The new file is set up to start at entry_address.
- *
- * If you make improvements I'd like to get them too.
- * harpo!utah-cs!thomas, thomas@Utah-20
- *
- */
-
-/* There are several compilation parameters affecting unexec:
-
-* COFF
-
-Define this if your system uses COFF for executables.
-Otherwise we assume you use Berkeley format.
-
-* NO_REMAP
-
-Define this if you do not want to try to save Emacs's pure data areas
-as part of the text segment.
-
-Saving them as text is good because it allows users to share more.
-
-However, on machines that locate the text area far from the data area,
-the boundary cannot feasibly be moved. Such machines require
-NO_REMAP.
-
-Also, remapping can cause trouble with the built-in startup routine
-/lib/crt0.o, which defines `environ' as an initialized variable.
-Dumping `environ' as pure does not work! So, to use remapping,
-you must write a startup routine for your machine in Emacs's crt0.c.
-If NO_REMAP is defined, Emacs uses the system's crt0.o.
-
-* SECTION_ALIGNMENT
-
-Some machines that use COFF executables require that each section
-start on a certain boundary *in the COFF file*. Such machines should
-define SECTION_ALIGNMENT to a mask of the low-order bits that must be
-zero on such a boundary. This mask is used to control padding between
-segments in the COFF file.
-
-If SECTION_ALIGNMENT is not defined, the segments are written
-consecutively with no attempt at alignment. This is right for
-unmodified system V.
-
-* SEGMENT_MASK
-
-Some machines require that the beginnings and ends of segments
-*in core* be on certain boundaries. For most machines, a page
-boundary is sufficient. That is the default. When a larger
-boundary is needed, define SEGMENT_MASK to a mask of
-the bits that must be zero on such a boundary.
-
-* A_TEXT_OFFSET(HDR)
-
-Some machines count the a.out header as part of the size of the text
-segment (a_text); they may actually load the header into core as the
-first data in the text segment. Some have additional padding between
-the header and the real text of the program that is counted in a_text.
-
-For these machines, define A_TEXT_OFFSET(HDR) to examine the header
-structure HDR and return the number of bytes to add to `a_text'
-before writing it (above and beyond the number of bytes of actual
-program text). HDR's standard fields are already correct, except that
-this adjustment to the `a_text' field has not yet been made;
-thus, the amount of offset can depend on the data in the file.
-
-* A_TEXT_SEEK(HDR)
-
-If defined, this macro specifies the number of bytes to seek into the
-a.out file before starting to write the text segment.a
-
-* EXEC_MAGIC
-
-For machines using COFF, this macro, if defined, is a value stored
-into the magic number field of the output file.
-
-* ADJUST_EXEC_HEADER
-
-This macro can be used to generate statements to adjust or
-initialize nonstandard fields in the file header
-
-* ADDR_CORRECT(ADDR)
-
-Macro to correct an int which is the bit pattern of a pointer to a byte
-into an int which is the number of a byte.
-
-This macro has a default definition which is usually right.
-This default definition is a no-op on most machines (where a
-pointer looks like an int) but not on all machines.
-
-*/
-
-#include <config.h>
-#define PERROR(file) report_error (file, new_)
-
-#include <a.out.h>
-/* Define getpagesize () if the system does not.
- Note that this may depend on symbols defined in a.out.h
- */
-#include "getpagesize.h"
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-extern char *start_of_text (); /* Start of text */
-extern char *start_of_data (); /* Start of initialized data */
-
-#include <machine/filehdr.h>
-#include <machine/opthdr.h>
-#include <machine/scnhdr.h>
-#include <machine/pte.h>
-
-#include "compiler.h"
-
-static long block_copy_start; /* Old executable start point */
-static struct filehdr f_hdr; /* File header */
-static struct opthdr f_ohdr; /* Optional file header (a.out) */
-long bias; /* Bias to add for growth */
-#define SYMS_START block_copy_start
-
-static long text_scnptr;
-static long data_scnptr;
-
-static int pagemask;
-static int pagesz;
-
-static
-report_error (file, fd)
- char *file;
- int fd;
-{
- if (fd)
- close (fd);
- signal_error (Qio_error, "Failure operating on file",
- build_string (file));
-}
-
-#define ERROR0(msg) report_error_1 (new_, msg, 0, 0); return -1
-#define ERROR1(msg,x) report_error_1 (new_, msg, x, 0); return -1
-#define ERROR2(msg,x,y) report_error_1 (new_, msg, x, y); return -1
-
-static
-report_error_1 (fd, msg, a1, a2)
-int fd;
-char *msg;
-int a1, a2;
-{
- close (fd);
- signal_ferror (Qio_error, msg, a1, a2);
-}
-
-/* ****************************************************************
- * unexec
- *
- * driving logic.
- */
-unexec (new_name, a_name, data_start, bss_start, entry_address)
-char *new_name, *a_name;
-unsigned data_start, bss_start, entry_address;
-{
- int new_, a_out = -1;
-
- if (a_name && (a_out = open (a_name, 0)) < 0) {
- PERROR (a_name);
- }
- if ((new_ = creat (new_name, 0666)) < 0) {
- PERROR (new_name);
- }
-
- if (make_hdr (new_, a_out, data_start, bss_start, entry_address, a_name, new_name) < 0
- || copy_text_and_data (new_) < 0
- || copy_sym (new_, a_out, a_name, new_name) < 0 ) {
- close (new_);
- return -1;
- }
-
- close (new_);
- if (a_out >= 0)
- close (a_out);
- mark_x (new_name);
- return 0;
-}
-
-/* ****************************************************************
- * make_hdr
- *
- * Make the header in the new a.out from the header in core.
- * Modify the text and data sizes.
- */
-
- struct scnhdr *stbl; /* Table of all scnhdr's */
- struct scnhdr *f_thdr; /* Text section header */
- struct scnhdr *f_dhdr; /* Data section header */
- struct scnhdr *f_tdhdr; /* Thread Data section header */
- struct scnhdr *f_bhdr; /* Bss section header */
- struct scnhdr *f_tbhdr; /* Thread Bss section header */
-
-static int
-make_hdr (new_, a_out, data_start, bss_start, entry_address, a_name, new_name)
- int new_, a_out;
- unsigned data_start, bss_start;
- unsigned UNUSED (entry_address);
- char *a_name;
- char *new_name;
-{
- int scns;
- unsigned int bss_end;
- unsigned int eo_data; /* End of initialized data in new exec file */
- int scntype; /* Section type */
- int i; /* Var for sorting by vaddr */
- struct scnhdr scntemp; /* For swapping entries in sort */
- extern char *start_of_data();
-
- pagemask = (pagesz = getpagesize()) - 1;
-
- /* Adjust text/data boundary. */
- if (!data_start)
- data_start = (unsigned) start_of_data ();
-
- data_start = data_start & ~pagemask; /* (Down) to page boundary. */
-
- bss_end = (sbrk(0) + pagemask) & ~pagemask;
-
- /* Adjust data/bss boundary. */
- if (bss_start != 0) {
- bss_start = (bss_start + pagemask) & ~pagemask;/* (Up) to page bdry. */
- if (bss_start > bss_end) {
- ERROR1 ("unexec: Specified bss_start (%x) is past end of program",
- bss_start);
- }
- } else
- bss_start = bss_end;
-
- if (data_start > bss_start) { /* Can't have negative data size. */
- ERROR2 ("unexec: data_start (%x) can't be greater than bss_start (%x)",
- data_start, bss_start);
- }
-
- /* Salvage as much info from the existing file as possible */
- if (a_out < 0) {
- ERROR0 ("can't build a COFF file from scratch yet");
- /*NOTREACHED*/
- }
-
- if (read (a_out, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) {
- PERROR (a_name);
- }
- block_copy_start += sizeof (f_hdr);
- if (f_hdr.h_opthdr > 0) {
- if (read (a_out, &f_ohdr, sizeof (f_ohdr)) != sizeof (f_ohdr)) {
- PERROR (a_name);
- }
- block_copy_start += sizeof (f_ohdr);
- }
-
- /* Allocate room for scn headers */
- stbl = (struct scnhdr *)malloc( sizeof(struct scnhdr) * f_hdr.h_nscns );
- if( stbl == NULL ) {
- ERROR0( "unexec: malloc of stbl failed" );
- }
-
- f_tdhdr = f_tbhdr = NULL;
-
- /* Loop through section headers, copying them in */
- for (scns = 0; scns < f_hdr.h_nscns; scns++) {
-
- if( read( a_out, &stbl[scns], sizeof(*stbl)) != sizeof(*stbl)) {
- PERROR (a_name);
- }
-
- scntype = stbl[scns].s_flags & S_TYPMASK; /* What type of section */
-
- if( stbl[scns].s_scnptr > 0L) {
- if( block_copy_start < stbl[scns].s_scnptr + stbl[scns].s_size )
- block_copy_start = stbl[scns].s_scnptr + stbl[scns].s_size;
- }
-
- if( scntype == S_TEXT) {
- f_thdr = &stbl[scns];
- } else if( scntype == S_DATA) {
- f_dhdr = &stbl[scns];
-#ifdef S_TDATA
- } else if( scntype == S_TDATA ) {
- f_tdhdr = &stbl[scns];
- } else if( scntype == S_TBSS ) {
- f_tbhdr = &stbl[scns];
-#endif /* S_TDATA (thread stuff) */
-
- } else if( scntype == S_BSS) {
- f_bhdr = &stbl[scns];
- }
-
- }
-
- /* We will now convert TEXT and DATA into TEXT, BSS into DATA, and leave
- * all thread stuff alone.
- */
-
- /* Now we alter the contents of all the f_*hdr variables
- to correspond to what we want to dump. */
-
- f_thdr->s_vaddr = (long) start_of_text ();
- f_thdr->s_size = data_start - f_thdr->s_vaddr;
- f_thdr->s_scnptr = pagesz;
- f_thdr->s_relptr = 0;
- f_thdr->s_nrel = 0;
-
- eo_data = f_thdr->s_scnptr + f_thdr->s_size;
-
- if( f_tdhdr ) { /* Process thread data */
-
- f_tdhdr->s_vaddr = data_start;
- f_tdhdr->s_size += f_dhdr->s_size - (data_start - f_dhdr->s_vaddr);
- f_tdhdr->s_scnptr = eo_data;
- f_tdhdr->s_relptr = 0;
- f_tdhdr->s_nrel = 0;
-
- eo_data += f_tdhdr->s_size;
-
- /* And now for DATA */
-
- f_dhdr->s_vaddr = f_bhdr->s_vaddr; /* Take BSS start address */
- f_dhdr->s_size = bss_end - f_bhdr->s_vaddr;
- f_dhdr->s_scnptr = eo_data;
- f_dhdr->s_relptr = 0;
- f_dhdr->s_nrel = 0;
-
- eo_data += f_dhdr->s_size;
-
- } else {
-
- f_dhdr->s_vaddr = data_start;
- f_dhdr->s_size = bss_start - data_start;
- f_dhdr->s_scnptr = eo_data;
- f_dhdr->s_relptr = 0;
- f_dhdr->s_nrel = 0;
-
- eo_data += f_dhdr->s_size;
-
- }
-
- f_bhdr->s_vaddr = bss_start;
- f_bhdr->s_size = bss_end - bss_start + pagesz /* fudge */;
- f_bhdr->s_scnptr = 0;
- f_bhdr->s_relptr = 0;
- f_bhdr->s_nrel = 0;
-
- text_scnptr = f_thdr->s_scnptr;
- data_scnptr = f_dhdr->s_scnptr;
- bias = eo_data - block_copy_start;
-
- if (f_ohdr.o_symptr > 0L) {
- f_ohdr.o_symptr += bias;
- }
-
- if (f_hdr.h_strptr > 0) {
- f_hdr.h_strptr += bias;
- }
-
- if (write (new_, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) {
- PERROR (new_name);
- }
-
- if (write (new_, &f_ohdr, sizeof (f_ohdr)) != sizeof (f_ohdr)) {
- PERROR (new_name);
- }
-
- for( scns = 0; scns < f_hdr.h_nscns; scns++ ) {
-
- /* This is a cheesy little loop to write out the section headers
- * in order of increasing virtual address. Dull but effective.
- */
-
- for( i = scns+1; i < f_hdr.h_nscns; i++ ) {
- if( stbl[i].s_vaddr < stbl[scns].s_vaddr ) { /* Swap */
- scntemp = stbl[i];
- stbl[i] = stbl[scns];
- stbl[scns] = scntemp;
- }
- }
-
- }
-
- for( scns = 0; scns < f_hdr.h_nscns; scns++ ) {
-
- if( write( new_, &stbl[scns], sizeof(*stbl)) != sizeof(*stbl)) {
- PERROR (new_name);
- }
-
- }
-
- return (0);
-
-}
-
-/* ****************************************************************
- * copy_text_and_data
- *
- * Copy the text and data segments from memory to the new a.out
- */
-static int
-copy_text_and_data (new_)
-int new_;
-{
- int scns;
-
- for( scns = 0; scns < f_hdr.h_nscns; scns++ )
- write_segment( new_, &stbl[scns] );
-
- return 0;
-}
-
-write_segment( new_, sptr )
-int new_;
-struct scnhdr *sptr;
-{
- char *ptr, *end;
- int nwrite, ret;
- char buf[80];
- extern int errno;
- char zeros[128];
-
- if( sptr->s_scnptr == 0 )
- return; /* Nothing to do */
-
- if( lseek( new_, (long) sptr->s_scnptr, 0 ) == -1 )
- PERROR( "unexecing" );
-
- memset (zeros, 0, sizeof (zeros));
-
- ptr = (char *) sptr->s_vaddr;
- end = ptr + sptr->s_size;
-
- while( ptr < end ) {
-
- /* distance to next multiple of 128. */
- nwrite = (((int) ptr + 128) & -128) - (int) ptr;
- /* But not beyond specified end. */
- if (nwrite > end - ptr) nwrite = end - ptr;
- ret = write (new_, ptr, nwrite);
- /* If write gets a page fault, it means we reached
- a gap between the old text segment and the old data segment.
- This gap has probably been remapped into part of the text segment.
- So write zeros for it. */
- if (ret == -1 && errno == EFAULT)
- write (new_, zeros, nwrite);
- else if (nwrite != ret) {
- sprintf (buf,
- "unexec write failure: addr 0x%x, fileno %d, size 0x%x, wrote 0x%x, errno %d",
- ptr, new_, nwrite, ret, errno);
- PERROR (buf);
- }
- ptr += nwrite;
- }
-}
-
-/* ****************************************************************
- * copy_sym
- *
- * Copy the relocation information and symbol table from the a.out to the new
- */
-static int
-copy_sym (new_, a_out, a_name, new_name)
- int new_, a_out;
- char *a_name, *new_name;
-{
- char page[1024];
- int n;
-
- if (a_out < 0)
- return 0;
-
- if (SYMS_START == 0L)
- return 0;
-
- lseek (a_out, SYMS_START, 0); /* Position a.out to symtab. */
- lseek( new_, (long)f_ohdr.o_symptr, 0 );
-
- while ((n = read (a_out, page, sizeof (page))) > 0) {
- if (write (new_, page, n) != n) {
- PERROR (new_name);
- }
- }
- if (n < 0) {
- PERROR (a_name);
- }
- return 0;
-}
-
-/* ****************************************************************
- * mark_x
- *
- * After successfully building the new a.out, mark it executable
- */
-static
-mark_x (name)
-char *name;
-{
- struct stat sbuf;
- int um;
- int new_ = 0; /* for PERROR */
-
- um = umask (777);
- umask (um);
- if (stat (name, &sbuf) == -1) {
- PERROR (name);
- }
- sbuf.st_mode |= 0111 & ~um;
- if (chmod (name, sbuf.st_mode) == -1)
- PERROR (name);
-}
-
-/* Find the first pty letter. This is usually 'p', as in ptyp0, but
- is sometimes configured down to 'm', 'n', or 'o' for some reason. */
-
-first_pty_letter ()
-{
- struct stat buf;
- char pty_name[16];
- char c;
-
- for (c = 'o'; c >= 'a'; c--)
- {
- sprintf (pty_name, "/dev/pty%c0", c);
- if (stat (pty_name, &buf) < 0)
- return c + 1;
- }
- return 'a';
-}
-
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexec.c
--- a/src/unexec.c Wed Nov 18 22:44:28 2009 +0900
+++ b/src/unexec.c Wed Nov 18 08:49:14 2009 -0700
@@ -79,14 +79,6 @@
Define this if your system uses COFF for executables.
-* COFF_ENCAPSULATE
-
-Define this if you are using the GNU coff encapsulated a.out format.
-This is closer to a.out than COFF. You should *not* define COFF if
-you define COFF_ENCAPSULATE
-
-Otherwise we assume you use Berkeley format.
-
* NO_REMAP
Define this if you do not want to try to save Emacs's pure data areas
@@ -104,18 +96,6 @@
you must write a startup routine for your machine in Emacs's crt0.c.
If NO_REMAP is defined, Emacs uses the system's crt0.o.
-* SECTION_ALIGNMENT
-
-Some machines that use COFF executables require that each section
-start on a certain boundary *in the COFF file*. Such machines should
-define SECTION_ALIGNMENT to a mask of the low-order bits that must be
-zero on such a boundary. This mask is used to control padding between
-segments in the COFF file.
-
-If SECTION_ALIGNMENT is not defined, the segments are written
-consecutively with no attempt at alignment. This is right for
-unmodified system V.
-
* SEGMENT_MASK
Some machines require that the beginnings and ends of segments
@@ -196,12 +176,7 @@
# define sun 1
#endif
-#ifdef COFF_ENCAPSULATE
-int need_coff_header = 1;
-#include <coff-encap/a.out.encap.h> /* The location might be a poor assumption */
-#else
#include <a.out.h>
-#endif /* not COFF_ENCAPSULATE */
/* Define getpagesize if the system does not.
Note that this may depend on symbols defined in a.out.h. */
@@ -214,7 +189,7 @@
#include <sys/stat.h>
#include <errno.h>
-#include <sys/file.h> /* Must be after sys/types.h for USG and BSD4_1*/
+#include <sys/file.h> /* Must be after sys/types.h for USG */
#ifdef USG5
#include <fcntl.h>
@@ -267,27 +242,18 @@
#define SYMS_START ((long) N_SYMOFF (ohdr))
-/* Some machines override the structure name for an a.out header. */
-#ifndef EXEC_HDR_TYPE
-#define EXEC_HDR_TYPE struct exec
-#endif
-
#ifdef HPUX
-#ifdef HP9000S200_ID
-#define MY_ID HP9000S200_ID
-#else
#include <model.h>
#define MY_ID MYSYS
-#endif /* no HP9000S200_ID */
static MAGIC OLDMAGIC = {MY_ID, SHARE_MAGIC};
static MAGIC NEWMAGIC = {MY_ID, DEMAND_MAGIC};
#define N_TXTOFF(x) TEXT_OFFSET(x)
#define N_SYMOFF(x) LESYM_OFFSET(x)
-static EXEC_HDR_TYPE hdr, ohdr;
+static struct exec hdr, ohdr;
#else /* not HPUX */
-#if defined (USG) && !defined (IBMAIX) && !defined (IRIS) && !defined (COFF_ENCAPSULATE) && !defined (LINUX)
+#if defined (USG) && !defined (LINUX)
static struct bhdr hdr, ohdr;
#define a_magic fmagic
#define a_text tsize
@@ -301,20 +267,15 @@
(((x).fmagic)!=OMAGIC && ((x).fmagic)!=NMAGIC &&\
((x).fmagic)!=FMAGIC && ((x).fmagic)!=IMAGIC)
#define NEWMAGIC FMAGIC
-#else /* IRIS or IBMAIX or not USG */
-static EXEC_HDR_TYPE hdr, ohdr;
+#else /* !USG or LINUX */
+static struct exec hdr, ohdr;
#define NEWMAGIC ZMAGIC
-#endif /* IRIS or IBMAIX not USG */
+#endif /* !USG or LINUX */
#endif /* not HPUX */
static int unexec_text_start;
static int unexec_data_start;
-#ifdef COFF_ENCAPSULATE
-/* coffheader is defined in the GNU a.out.encap.h file. */
-struct coffheader coffheader;
-#endif
-
#endif /* not COFF */
static int pagemask;
@@ -392,10 +353,8 @@
|| copy_text_and_data (new_, a_out) < 0
|| copy_sym (new_, a_out, a_name, new_name) < 0
#ifdef COFF
-#ifndef COFF_BSD_SYMBOLS
|| adjust_lnnoptrs (new_, a_out, new_name) < 0
#endif
-#endif
)
{
close (new_);
@@ -537,9 +496,6 @@
#endif
f_hdr.f_flags |= (F_RELFLG | F_EXEC);
-#ifdef TPIX
- f_hdr.f_nscns = 3;
-#endif
#ifdef EXEC_MAGIC
f_ohdr.magic = EXEC_MAGIC;
#endif
@@ -550,53 +506,19 @@
#endif /* NO_REMAP */
f_ohdr.dsize = bss_start - f_ohdr.data_start;
f_ohdr.bsize = bss_end - bss_start;
-#ifndef KEEP_OLD_TEXT_SCNPTR
/* On some machines, the old values are right.
??? Maybe on all machines with NO_REMAP. */
f_thdr.s_size = f_ohdr.tsize;
f_thdr.s_scnptr = sizeof (f_hdr) + sizeof (f_ohdr);
f_thdr.s_scnptr += (f_hdr.f_nscns) * (sizeof (f_thdr));
-#endif /* KEEP_OLD_TEXT_SCNPTR */
-#ifdef ADJUST_TEXT_SCNHDR_SIZE
- /* On some machines, `text size' includes all headers. */
- f_thdr.s_size -= f_thdr.s_scnptr;
-#endif /* ADJUST_TEST_SCNHDR_SIZE */
lnnoptr = f_thdr.s_lnnoptr;
-#ifdef SECTION_ALIGNMENT
- /* Some systems require special alignment
- of the sections in the file itself. */
- f_thdr.s_scnptr
- = (f_thdr.s_scnptr + SECTION_ALIGNMENT) & ~SECTION_ALIGNMENT;
-#endif /* SECTION_ALIGNMENT */
-#ifdef TPIX
- f_thdr.s_scnptr = 0xd0;
-#endif
text_scnptr = f_thdr.s_scnptr;
-#ifdef ADJUST_TEXTBASE
- text_scnptr = sizeof (f_hdr) + sizeof (f_ohdr) + (f_hdr.f_nscns) * (sizeof (f_thdr));
-#endif
-#ifndef KEEP_OLD_PADDR
f_dhdr.s_paddr = f_ohdr.data_start;
-#endif /* KEEP_OLD_PADDR */
f_dhdr.s_vaddr = f_ohdr.data_start;
f_dhdr.s_size = f_ohdr.dsize;
f_dhdr.s_scnptr = f_thdr.s_scnptr + f_thdr.s_size;
-#ifdef SECTION_ALIGNMENT
- /* Some systems require special alignment
- of the sections in the file itself. */
- f_dhdr.s_scnptr
- = (f_dhdr.s_scnptr + SECTION_ALIGNMENT) & ~SECTION_ALIGNMENT;
-#endif /* SECTION_ALIGNMENT */
-#ifdef DATA_SECTION_ALIGNMENT
- /* Some systems require special alignment
- of the data section only. */
- f_dhdr.s_scnptr
- = (f_dhdr.s_scnptr + DATA_SECTION_ALIGNMENT) & ~DATA_SECTION_ALIGNMENT;
-#endif /* DATA_SECTION_ALIGNMENT */
data_scnptr = f_dhdr.s_scnptr;
-#ifndef KEEP_OLD_PADDR
f_bhdr.s_paddr = f_ohdr.data_start + f_ohdr.dsize;
-#endif /* KEEP_OLD_PADDR */
f_bhdr.s_vaddr = f_ohdr.data_start + f_ohdr.dsize;
f_bhdr.s_size = f_ohdr.bsize;
f_bhdr.s_scnptr = 0L;
@@ -701,16 +623,6 @@
/* Get symbol table info from header of a.out file if given one. */
if (a_out >= 0)
{
-#ifdef COFF_ENCAPSULATE
- if (read (a_out, &coffheader, sizeof (coffheader)) != sizeof (coffheader))
- {
- PERROR(a_name);
- }
- if (coffheader.f_magic != COFF_MAGIC)
- {
- ERROR1("%s doesn't have legal coff magic number\n", a_name);
- }
-#endif
if (read (a_out, (char *) &ohdr, sizeof (hdr)) != sizeof (hdr))
{
PERROR (a_name);
@@ -724,14 +636,7 @@
}
else
{
-#ifdef COFF_ENCAPSULATE
- /* We probably could without too much trouble. The code is in gld
- * but I don't have that much time or incentive.
- */
- ERROR0 ("can't build a COFF file from scratch yet");
-#else
memset ((void *)&hdr, 0, sizeof (hdr));
-#endif
}
unexec_text_start = (long) start_of_text ();
@@ -760,32 +665,6 @@
#endif /* not NO_REMAP */
-#ifdef COFF_ENCAPSULATE
- /* We are encapsulating BSD format within COFF format. */
- {
- struct coffscn *tp, *dp, *bp;
- tp = &coffheader.scns[0];
- dp = &coffheader.scns[1];
- bp = &coffheader.scns[2];
- tp->s_size = hdr.a_text + sizeof(struct exec);
- dp->s_paddr = data_start;
- dp->s_vaddr = data_start;
- dp->s_size = hdr.a_data;
- bp->s_paddr = dp->s_vaddr + dp->s_size;
- bp->s_vaddr = bp->s_paddr;
- bp->s_size = hdr.a_bss;
- coffheader.tsize = tp->s_size;
- coffheader.dsize = dp->s_size;
- coffheader.bsize = bp->s_size;
- coffheader.text_start = tp->s_vaddr;
- coffheader.data_start = dp->s_vaddr;
- }
- if (write (new_, &coffheader, sizeof (coffheader)) != sizeof (coffheader))
- {
- PERROR(new_name);
- }
-#endif /* COFF_ENCAPSULATE */
-
if (write (new_, (char *) &hdr, sizeof (hdr)) != sizeof (hdr))
{
PERROR (new_name);
@@ -885,10 +764,6 @@
lseek (new_, (long) text_scnptr, 0);
ptr = (char *) f_ohdr.text_start;
-#ifdef HEADER_INCL_IN_TEXT
- /* For Gould UTX/32, text starts after headers */
- ptr = (char *) (ptr + text_scnptr);
-#endif /* HEADER_INCL_IN_TEXT */
end = ptr + f_ohdr.tsize;
write_segment (new_, ptr, end);
@@ -915,92 +790,9 @@
lseek (new_, (long) N_TXTOFF (hdr), 0);
#endif /* no A_TEXT_SEEK */
-#ifdef RISCiX
-
- /* Acorn's RISC-iX has a wacky way of initializing the position of the heap.
- * There is a little table in crt0.o that is filled at link time with
- * the min and current brk positions, among other things. When start
- * runs, it copies the table to where these parameters live during
- * execution. This data is in text space, so it cannot be modified here
- * before saving the executable, so the data is written manually. In
- * addition, the table does not have a label, and the nearest accessible
- * label (mcount) is not prefixed with a '_', thus making it inaccessible
- * from within C programs. To overcome this, emacs's executable is passed
- * through the command 'nm %s | fgrep mcount' into a pipe, and the
- * resultant output is then used to find the address of 'mcount'. As far as
- * is possible to determine, in RISC-iX releases prior to 1.2, the negative
- * offset of the table from mcount is 0x2c, whereas from 1.2 onwards it is
- * 0x30. bss_end has been rounded up to page boundary. This solution is
- * based on suggestions made by Kevin Welton and Steve Hunt of Acorn, and
- * avoids the need for a custom version of crt0.o for emacs which has its
- * table in data space.
- */
-
- {
- char command[1024];
- char errbuf[1024];
- char address_text[32];
- int proforma[4];
- FILE *pfile;
- char *temp_ptr;
- char c;
- int mcount_address, mcount_offset, count;
- extern char *_execname;
-
-
- /* The use of _execname is incompatible with RISCiX 1.1 */
- sprintf (command, "nm %s | fgrep mcount", _execname);
-
- if ( (pfile = popen(command, "r")) == NULL)
- {
- sprintf (errbuf, "Could not open pipe");
- PERROR (errbuf);
- }
-
- count=0;
- while ( ((c=getc(pfile)) != EOF) && (c != ' ') && (count < 31))
- address_text[count++]=c;
- address_text[count]=0;
-
- if ((count == 0) || pclose(pfile) != NULL)
- {
- sprintf (errbuf, "Failed to execute the command '%s'\n", command);
- PERROR (errbuf);
- }
-
- sscanf(address_text, "%x", &mcount_address);
- ptr = (char *) unexec_text_start;
- mcount_offset = (char *)mcount_address - ptr;
-
-#ifdef RISCiX_1_1
-#define EDATA_OFFSET 0x2c
-#else
-#define EDATA_OFFSET 0x30
-#endif
-
- end = ptr + mcount_offset - EDATA_OFFSET;
-
- write_segment (new_, ptr, end);
-
- proforma[0] = bss_end; /* becomes _edata */
- proforma[1] = bss_end; /* becomes _end */
- proforma[2] = bss_end; /* becomes _minbrk */
- proforma[3] = bss_end; /* becomes _curbrk */
-
- write (new_, proforma, 16);
-
- temp_ptr = ptr;
- ptr = end + 16;
- end = temp_ptr + hdr.a_text;
-
- write_segment (new_, ptr, end);
- }
-
-#else /* !RISCiX */
ptr = (char *) unexec_text_start;
end = ptr + hdr.a_text;
write_segment (new_, ptr, end);
-#endif /* RISCiX */
ptr = (char *) unexec_data_start;
end = ptr + hdr.a_data;
@@ -1135,8 +927,6 @@
}
#ifdef COFF
-#ifndef COFF_BSD_SYMBOLS
-
/*
* If the COFF file contains a symbol table and a line number section,
* then any auxiliary entries that have values for x_lnnoptr must
@@ -1167,7 +957,7 @@
{
int nsyms;
int new_;
-#if defined (amdahl_uts) || defined (pfa)
+#if defined defined (pfa)
SYMENT symentry;
AUXENT auxentry;
#else
@@ -1204,6 +994,4 @@
return 0;
}
-#endif /* COFF_BSD_SYMBOLS */
-
#endif /* COFF */
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexelfsgi.c
--- a/src/unexelfsgi.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,602 +0,0 @@
-/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000
- Free Software Foundation, Inc.
-
- This file is part of XEmacs.
-
- XEmacs is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- XEmacs is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with XEmacs; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-
- In other words, you are welcome to use, share and improve this
- program. You are forbidden to forbid anyone else to use, share and
- improve what you give them. Help stamp out software-hoarding! */
-
-
-/*
- * unexec.c - Convert a running program into an a.out file.
- *
- * Author: Spencer W. Thomas
- * Computer Science Dept.
- * University of Utah
- * Date: Tue Mar 2 1982
- * Modified heavily since then.
- *
- * Synopsis:
- * void
- * unexec (char *new_name,
- * char *old_name,
- * uintptr_t data_start,
- * uintptr_t bss_start,
- * uintptr_t entry_address)
- *
- * The basic idea is that we start with an ELF file which contains
- * .bss (uninitialized global data) section which is normally not in
- * the file. As we load lisp the variables, which were first set to 0,
- * will change their values. We want to save those changed values into
- * another ELF file, which will become a new xemacs image. To do this,
- * we need to change several structures in the ELF file.
- *
- * First of all, we need to change the programm header which tells
- * the linker how to load stuff into memory so that data will come
- * from the file and not from the /dev/zero. To do this, we find the
- * segment, which is marked as loadable (type PT_LOAD) and which
- * covers the old .bss section. We will next change the filesz and
- * memsz for that segment to extend over the new data section.
- *
- * Next we have to make sure that section header for the stuff which
- * used to be uninitialized is changed to be initialized and to come
- * from the file. To do this, we change the size and the type of the old
- * .bss section (and all other section of the type SHT_NOBITS) to cover the
- * new section and to be of type SHT_PROCBITS.
- *
- * We also insert a new SHT_NOBITS section to keep some tools, which expect
- * .bss happy.
- *
- * Finally we need to patch up some references to the section
- * indexes since we change the order and undo the relocation info to
- * be the same as it was "before" because we actually used the data
- * from the memory which were changed by the run-time linker.
- */
-
-#ifndef emacs
-#define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1)
-#include <string.h>
-#else
-#include <config.h>
-extern void fatal (const char *, ...);
-#endif
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <memory.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#ifdef HAVE_ELF_H
-#include <elf.h>
-#endif
-#include <sys/mman.h>
-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
-#include <sys/elf_mips.h>
-#include <sym.h>
-#endif /* __sony_news && _SYSTYPE_SYSV */
-#if __sgi
-#include <syms.h> /* for HDRR declaration */
-#endif /* __sgi */
-
-#if __GNU_LIBRARY__ - 0 >= 6
-# include <link.h> /* get ElfW etc */
-#endif
-
-#include "compiler.h"
-
-#ifndef ElfW
-# ifdef __STDC__
-# define ElfBitsW(bits, type) Elf##bits##_##type
-# else
-# define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type
-# endif
-# ifdef _LP64
-# define ELFSIZE 64
-# else
-# define ELFSIZE 32
-# endif
- /* This macro expands `bits' before invoking ElfBitsW. */
-# define ElfExpandBitsW(bits, type) ElfBitsW (bits, type)
-# define ElfW(type) ElfExpandBitsW (ELFSIZE, type)
-#endif
-
-#ifndef ELF_BSS_SECTION_NAME
-#define ELF_BSS_SECTION_NAME ".bss"
-#endif
-
-/* Get the address of a particular section or program header entry,
- * accounting for the size of the entries. */
-
-#define OLD_SECTION_H(n) \
- (*(ElfW(Shdr) *) ((byte *) old_section_h + old_file_h->e_shentsize * (n)))
-#define NEW_SECTION_H(n) \
- (*(ElfW(Shdr) *) ((byte *) new_section_h + new_file_h->e_shentsize * (n)))
-#define OLD_PROGRAM_H(n) \
- (*(ElfW(Phdr) *) ((byte *) old_program_h + old_file_h->e_phentsize * (n)))
-#define NEW_PROGRAM_H(n) \
- (*(ElfW(Phdr) *) ((byte *) new_program_h + new_file_h->e_phentsize * (n)))
-
-#define PATCH_INDEX(n) \
- do { \
- if ((int) (n) >= growme_index) \
- (n)++; } while (0)
-
-typedef unsigned char byte;
-
-/* Round X up to a multiple of Y. */
-
-static ElfW(Addr)
-round_up (ElfW(Addr) x, ElfW(Addr) y)
-{
- int rem = x % y;
- if (rem == 0)
- return x;
- return x - rem + y;
-}
-
-/* Return the index of the section named NAME.
- SECTION_NAMES, FILE_NAME and FILE_H give information
- about the file we are looking in.
-
- If we don't find the section NAME, that is a fatal error
- if NOERROR is 0; we return -1 if NOERROR is nonzero. */
-
-static int
-find_section (char *name,
- const char *section_names,
- char *file_name,
- ElfW(Ehdr) *old_file_h,
- ElfW(Shdr) *old_section_h,
- int noerror)
-{
- int idx;
-
- for (idx = 1; idx < old_file_h->e_shnum; idx++)
- {
-#ifdef DEBUG
- fprintf (stderr, "Looking for %s - found %s\n", name,
- section_names + OLD_SECTION_H (idx).sh_name);
-#endif
- if (!strcmp (section_names + OLD_SECTION_H (idx).sh_name,
- name))
- return idx;
- }
-
- /* If we're here, we found nothing or return did not work */
- if ( ! noerror)
- fatal ("Can't find %s in %s.\n", name, file_name);
-
- return -1;
-}
-
-/* ****************************************************************
- * unexec
- *
- * driving logic.
- *
- * In ELF, this works by replacing the old .bss section with a new
- * .data section, and inserting an empty .bss immediately afterwards.
- *
- */
-void
-unexec (char *new_name,
- char *old_name,
- uintptr_t UNUSED (data_start),
- uintptr_t UNUSED (bss_start),
- uintptr_t UNUSED (entry_address))
-{
- int old_file;
-
- struct stat stat_buf;
- caddr_t old_base, new_base;
-
- ElfW(Ehdr) *old_file_h, * new_file_h;
- ElfW(Phdr) *old_program_h, * new_program_h;
- ElfW(Shdr) *old_section_h, * new_section_h;
- ElfW(Shdr) * growme = NULL, * grown = NULL;
- ElfW(Addr) old_bss_addr = 0, new_data2_addr = 0;
-
- int growme_index = -1;
- int n, nn;
- const char *old_section_names;
- int old_mdebug_index, old_data_index;
- int new_bss_addr, new_data2_size, new_data2_offset, new_file, new_file_size;
-
- /* Open the old file */
- if ( (old_file = open (old_name, O_RDONLY)) < 0 )
- fatal ("Can't open %s for reading: errno %d\n", old_name, errno);
-
- if (fstat (old_file, &stat_buf) == -1)
- fatal ("Can't fstat (%s): errno %d\n", old_name, errno);
-
- /* map old file into the address space. */
- old_base = (caddr_t) mmap ((caddr_t) 0, stat_buf.st_size,
- PROT_READ, MAP_SHARED, old_file, 0);
- if (old_base == (caddr_t) MAP_FAILED)
- fatal ("Can't mmap (%s): errno %d\n", old_name, errno);
-
- old_file_h = (ElfW(Ehdr) *) old_base;
- old_program_h = (ElfW(Phdr) *) ((byte *) old_base + old_file_h->e_phoff);
- old_section_h = (ElfW(Shdr) *) ((byte *) old_base + old_file_h->e_shoff);
- old_section_names = (const char *) old_base
- + OLD_SECTION_H (old_file_h->e_shstrndx).sh_offset;
-
- /* Find a section which we will grow by looking for the SHT_NOBITS
- * section with ALLOCATE flag and with the biggest address. */
- for (n = 1; n < old_file_h->e_shnum; n++) {
- ElfW(Shdr) * sh = & OLD_SECTION_H(n);
-
- if ((sh->sh_type == SHT_NOBITS) && (sh->sh_flags & SHF_ALLOC)) {
- if ( old_bss_addr < sh->sh_addr ) {
- growme = sh;
- growme_index = n;
- new_data2_addr = old_bss_addr = sh->sh_addr;
- }
- }
- }
-
- if (growme == NULL )
- fatal ("Can't find a section to grow\n", 0, 0);
-
- old_data_index = find_section (".data", old_section_names,
- old_name, old_file_h, old_section_h, 0);
-
- new_bss_addr = (ElfW(Addr)) sbrk (0);
- new_data2_size = new_bss_addr - old_bss_addr;
- new_data2_offset = OLD_SECTION_H (old_data_index).sh_offset +
- (new_data2_addr - OLD_SECTION_H (old_data_index).sh_addr);
-
- if ( new_bss_addr < old_bss_addr + growme->sh_size )
- fatal (".bss shrank when undumping???\n", 0, 0);
-
- /* Set the output file to the right size and mmap it. */
- if ( (new_file = open (new_name, O_RDWR | O_CREAT, 0666)) < 0 )
- fatal ("Can't create (%s): errno %d\n", new_name, errno);
-
- new_file_size = stat_buf.st_size + old_file_h->e_shentsize + new_data2_size;
-
- if (ftruncate (new_file, new_file_size))
- fatal ("Can't ftruncate (%s): errno %d\n", new_name, errno);
-
- new_base = (caddr_t) mmap ((caddr_t) 0, new_file_size,
- PROT_READ | PROT_WRITE,
-#ifdef UNEXEC_USE_MAP_PRIVATE
- MAP_PRIVATE,
-#else
- MAP_SHARED,
-#endif
- new_file, 0);
-
- if (new_base == (caddr_t) -1)
- fatal ("Can't mmap (%s): errno %d\n", new_name, errno);
-
- new_file_h = (ElfW(Ehdr) *) new_base;
- new_program_h = (ElfW(Phdr) *) ((byte *) new_base + old_file_h->e_phoff);
- new_section_h = (ElfW(Shdr) *) ((byte *) new_base + old_file_h->e_shoff +
- new_data2_size);
-
- /* Make our new file, program and section headers as copies of the
- * originals. */
- memcpy (new_file_h, old_file_h, old_file_h->e_ehsize);
- memcpy (new_program_h, old_program_h,
- old_file_h->e_phnum * old_file_h->e_phentsize);
-
- /* Modify the e_shstrndx if necessary. */
- PATCH_INDEX (new_file_h->e_shstrndx);
-
- /* Fix up file header. We'll add one section. Section header is
- * further away now. */
- new_file_h->e_shoff += new_data2_size;
- new_file_h->e_shnum += 1;
-
- /* Fix up a new program header by extending the writable data
- * segment so that the bss area is covered too. Find that segment by
- * looking for one that starts before and ends after the .bss and is
- * PT_LOADable. */
- for (n = new_file_h->e_phnum - 1; n >= 0; n--) {
- ElfW(Phdr) * ph = & NEW_PROGRAM_H(n);
-#ifdef DEBUG
- printf ("%d @ %0x + %0x against %0x + %0x",
- n, ph->p_vaddr, ph->p_memsz,growme->sh_addr, growme->sh_size);
-#endif
- if ((ph->p_type == PT_LOAD) &&
- (ph->p_vaddr <= growme->sh_addr) &&
- ((ph->p_vaddr+ph->p_memsz) >= (growme->sh_addr + growme->sh_size))) {
- /* Make sure that the size includes any padding before the
- * old .bss section. */
- ph->p_memsz = ph->p_filesz = new_bss_addr - ph->p_vaddr;
-#ifdef DEBUG
- puts (" That's the one!");
-#endif
- break;
- }
-#ifdef DEBUG
- putchar ('\n');
-#endif
- }
-
- if (n < 0)
- fatal ("Couldn't find segment which covers %s",
- old_section_names + growme->sh_name);
-
- /* Walk through all section headers, insert the new data2 section
- * right before the new bss section. */
- for (n = 1, nn = 1; n < (int) old_file_h->e_shnum; n++, nn++) {
- ElfW(Shdr) * nsec = & NEW_SECTION_H(nn);
- ElfW(Shdr) * osec = & OLD_SECTION_H(n);
-
- /* If this is the section we want to grow, insert the new data
- * section before it. */
- if ( osec == growme ) {
- /* Steal the data section header for this data2 section but
- * use the * 'grow' section's alignment. This * will assure
- * that the new section * always be placed in the same spot
- * * as the old section by any other * application. */
- ElfW(Shdr) * od = &OLD_SECTION_H(old_data_index);
-
- memcpy (nsec, od, new_file_h->e_shentsize);
-
- nsec->sh_addr = new_data2_addr;
- nsec->sh_offset = new_data2_offset;
- nsec->sh_size = new_data2_size;
- nsec->sh_addralign = osec->sh_addralign;
-
- /* Copy over what we have in memory now. */
- memcpy (nsec->sh_offset + new_base, (caddr_t) osec->sh_addr,
- new_data2_size);
- nn++;
- grown = nsec++;
- }
-
- memcpy (nsec, osec, old_file_h->e_shentsize);
-
- if ( osec == growme ) {
- /* The new bss section's size is zero, and its file offset
- * and virtual address should be off by NEW_DATA2_SIZE. */
- nsec->sh_offset = grown->sh_offset + new_data2_size;
- nsec->sh_addr = grown->sh_addr + new_data2_size;
-
- /* Let the new bss section address alignment be the same as
- * the section address alignment followed the old bss
- * section, so this section will be placed in exactly the
- * same place. */
- nsec->sh_addralign = osec->sh_addralign;
- nsec->sh_size = 0;
- } else {
- /* Any section that was originally placed AFTER the bss
- * section should now be off by NEW_DATA2_SIZE. */
- if ( round_up (nsec->sh_offset, growme->sh_addralign) >=
- new_data2_offset)
- nsec->sh_offset += new_data2_size;
- }
-
- /* Any section that was originally placed after the section *
- * header table should now be off by the size of one section
- * header table entry. */
- if (nsec->sh_offset > new_file_h->e_shoff)
- nsec->sh_offset += new_file_h->e_shentsize;
-
-
- /* If any section hdr refers to the section after the new .data
- * section, make it refer to next one because we have inserted a
- * new section in between. */
- PATCH_INDEX (nsec->sh_link);
-
- /* For symbol tables, info is a symbol table index, so don't
- * change it. */
- if (nsec->sh_type != SHT_SYMTAB && nsec->sh_type != SHT_DYNSYM)
- PATCH_INDEX (nsec->sh_info);
-
- /* Any section which used to be NOBITS will now becomes PROGBITS
- * if it's ALLOC-atable, unless, of cause, it's not the one we
- * decided to grow */
- if ( (osec->sh_type == SHT_NOBITS) && (osec->sh_flags & SHF_ALLOC) &&
- (osec != growme ) ) {
- nsec->sh_type = SHT_PROGBITS;
- }
-
- /* Now, start to copy the content of sections */
- if ( nsec->sh_type != SHT_NULL || nsec->sh_type != SHT_NOBITS ) {
-
- /* Write out the sections. .data and .data1 (and data2,
- * called ".data" in the strings table) get copied from the
- * current process instead of the old file. */
- caddr_t src = old_base + osec->sh_offset;
- const char * secname = old_section_names + nsec->sh_name;
- const char * names[] = {
- ".data",".sdata", ".lit4", ".lit8", ".sdata1", ".data1",
- ".sbss", NULL};
- int i;
-
- for ( i=0; names[i] != NULL; i++ ) {
- if ( ! strcmp (secname, names[i]) ) {
- src = (caddr_t) osec->sh_addr;
- break;
- }
- }
-
- memcpy (nsec->sh_offset + new_base, src, nsec->sh_size);
- }
-
- old_mdebug_index = find_section (".mdebug", old_section_names,
- old_name, old_file_h, old_section_h, 1);
-
-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
- if (nsec->sh_type == SHT_MIPS_DEBUG && old_mdebug_index != -1) {
- int diff = nsec->sh_offset-OLD_SECTION_H(old_mdebug_index).sh_offset;
- HDRR *phdr = (HDRR *)(nsec->sh_offset + new_base);
-
- if (diff) {
- phdr->cbLineOffset += diff;
- phdr->cbDnOffset += diff;
- phdr->cbPdOffset += diff;
- phdr->cbSymOffset += diff;
- phdr->cbOptOffset += diff;
- phdr->cbAuxOffset += diff;
- phdr->cbSsOffset += diff;
- phdr->cbSsExtOffset += diff;
- phdr->cbFdOffset += diff;
- phdr->cbRfdOffset += diff;
- phdr->cbExtOffset += diff;
- }
- }
-#endif /* __sony_news && _SYSTYPE_SYSV */
-
-#if __sgi
- /* Adjust the HDRR offsets in .mdebug and copy the line data if
- * it's in its usual 'hole' in the object. Makes the new file
- * debuggable with dbx. patches up two problems: the absolute
- * file offsets in the HDRR record of .mdebug (see
- * /usr/include/syms.h), and the ld bug that gets the line table
- * in a hole in the elf file rather than in the .mdebug section
- * proper.
- *
- * David Anderson. davea@sgi.com Jan 16,1994 */
-#define MDEBUGADJUST(__ct,__fileaddr) \
- if (n_phdrr->__ct > 0) \
- { \
- n_phdrr->__fileaddr += movement; \
- }
-
- if (n == old_mdebug_index) {
- HDRR * o_phdrr = (HDRR *)((byte *)old_base + osec->sh_offset);
- HDRR * n_phdrr = (HDRR *)((byte *)new_base + nsec->sh_offset);
- unsigned movement = new_data2_size;
-
- MDEBUGADJUST (idnMax, cbDnOffset);
- MDEBUGADJUST (ipdMax, cbPdOffset);
- MDEBUGADJUST (isymMax, cbSymOffset);
- MDEBUGADJUST (ioptMax, cbOptOffset);
- MDEBUGADJUST (iauxMax, cbAuxOffset);
- MDEBUGADJUST (issMax, cbSsOffset);
- MDEBUGADJUST (issExtMax, cbSsExtOffset);
- MDEBUGADJUST (ifdMax, cbFdOffset);
- MDEBUGADJUST (crfd, cbRfdOffset);
- MDEBUGADJUST (iextMax, cbExtOffset);
-
- /* The Line Section, being possible off in a hole of the
- * object, requires special handling. */
- if (n_phdrr->cbLine > 0) {
- if (o_phdrr->cbLineOffset >
- osec->sh_offset+ osec->sh_size){
- /* line data is in a hole in elf. do special copy
- * and adjust for this ld mistake. */
- n_phdrr->cbLineOffset += movement;
-
- memcpy (n_phdrr->cbLineOffset + new_base,
- o_phdrr->cbLineOffset + old_base, n_phdrr->cbLine);
- } else {
- /* somehow line data is in .mdebug as it is supposed
- * to be. */
- MDEBUGADJUST (cbLine, cbLineOffset);
- }
- }
- }
-#endif /* __sgi */
- /* If it is the symbol table, its st_shndx field needs to be
- * patched. */
- if (nsec->sh_type == SHT_SYMTAB || nsec->sh_type == SHT_DYNSYM) {
- unsigned int num = nsec->sh_size / nsec->sh_entsize;
- ElfW(Sym) * sym = (ElfW(Sym) *)(nsec->sh_offset + new_base);
- byte *symnames = ((byte *) new_base +
- NEW_SECTION_H (nsec->sh_link).sh_offset);
-
- for (; num--; sym++) {
- const char * symnam = (char *) (symnames + sym->st_name);
-
- /* Update the symbol values of _edata and _end. */
- if (strcmp (symnam, "_end") == 0
- || strcmp (symnam, "end") == 0
- || strcmp (symnam, "_edata") == 0
- || strcmp (symnam, "edata") == 0)
- memcpy (&sym->st_value, &new_bss_addr,sizeof (new_bss_addr));
-
-
- if ((sym->st_shndx == SHN_UNDEF) || (sym->st_shndx == SHN_ABS)
- || (sym->st_shndx == SHN_COMMON)
- || (sym->st_shndx >= SHN_LOPROC &&
- sym->st_shndx <= SHN_HIPROC))
- continue;
-
- PATCH_INDEX (sym->st_shndx);
- }
- }
- }
-
- /* This loop seeks out relocation sections for the data section, so
- * that it can undo relocations performed by the runtime linker. */
- for (n = new_file_h->e_shnum - 1; n; n--) {
- ElfW(Shdr) section = NEW_SECTION_H (n);
-
- if ( section.sh_type == SHT_REL || section.sh_type == SHT_RELA ) {
- /* This code handles two different size structs, but there
- * should be no harm in that provided that r_offset is
- * always the first member. */
- ElfW(Shdr) * info = & NEW_SECTION_H(section.sh_info);
- const char * nm = old_section_names + info->sh_name;
-
- if (!strcmp (nm, ".data") || !strcmp (nm, ".sdata")
- || !strcmp (nm, ".lit4") || !strcmp (nm, ".lit8")
- || !strcmp (nm, ".sdata1") || !strcmp (nm, ".data1")) {
- ElfW(Addr) offset = info->sh_addr - info->sh_offset;
- caddr_t end, reloc = old_base + section.sh_offset;
-
- for (end = reloc + section.sh_size; reloc < end;
- reloc += section.sh_entsize) {
- ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset;
-#ifdef __alpha__
- /* The Alpha ELF binutils currently have a bug that
- * sometimes results in relocs that contain all
- * zeroes. Work around this for now... */
- if (((ElfW(Rel) *) reloc)->r_offset == 0)
- continue;
-#endif
- memcpy (new_base + addr, old_base + addr,
- sizeof(ElfW(Addr)));
- }
- }
- }
- }
-
-#ifdef UNEXEC_USE_MAP_PRIVATE
- if (lseek (new_file, 0, SEEK_SET) == -1)
- fatal ("Can't rewind (%s): errno %d\n", new_name, errno);
-
- if (write (new_file, new_base, new_file_size) != new_file_size)
- fatal ("Can't write (%s): errno %d\n", new_name, errno);
-#endif
-
- /* Close the files and make the new file executable. */
- if (close (old_file))
- fatal ("Can't close (%s): errno %d\n", old_name, errno);
-
- if (close (new_file))
- fatal ("Can't close (%s): errno %d\n", new_name, errno);
-
- if (stat (new_name, &stat_buf) == -1)
- fatal ("Can't stat (%s): errno %d\n", new_name, errno);
-
- n = umask (777);
- umask (n);
- stat_buf.st_mode |= 0111 & ~n;
- if (chmod (new_name, stat_buf.st_mode) == -1)
- fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexencap.c
--- a/src/unexencap.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/* Waiting for papers! */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * Do an unexec() for coff encapsulation. Uses the approach I took
- * for AKCL, so don't be surprised if it doesn't look too much like
- * the other unexec() routines. Assumes NO_REMAP. Should be easy to
- * adapt to the emacs style unexec() if that is desired, but this works
- * just fine for me with GCC/GAS/GLD under System V. - Jordan
- */
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include "/usr/gnu/lib/gcc/gcc-include/a.out.h"
-#include "compiler.h"
-
-filecpy(to, from, n)
-FILE *to, *from;
-int n;
-{
- char buffer[BUFSIZ];
-
- for (;;)
- if (n > BUFSIZ) {
- fread(buffer, BUFSIZ, 1, from);
- fwrite(buffer, BUFSIZ, 1, to);
- n -= BUFSIZ;
- } else if (n > 0) {
- fread(buffer, 1, n, from);
- fwrite(buffer, 1, n, to);
- break;
- } else
- break;
-}
-/* ****************************************************************
- * unexec
- *
- * driving logic.
- * ****************************************************************/
-unexec (new_name, a_name, data_start, bss_start, entry_address)
-char *new_name, *a_name;
-unsigned UNUSED (data_start);
-unsigned UNUSED (bss_start);
-unsigned UNUSED (entry_address);
-{
- struct coffheader header1;
- struct coffscn *tp, *dp, *bp;
- struct exec header;
- int stsize;
- char *original_file = a_name;
- char *save_file = new_name;
-
- char *data_begin, *data_end;
- int original_data;
- FILE *original, *save;
- int n;
- char *p;
- extern char *sbrk();
- char stdin_buf[BUFSIZ], stdout_buf[BUFSIZ];
-
-
- fclose(stdin);
- original = fopen(original_file, "r");
- if (stdin != original || original->_file != 0) {
- fprintf(stderr, "unexec: Can't open the original file.\n");
- exit(1);
- }
- setbuf(original, stdin_buf);
- fclose(stdout);
- unlink(save_file);
- n = open (save_file, O_CREAT|O_WRONLY, 0777);
- if (n != 1 || (save = fdopen(n, "w")) != stdout) {
- fprintf(stderr, "unexec: Can't open the save file.\n");
- exit(1);
- }
- setbuf(save, stdout_buf);
-
- fread(&header1, sizeof(header1), 1, original);
- tp = &header1.scns[0];
- dp = &header1.scns[1];
- bp = &header1.scns[2];
- fread(&header, sizeof(header), 1, original);
- data_begin=(char *)N_DATADDR(header);
- data_end = sbrk(0);
- original_data = header.a_data;
- header.a_data = data_end - data_begin;
- header.a_bss = 0;
- dp->s_size = header.a_data;
- bp->s_paddr = dp->s_vaddr + dp->s_size;
- bp->s_vaddr = bp->s_paddr;
- bp->s_size = 0;
- header1.tsize = tp->s_size;
- header1.dsize = dp->s_size;
- header1.bsize = bp->s_size;
- fwrite(&header1, sizeof(header1), 1, save);
- fwrite(&header, sizeof(header), 1, save);
-
- filecpy(save, original, header.a_text);
-
- for (n = header.a_data, p = data_begin; ; n -= BUFSIZ, p += BUFSIZ)
- if (n > BUFSIZ)
- fwrite(p, BUFSIZ, 1, save);
- else if (n > 0) {
- fwrite(p, 1, n, save);
- break;
- } else
- break;
-
- fseek(original, original_data, 1);
-
- filecpy(save, original, header.a_syms+header.a_trsize+header.a_drsize);
- fread(&stsize, sizeof(stsize), 1, original);
- fwrite(&stsize, sizeof(stsize), 1, save);
- filecpy(save, original, stsize - sizeof(stsize));
-
- fclose(original);
- fclose(save);
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexenix.c
--- a/src/unexenix.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,258 +0,0 @@
-/* Unexec for Xenix.
- Copyright (C) 1988, 1994 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-
-
-/*
- On 80386 Xenix, segmentation screws prevent us from modifying the text
- segment at all. We basically just plug a new value for "data segment
- size" into the countless headers and copy the other records straight
- through. The data segment is ORG'ed at the xs_rbase value of the data
- segment's xseg record (always @ 0x1880000, thanks to the "sophisticated
- memory management hardware" of the chip) and extends to sbrk(0), exactly.
- This code is afraid to malloc (should it be?), and alloca has to be the
- wimpy, malloc-based version; consequently, data is usually copied in
- smallish chunks.
-
- gb@entity.com
-*/
-
-#include <config.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <varargs.h>
-#include <a.out.h>
-#include "compiler.h"
-
-static void fatal_unexec ();
-
-#define READ(_fd, _buffer, _size, _error_message, _error_arg) \
- errno = EEOF; \
- if (read(_fd, _buffer, _size) != _size) \
- fatal_unexec(_error_message, _error_arg);
-
-#define WRITE(_fd, _buffer, _size, _error_message, _error_arg) \
- if (write(_fd, _buffer, _size) != _size) \
- fatal_unexec(_error_message, _error_arg);
-
-#define SEEK(_fd, _position, _error_message, _error_arg) \
- errno = EEOF; \
- if (lseek(_fd, _position, L_SET) != _position) \
- fatal_unexec(_error_message, _error_arg);
-
-extern int errno;
-extern char *strerror ();
-#define EEOF -1
-
-#ifndef L_SET
-#define L_SET 0
-#endif
-
-/* Should check the magic number of the old executable;
- not yet written. */
-check_exec (x)
- struct xexec *UNUSED (x);
-{
-}
-
-
-unexec (new_name, a_name, data_start, bss_start, entry_address)
- char *new_name, *a_name;
- unsigned UNUSED (data_start);
- unsigned UNUSED (bss_start);
- unsigned UNUSED (entry_address);
-{
- char *sbrk (), *datalim = sbrk (0), *data_org;
- long segpos, textseen, textpos, textlen, datapos, datadiff, datalen;
-
- struct xexec u_xexec, /* a.out header */
- *u_xexecp = &u_xexec;
- struct xext u_xext, /* extended header */
- *u_xextp = &u_xext;
- struct xseg u_xseg, /* segment table entry */
- *u_xsegp = &u_xseg;
- int i, nsegs, isdata = 0, infd, outfd;
-
- infd = open (a_name, O_RDONLY, 0);
- if (infd < 0) fatal_unexec ("opening %s", a_name);
-
- outfd = creat (new_name, 0666);
- if (outfd < 0) fatal_unexec ("creating %s", new_name);
-
- READ (infd, u_xexecp, sizeof (struct xexec),
- "error reading %s", a_name);
- check_exec (u_xexecp);
- READ (infd, u_xextp, sizeof (struct xext),
- "error reading %s", a_name);
- segpos = u_xextp->xe_segpos;
- nsegs = u_xextp->xe_segsize / sizeof (struct xseg);
- SEEK (infd, segpos, "seek error on %s", a_name);
- for (i = 0; i < nsegs; i ++)
- {
- READ (infd, u_xsegp, sizeof (struct xseg),
- "error reading %s", a_name);
- switch (u_xsegp->xs_type)
- {
- case XS_TTEXT:
- {
- if (i == 0)
- {
- textpos = u_xsegp->xs_filpos;
- textlen = u_xsegp->xs_psize;
- break;
- }
- fatal_unexec ("invalid text segment in %s", a_name);
- }
- case XS_TDATA:
- {
- if (i == 1)
- {
- datapos = u_xsegp->xs_filpos;
- datalen = datalim - (data_org = (char *)(u_xsegp->xs_rbase));
- datadiff = datalen - u_xsegp->xs_psize;
- break;
- }
- fatal_unexec ("invalid data segment in %s", a_name);
- }
- default:
- {
- if (i > 1) break;
- fatal_unexec ("invalid segment record in %s", a_name);
- }
- }
- }
- u_xexecp->x_data = datalen;
- u_xexecp->x_bss = 0;
- WRITE (outfd, u_xexecp, sizeof (struct xexec),
- "error writing %s", new_name);
- WRITE (outfd, u_xextp, sizeof (struct xext),
- "error writing %s", new_name);
- SEEK (infd, segpos, "seek error on %s", a_name);
- SEEK (outfd, segpos, "seek error on %s", new_name);
-
- /* Copy the text segment record verbatim. */
-
- copyrec (infd, outfd, sizeof (struct xseg), a_name, new_name);
-
- /* Read, modify, write the data segment record. */
-
- READ (infd, u_xsegp, sizeof (struct xseg),
- "error reading %s", a_name);
- u_xsegp->xs_psize = u_xsegp->xs_vsize = datalen;
- u_xsegp->xs_attr &= (~XS_AITER & ~XS_ABSS);
- WRITE (outfd, u_xsegp, sizeof (struct xseg),
- "error writing %s", new_name);
-
- /* Now copy any additional segment records, adjusting their
- file position field */
-
- for (i = 2; i < nsegs; i++)
- {
- READ (infd, u_xsegp, sizeof (struct xseg),
- "error reading %s", a_name);
- u_xsegp->xs_filpos += datadiff;
- WRITE (outfd, u_xsegp, sizeof (struct xseg),
- "error writing %s", new_name);
- }
-
- SEEK (infd, textpos, "seek error on %s", a_name);
- SEEK (outfd, textpos, "seek error on %s", new_name);
- copyrec (infd, outfd, textlen, a_name, new_name);
-
- SEEK (outfd, datapos, "seek error on %s", new_name);
- WRITE (outfd, data_org, datalen,
- "write error on %s", new_name);
-
- for (i = 2, segpos += (2 * sizeof (struct xseg));
- i < nsegs;
- i++, segpos += sizeof (struct xseg))
- {
- SEEK (infd, segpos, "seek error on %s", a_name);
- READ (infd, u_xsegp, sizeof (struct xseg),
- "read error on %s", a_name);
- SEEK (infd, u_xsegp->xs_filpos, "seek error on %s", a_name);
- /* We should be at eof in the output file here, but we must seek
- because the xs_filpos and xs_psize fields in symbol table
- segments are inconsistent. */
- SEEK (outfd, u_xsegp->xs_filpos + datadiff, "seek error on %s", new_name);
- copyrec (infd, outfd, u_xsegp->xs_psize, a_name, new_name);
- }
- close (infd);
- close (outfd);
- mark_x (new_name);
- return 0;
-}
-
-copyrec (infd, outfd, len, in_name, out_name)
- int infd, outfd, len;
- char *in_name, *out_name;
-{
- char buf[BUFSIZ];
- int chunk;
-
- while (len)
- {
- chunk = BUFSIZ;
- if (chunk > len)
- chunk = len;
- READ (infd, buf, chunk, "error reading %s", in_name);
- WRITE (outfd, buf, chunk, "error writing %s", out_name);
- len -= chunk;
- }
-}
-
-/*
- * mark_x
- *
- * After successfully building the new a.out, mark it executable
- */
-static
-mark_x (name)
- char *name;
-{
- struct stat sbuf;
- int um = umask (777);
- umask (um);
- if (stat (name, &sbuf) < 0)
- fatal_unexec ("getting protection on %s", name);
- sbuf.st_mode |= 0111 & ~um;
- if (chmod (name, sbuf.st_mode) < 0)
- fatal_unexec ("setting protection on %s", name);
-}
-
-static void
-fatal_unexec (s, va_alist)
- va_dcl
-{
- va_list ap;
- if (errno == EEOF)
- fputs ("unexec: unexpected end of file, ", stderr);
- else
- fprintf (stderr, "unexec: %s, ", strerror (errno));
- va_start (ap);
- _doprnt (s, ap, stderr);
- fputs (".\n", stderr);
- exit (1);
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexfreebsd.c
--- a/src/unexfreebsd.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,720 +0,0 @@
-/* Code to do an unexec for FreeBSD-1.1 for a temacs linked -Bdynamic.
- Derived from unexnetbsd.c, which was derived from unexsunos4.c
- Copyright (C) 1992, 1993 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not in FSF? */
-
-/*
-Created 29-Oct-92 by Harlan Sexton
-Tweaked 06-Aug-93 by Dean Michaels to work with sun3.
-Converted 01-Dec-93 by Paul Mackerras to work with NetBSD shared libraries.
-Tweaked 26-Feb-94 by Shawn Carey for use with FreeBSD-1.1 shared libraries.
-*/
-
-/********************** Included .h Files **************************/
-
-#include <config.h>
-
-#include <stdarg.h>
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <a.out.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <stab.h>
-#include <sys/dir.h>
-#include <link.h>
-#include "compiler.h"
-
-/********************** Macros *************************************/
-
-#define SYS_ERR strerror(errno)
-
-#define MASK_UP(x,p_of_two) \
- ((((unsigned long) (x)) + ((p_of_two) - 1)) & (~((p_of_two) - 1)))
-
-#define MASK_DOWN(x,p_of_two) (((unsigned long) (x)) & (~((p_of_two) - 1)))
-
-/********************** Typedefs and Structs ***********************/
-
-struct translation_struct
-{
- long txtaddr;
- long txtoff;
- long dataddr;
- long datoff;
- long bssaddr;
- long endaddr;
-};
-
-/********************** Function Prototypes/Declarations ***********/
-
-static void unexec_error (const char *m, int use_errno, ...);
-static int unexec_open (char *filename, int flag, int mode);
-static caddr_t unexec_mmap (int fd, size_t len, int prot, int flags);
-static long unexec_seek (int fd, long position);
-static void unexec_read (int fd, long position, char *buf, int bytes);
-static void unexec_write (int fd, long position, char *buf, int bytes);
-static void unexec_pad (int fd, int bytes);
-static void unexec_fstat (int fd, struct stat *statptr);
-static void unexec_fchmod (int fd, int mode);
-static long unexec_addr_to_offset (long addr, struct translation_struct *ts);
-static void copy_relocation_site (struct relocation_info *ri,
- caddr_t from_base_addr,
- caddr_t to_base_addr,
- struct translation_struct *ts);
-static void reset_symtab (struct nlist *start, struct nlist *end,
- char *strtab, long edata_value, long end_value,
- int shlib_image);
-static void reset_ldso_symtab (struct nzlist *start, struct nzlist *end,
- char *strtab, long edata_value, long end_value,
- int shlib_image);
-int run_time_remap (char *dummy);
-
-/********************** Variables **********************************/
-
-/* for reporting error messages from system calls */
-extern int _DYNAMIC;
-extern char **environ;
-
-static unsigned long sbrk_of_0_at_unexec;
-
-/*******************************************************************/
-
-static void
-unexec_error (const char *fmt, int use_errno, ...)
-{
- const char *err_msg = SYS_ERR;
- va_list args;
-
- fprintf (stderr, "unexec - ");
- va_start (args, use_errno);
- vfprintf (stderr, fmt, args);
- va_end (args);
-
- if (use_errno)
- fprintf (stderr, ": %s", err_msg);
- fprintf (stderr, "\n");
- exit (1);
- return;
-}
-
-static int
-unexec_open (char *filename, int flag, int mode)
-{
- int fd;
-
- errno = 0;
-
- fd = open (filename, flag, mode);
-
- if (fd < 0)
- unexec_error ("Failure opening file %s", 1, filename);
- return fd;
-}
-
-static caddr_t
-unexec_mmap (int fd, size_t len, int prot, int flags)
-{
- caddr_t return_val;
-
- unexec_seek (fd, 0);
- errno = 0;
- return_val = mmap (0, len, prot, flags, fd, 0);
-
- if (return_val == (caddr_t) -1)
- unexec_error ("Failure mmap'ing file", 1);
- return return_val;
-}
-
-
-static long
-unexec_seek (int fd, long position)
-{
- long seek_value;
-
- if (fd <= 0)
- unexec_error ("No file open in which to seek", 0);
-
- errno = 0;
-
- if (position < 0)
- seek_value = (long) lseek (fd, 0, L_INCR);
- else
- seek_value = (long) lseek (fd, position, L_SET);
-
- if (seek_value < 0)
- unexec_error ("Failed to do a seek to 0x%x in %s", 1,
- position, "unexec() output file");
-
- return seek_value;
-}
-
-static void
-unexec_read (int fd, long position, char *buf, int bytes)
-{
- int n_read;
- int remains = bytes;
- position = unexec_seek (fd, position);
-
- if (bytes < 0)
- unexec_error ("Attempted read of %d bytes", 0, bytes);
-
- errno = 0;
-
- while (remains > 0)
- {
- n_read = read (fd, buf, remains);
- if (n_read <= 0)
- unexec_error ("Read failed for 0x%x bytes at offset 0x%x in %s",
- 1, bytes, position, "unexec() output file");
- buf += n_read;
- remains -= n_read;
- }
-
- return;
-}
-
-static void
-unexec_write (int fd, long position, char *buf, int bytes)
-{
- int n_written;
- int remains = bytes;
- position = unexec_seek (fd, position);
-
- if (bytes < 0)
- unexec_error ("Attempted write of %d bytes in %s",
- 0, bytes, "unexec() output file");
-
- errno = 0;
-
- while (remains > 0)
- {
- n_written = write (fd, buf, remains);
- if (n_written <= 0)
- unexec_error ("Write failed for 0x%x bytes at offset 0x%x in %s",
- 1, bytes, position, "unexec() output file");
- buf += n_written;
- remains -= n_written;
- }
-
- return;
-}
-
-static void
-unexec_pad (int fd, int bytes)
-{
- if (bytes > 0)
- {
- char buf[1024];
- int remaining = bytes;
-
- memset (buf, 0, sizeof (buf));
-
- while (remaining > 0)
- {
- int this_write = (remaining > sizeof(buf))?sizeof(buf):remaining;
- unexec_write (fd, -1, buf, this_write);
- remaining -= this_write;
- }
- }
-}
-
-static void
-unexec_fstat (int fd, struct stat *statptr)
-{
- errno = 0;
- if (-1 == fstat (fd, statptr))
- unexec_error ("fstat() failed for descriptor %d", 1, fd);
- return;
-}
-
-static void
-unexec_fchmod (int fd, int mode)
-{
- errno = 0;
- if (-1 == fchmod (fd, mode))
- unexec_error ("fchmod() failed for descriptor %d", 1, fd);
- return;
-}
-
-static long
-unexec_addr_to_offset (long addr, struct translation_struct *ts)
-
-{
- if ((addr < ts->txtaddr) || (addr >= ts->bssaddr))
- return -1;
- else if (addr >= ts->dataddr)
- return ((long) ((addr - ts->dataddr) + ts->datoff));
- else
- return ((long) ((addr - ts->txtaddr) + ts->txtoff));
-}
-
-
-/*
- * "LD.SO" DATA AND SYMBOL TABLE OPERATIONS
- */
-
-static void
-copy_relocation_site (struct relocation_info *ri,
- caddr_t from_base_addr,
- caddr_t to_base_addr,
- struct translation_struct *ts)
-{
- long offset;
- caddr_t from, to;
-
- /* We can get relocation sites in the bss region, for objects whose
- contents are copied from a shared library. We don't need or want
- to restore these at present. */
-#ifndef sparc
- if (ri->r_copy)
- return;
-#else
- /* Struct relocation_info_sparc doesn't have member r_copy.
- Instead, we use the address to check if this is run-time-copied. */
- if (ri->r_address >= ts->bssaddr && ri->r_address < ts->endaddr)
- return;
-#endif
-
- offset = unexec_addr_to_offset (ri->r_address, ts);
- if (offset == -1)
- unexec_error ("bad relocation address 0x%x (0x%x)", 0, ri->r_address,
- ((long *)ri)[1]);
-
- from = from_base_addr + offset;
- to = to_base_addr + offset;
- /* This stuff should be in a md_ file somewhere... */
-#ifndef sparc
- switch (ri->r_length)
- {
- case 0:
- *((char *) to) = *((char *) from);
- break;
- case 1:
- *((short *) to) = *((short *) from);
- break;
- case 2:
- *((long *) to) = *((long *) from);
- break;
- default:
- unexec_error ("unknown reloc length %d seen during unexec()",
- 0, ri->r_length);
- break;
- }
-#else /* sparc */
- switch (ri->r_type)
- {
- case RELOC_8:
- case RELOC_DISP8:
- *((char *) to) = *((char *) from);
- break;
- case RELOC_16:
- case RELOC_DISP16:
- *((short *) to) = *((short *) from);
- break;
- case RELOC_LO10:
- case RELOC_13:
- case RELOC_22:
- case RELOC_HI22:
- case RELOC_WDISP22:
- case RELOC_WDISP30:
- case RELOC_32:
- case RELOC_DISP32:
- case RELOC_GLOB_DAT:
- *((long *) to) = *((long *) from);
- break;
- case RELOC_JMP_SLOT:
- {
- long *target = (long *) to;
- long *source = (long *) from;
- *target = *source;
- target++;
- source++;
- *target = *source;
- target++;
- source++;
- *target = *source;
- }
- break;
- default:
- unexec_error ("unknown reloc type %d seen during unexec()",
- 0, ri->r_type);
- break;
- }
-#endif /* sparc */
-}
-
-static void
-reset_symtab (struct nlist *start, struct nlist *end, char *strtab,
- long edata_value, long end_value, int shlib_image)
-{
- struct nlist *tmp = start;
- int found_edata = 0;
- int found_end = 0;
-
- while (tmp < end)
- {
- int type = tmp->n_type;
-
- if ((type == (N_UNDF | N_EXT)) &&
- (tmp->n_value != 0))
- unexec_error ("unexec'ing image has COMMON symbols in it -- we quit!",
- 0);
-
- if (!(type & N_STAB))
- {
- if (!found_edata &&
- (type == (N_EXT | N_DATA)) &&
- tmp->n_un.n_strx &&
- !strcmp ("_edata", strtab + tmp->n_un.n_strx))
- {
- tmp->n_value = edata_value;
- found_edata = 1;
- }
-
-
- if ((type & N_TYPE) == N_BSS)
- {
- if (!found_end &&
- (type == (N_EXT | N_BSS)) &&
- tmp->n_un.n_strx &&
- !strcmp ("_end", strtab + tmp->n_un.n_strx))
- {
- tmp->n_value = end_value;
- found_end = 1;
- }
- else if (type & N_EXT)
- tmp->n_type = N_DATA | N_EXT;
- else
- tmp->n_type = N_DATA;
- }
-
- /* the way things are being handled here, having sbrk() in the
- image is fatal for an image linked with shared lib's (although
- the code could be modified to support it), but this should
- never happen anyway */
- if (shlib_image &&
- (type == (N_EXT | N_TEXT)) &&
- tmp->n_un.n_strx &&
- !strcmp ("_sbrk", strtab + tmp->n_un.n_strx))
- unexec_error ("unexec'd shlib image has sbrk() in it -- we quit!",
- 0);
- }
-
- tmp++;
- }
-}
-
-static void
-reset_ldso_symtab (struct nzlist *start, struct nzlist *end, char *strtab,
- long edata_value, long end_value, int shlib_image)
-{
- struct nzlist *tmp = start;
- int found_edata = 0;
- int found_end = 0;
-
- while (tmp < end) {
- int type = tmp->nz_type;
-/*
- * the following code breaks under FreeBSD-1.1-BETA, but everything
- * seems to work perfectly if it's commented out. This did not break
- * anything until the changes to ld.so were made.
- */
-/*
- if ((type == (N_UNDF | N_EXT)) && (tmp->nz_value != 0))
- unexec_error("unexec'ing image has COMMON symbols in rel -- we quit!",0);
-*/
- if (!(type & N_STAB)) {
- if (!found_edata &&
- (type == (N_EXT | N_DATA)) &&
- !strcmp ("_edata", strtab + tmp->nz_strx)) {
- tmp->nz_value = edata_value;
- found_edata = 1;
- }
-
- if ((type & N_TYPE) == N_BSS) {
- if (!found_end &&
- (type == (N_EXT | N_BSS)) &&
- !strcmp ("_end", strtab + tmp->nz_strx)) {
- tmp->nz_value = end_value;
- found_end = 1;
- } else if (type & N_EXT)
- tmp->nz_type = N_DATA | N_EXT;
- else
- tmp->nz_type = N_DATA;
- }
-
- /* the way things are being handled here, having sbrk() in the
- image is fatal for an image linked with shared lib's (although
- the code could be modified to support it), but this should
- never happen anyway */
- if (shlib_image &&
- (type == (N_EXT | N_TEXT)) &&
- !strcmp ("_sbrk", strtab + tmp->nz_strx))
- unexec_error("unexec'd shlib image has sbrk() ref -- we quit!", 0);
- }
- tmp++;
- }
-}
-
-extern int getpagesize (void);
-
-/*
- * EXPORTED FUNCTIONS
- */
-
-/* this has to be a global variable to prevent the optimizers from
- * assuming that it can not be 0.
-*/
-static void *dynamic_addr = (void *) &_DYNAMIC;
-
-int
-unexec (char *new_name, char *old_name, unsigned int UNUSED (emacs_edata),
- unsigned int UNUSED (dummy1), unsigned int UNUSED (dummy2))
-{
- /* ld.so data */
- struct _dynamic *ld = 0;
- struct section_dispatch_table *ld2 = 0;
- /* old and new state */
- int old_fd;
- int new_fd;
- caddr_t old_base_addr;
- caddr_t new_base_addr;
- struct exec old_hdr;
- struct exec new_hdr;
- struct stat old_buf;
- struct stat new_buf;
- /* some process specific "constants" */
- unsigned long n_pagsiz, new_edata;
- long page_size = getpagesize ();
- caddr_t plt_end;
- caddr_t current_break = (caddr_t) sbrk (0);
-
- if (!page_size)
- unexec_error ("unexec() failed because we can't get the size of a page!",
- 0);
-
- /* see if this is a -Bdynamic image -- if so, find ld.so structures */
- if (dynamic_addr)
- {
- ld = (struct _dynamic *) dynamic_addr;
- ld2 = ld->d_un.d_sdt;
- if (ld->d_version < LD_VERSION_BSD)
- unexec_error ("%s linked with obsolete version of ld -- we quit!",
- 0, old_name);
- }
-
- /* open the old and new files, figuring out how big the old one is
- so that we can map it in */
- old_fd = unexec_open (old_name, O_RDONLY, 0);
- new_fd = unexec_open (new_name, O_RDWR | O_CREAT | O_TRUNC, 0666);
-
- /* setup the header and the statbuf for old_fd */
- unexec_read (old_fd, 0, (char *) &old_hdr, sizeof (old_hdr));
- unexec_fstat (old_fd, &old_buf);
-
-
- /* set up some important constants */
- n_pagsiz = __LDPGSZ;
- if (dynamic_addr)
- plt_end = (caddr_t) MASK_UP (ld2->sdt_plt + ld2->sdt_plt_sz, sizeof (double));
- else
- plt_end = (caddr_t) N_DATADDR (old_hdr);
-
-#if 0
- /* never write protect the variable "environ", defined in /lib/crt0.o, and
- set in process.c */
- mprotect_bottom_addr = ((unsigned long) &environ) + sizeof (char **);
- /* never protect ABOVE the end of data emacs_edata specified */
- mprotect_top_addr = MIN (emacs_edata, N_DATADDR (old_hdr) + old_hdr.a_data);
-#endif
-
- /* Set up the image of the old file */
- old_base_addr = unexec_mmap (old_fd, old_buf.st_size, PROT_READ,
- MAP_FILE | MAP_PRIVATE);
- close (old_fd);
-
- /* set up the new exec */
- new_hdr = old_hdr;
- new_edata = (unsigned long) MASK_UP (current_break, n_pagsiz);
- new_hdr.a_data = new_edata - ((unsigned long) N_DATADDR (old_hdr));
- new_hdr.a_bss = 0;
-
- /* set up this variable, in case we want to reset "the break"
- when restarting */
- sbrk_of_0_at_unexec = ((unsigned long) MASK_UP (current_break, n_pagsiz));
-
- /* Write out the first approximation to the new file. The sizes of
- each section will be correct, but there will be a number of
- corrections that will need to be made. */
- {
- long old_datoff = N_DATOFF (old_hdr);
- long old_dataddr = N_DATADDR (old_hdr);
- long new_treloff = N_RELOFF (new_hdr);
- long old_treloff = N_RELOFF (old_hdr);
- long ld_so_size = ((unsigned long) plt_end) - old_dataddr;
- long real_data_size = current_break - plt_end;
- long pad_size =
- MASK_UP (current_break, n_pagsiz) - ((unsigned long) current_break);
-
-
- /* First, write the text segment with new header -- copy everything until
- the start of the data segment from the old file, and then go back and
- write the new header. */
- unexec_write (new_fd, 0, old_base_addr, old_datoff + ld_so_size);
- unexec_write (new_fd, 0, (char *) &new_hdr, sizeof (new_hdr));
-
- /* Copy the rest of the data segment from the running image. */
- unexec_write (new_fd, old_datoff + ld_so_size,
- plt_end, real_data_size);
-
- /* pad out the data segment */
- unexec_pad (new_fd, pad_size);
-
- /* Finally, copy the symbol table information from the old file. */
- unexec_write (new_fd, new_treloff,
- old_base_addr + old_treloff,
- old_buf.st_size - old_treloff);
- }
-
-
- /* Next, map in the output file so that we can jump around fixing it
- up. We retain the old file so that we can refer to it. */
- unexec_fstat (new_fd, &new_buf);
- new_base_addr = unexec_mmap (new_fd,
- MASK_UP (new_buf.st_size, page_size),
- PROT_READ | PROT_WRITE,
- MAP_FILE | MAP_SHARED);
-
-
-
- /* We need to do 2 things. First, make sure that _edata and _end (and
- hence, curbrk) are set to the correct values. At the same time, for
- neatness and to help with debugging, mark all the types of all ld.so
- and nm BSS symbols in the new file to be DATA, and make sure that
- there are no COMMON symbols in the output file, as any references to
- these can lose really big. Second, reset all of the ld.so "relocation
- sites" in the new file to have the values that appear in the old file
- -- the failure to do this was the biggest loser in the old version of
- this code. */
-
- /* STEP 1 */
- /* Reset the regular symbol table first. */
- reset_symtab ((struct nlist *) (new_base_addr + N_SYMOFF(new_hdr)),
- (struct nlist *) (new_base_addr + N_SYMOFF(new_hdr) +
- new_hdr.a_syms),
- (char *) (new_base_addr + N_STROFF(new_hdr)),
- new_edata, new_edata,
- !!dynamic_addr);
-
- /* Now reset the ld.so symbol table. */
- if (dynamic_addr)
- {
- struct translation_struct ts;
- struct relocation_info *tmp, *end;
- caddr_t syms, strings;
-
- /* set up the structure that we use to translate addresses in the
- old file into file offsets */
- ts.txtaddr = N_TXTADDR (old_hdr);
- ts.txtoff = N_TXTOFF (old_hdr);
- ts.dataddr = N_DATADDR (old_hdr);
- ts.datoff = N_DATOFF (old_hdr);
- ts.bssaddr = N_DATADDR (old_hdr) + old_hdr.a_data;
- ts.endaddr = ts.bssaddr + old_hdr.a_bss;
-
- syms = new_base_addr + unexec_addr_to_offset(ld2->sdt_nzlist, &ts);
- strings = new_base_addr + unexec_addr_to_offset(ld2->sdt_strings, &ts);
- reset_ldso_symtab ((struct nzlist *) syms, (struct nzlist *) strings,
- (char *) strings,
- new_edata, new_edata,
- !!dynamic_addr);
-
- /* STEP 2 */
- tmp = (struct relocation_info *)
- (old_base_addr + unexec_addr_to_offset(ld2->sdt_rel, &ts));
- end = (struct relocation_info *)
- (old_base_addr + unexec_addr_to_offset(ld2->sdt_hash, &ts));
- while (tmp < end)
- {
- copy_relocation_site (tmp, old_base_addr, new_base_addr, &ts);
- tmp++;
- }
- }
-
- /* get rid of the mmap-ed file space and make the output file
- executable -- then quit */
- munmap (new_base_addr, MASK_UP (new_buf.st_size, page_size));
- munmap (old_base_addr, MASK_UP (old_buf.st_size, page_size));
- unexec_fchmod (new_fd, 0755);
- close (new_fd);
- return 0;
-}
-
-
-int
-run_time_remap (char *UNUSED (dummy))
-{
- unsigned long current_sbrk = (unsigned long) sbrk (0);
-
-#if __FreeBSD_version < 300000 /* 2.x can work with this code */
- if (sbrk_of_0_at_unexec < current_sbrk)
- {
- if (sbrk_of_0_at_unexec != 0)
- fprintf (stderr, "Absurd new brk addr = %lx (current = %lx)\n",
- sbrk_of_0_at_unexec, current_sbrk);
- }
- else
-#endif
- if (sbrk_of_0_at_unexec > current_sbrk)
- {
- errno = 0;
- if (brk ((caddr_t) sbrk_of_0_at_unexec))
- fprintf (stderr, "failed to change brk addr to %lx: %s\n",
- sbrk_of_0_at_unexec, SYS_ERR);
- }
-
-#if 0
-/* with proper COW, i don't think we really need to do this... */
- {
- long page_size = getpagesize();
- unsigned long base_addr = MASK_UP (mprotect_bottom_addr, page_size);
- unsigned long top_addr = MASK_DOWN (mprotect_top_addr, page_size);
- long len = top_addr - base_addr;
-
- if (len > 0)
- {
- errno = 0;
- if (mprotect ((caddr_t) base_addr, len, PROT_READ | PROT_EXEC))
- fprintf (stderr, "failed to change protection on data pages: %s\n",
- SYS_ERR);
- }
- }
-#endif
-
- return 0;
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexfx2800.c
--- a/src/unexfx2800.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/* Unexec for the Alliant FX/2800.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-#include <stdio.h>
-#include "compiler.h"
-
-unexec (new_name, a_name, data_start, bss_start, entry_address)
- char *new_name, *a_name;
- unsigned UNUSED (data_start);
- unsigned UNUSED (bss_start);
- unsigned UNUSED (entry_address);
-{
- int stat;
-
- stat = elf_write_modified_data (a_name, new_name);
- if (stat < 0)
- perror ("emacs: elf_write_modified_data");
- else if (stat > 0)
- fprintf (stderr, "Unspecified error from elf_write_modified_data.\n");
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexhp9k3.c
--- a/src/unexhp9k3.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,526 +0,0 @@
-/*
- * Code to do an unexec for HPUX 8.0 on an HP9000/[34]00 for a
- * dynamically linked temacs.
-
- Copyright (C) 1992-1993 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not in FSF. */
-
-/*
-Created 29-Oct-92 by Harlan Sexton for SunOS
-
-Modified Jan 93 by Hamish Macdonald for HPUX
- */
-
-/********************** Included .h Files **************************/
-
-#include <config.h>
-
-#include <stdarg.h>
-#include <sys/param.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include "syssignal.h"
-#ifdef __hp9000s300
-# include </usr/include/debug.h>
-#endif
-#include <a.out.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/dir.h>
-
-#include "sysdep.h"
-#include "compiler.h"
-
-/* XEmacs: Richard Cognot <cognot@ensg.u-nancy.fr> says we need these */
-extern void perror(const char*);
-extern int sys_nerr;
-extern char *sys_errlist[];
-extern char *strerror (int);
-
-
-/********************** Macros *************************************/
-
-#define SYS_ERR \
- ((errno > 0)?((errno < sys_nerr)?(sys_errlist[errno]):\
- "unknown system error"): "unknown error")
-
-#define MASK_UP(x,p_of_two) \
- ((((unsigned long) (x)) + ((p_of_two) - 1)) & (~((p_of_two) - 1)))
-
-#define MASK_DOWN(x,p_of_two) (((unsigned long) (x)) & (~((p_of_two) - 1)))
-
-/********************** Function Prototypes/Declarations ***********/
-
-static void unexec_error (const char *fmt, int use_errno, ...);
-static int unexec_open (char *filename, int flag, int mode);
-static long unexec_seek (int fd, long position);
-static void unexec_read (int fd, long position, char *buf, int bytes);
-static void unexec_write (int fd, long position, char *buf, int bytes);
-static void unexec_copy (int new_fd, int old_fd, long old_pos, long new_pos,
- int bytes);
-static void unexec_pad (int fd, int bytes);
-static void unexec_fstat (int fd, struct stat *statptr);
-static void unexec_fchmod (int fd, int mode);
-int run_time_remap (char *dummy);
-
-/********************** Variables **********************************/
-
-/* for reporting error messages from system calls */
-extern int sys_nerr;
-extern int _DYNAMIC;
-extern char **environ;
-
-static unsigned long sbrk_of_0_at_unexec;
-
-/*******************************************************************/
-
-static void
-unexec_error (const char *fmt, int use_errno, ...)
-{
- const char *err_msg = SYS_ERR;
- va_list args;
-
- fprintf (stderr, "unexec - ");
- va_start (args, use_errno);
- vfprintf (stderr, fmt, args);
- va_end (args);
-
- if (use_errno)
- fprintf (stderr, ": %s", err_msg);
- fprintf (stderr, "\n");
- exit (1);
- return;
-}
-
-static int
-unexec_open (char *filename, int flag, int mode)
-{
- int fd;
-
- errno = 0;
-
- fd = open (filename, flag, mode);
-
- if (fd < 0)
- {
- unexec_error ("Failure opening file %s", 1, (void *) filename, 0, 0);
- return -1;
- }
- else
- return fd;
-}
-
-static long
-unexec_seek (int fd, long position)
-{
- long seek_value;
-
- if (fd <= 0)
- unexec_error ("No file open in which to seek", 0, 0, 0, 0);
-
- errno = 0;
-
- if (position < 0)
- seek_value = (long) lseek (fd, 0, L_INCR);
- else
- seek_value = (long) lseek (fd, position, L_SET);
-
- if (seek_value < 0)
- unexec_error ("Failed to do a seek to 0x%x in %s", 1,
- (char *) position, "unexec() output file", 0);
-
- return seek_value;
-}
-
-static void
-unexec_read (int fd, long position, char *buf, int bytes)
-{
- int n_read;
- int remains = bytes;
- position = unexec_seek (fd, position);
-
- if (bytes < 0)
- unexec_error ("Attempted read of %d bytes", 0, (char *) bytes, 0, 0);
-
- errno = 0;
-
- while (remains > 0)
- {
- n_read = read (fd, buf, remains);
- if (n_read <= 0)
- unexec_error ("Read failed for 0x%x bytes at offset 0x%x in %s",
- 1, (char *) bytes, (char *) position,
- "unexec() output file");
- buf += n_read;
- remains -= n_read;
- }
-
- return;
-}
-
-static void
-unexec_write (int fd, long position, char *buf, int bytes)
-{
- int n_written;
- int remains = bytes;
- position = unexec_seek (fd, position);
-
- if (bytes < 0)
- unexec_error ("Attempted write of %d bytes in %s",
- 0, (char *) bytes, "unexec() output file", 0);
-
- errno = 0;
-
- while (remains > 0)
- {
- n_written = write (fd, buf, remains);
- if (n_written <= 0)
- unexec_error ("Write failed for 0x%x bytes at offset 0x%x in %s",
- 1, (char *) bytes, (char *) position,
- "unexec() output file");
- buf += n_written;
- remains -= n_written;
- }
-
- return;
-}
-
-static void
-unexec_copy (int new_fd, int old_fd, long old_pos, long new_pos, int bytes)
-{
- int remains = bytes;
- char buf[128];
-
- while (remains > 0)
- {
- int n_to_copy = remains > sizeof(buf) ? sizeof(buf) : remains;
-
- unexec_read (old_fd, old_pos, buf, n_to_copy);
- unexec_write (new_fd, new_pos, buf, n_to_copy);
-
- old_pos += n_to_copy;
- new_pos += n_to_copy;
- remains -= n_to_copy;
- }
-
- return;
-}
-
-static void
-unexec_pad (int fd, int bytes)
-{
- if (bytes > 0)
- {
- char buf[1024];
- int remaining = bytes;
-
- memset (buf, 0, sizeof(buf));
-
- while (remaining > 0)
- {
- int this_write = (remaining > sizeof(buf))?sizeof(buf):remaining;
- unexec_write (fd, -1, buf, this_write);
- remaining -= this_write;
- }
- }
-}
-
-static void
-unexec_fstat (int fd, struct stat *statptr)
-{
- errno = 0;
- if (-1 == fstat (fd, statptr))
- unexec_error ("fstat() failed for descriptor %d", 1, (char *) fd, 0, 0);
- return;
-}
-
-static void
-unexec_fchmod (int fd, int mode)
-{
- errno = 0;
- if (-1 == fchmod (fd, mode))
- unexec_error ("fchmod() failed for descriptor %d", 1, (char *) fd, 0, 0);
- return;
-}
-
-/*
- * EXPORTED FUNCTIONS
- */
-
-/* this has to be a global variable to prevent the optimizers from
- * assuming that it can not be 0.
-*/
-static void *dynamic_addr = (void *) &_DYNAMIC;
-
-int
-unexec (char *new_name, char *old_name, unsigned int emacs_edata,
- unsigned int UNUSED (dummy1), unsigned int UNUSED (dummy2))
-{
- /* /dld.sl data */
- struct dynamic *ld = 0;
- /* old and new state */
- int old_fd;
- int new_fd;
- struct exec old_hdr;
- struct exec new_hdr;
- struct stat old_buf;
- /* some process specific "constants" */
- unsigned long n_pagsiz;
- caddr_t dynamic_beg;
- caddr_t current_break = (caddr_t) sbrk (0);
-
- /* dynamically linked image? -- if so, find dld.sl structures */
- if (dynamic_addr)
- {
- ld = (struct dynamic *) dynamic_addr;
-#ifdef DEBUG
- printf ("dl_text = %#x\n", ld->text);
- printf ("dl_data = %#x\n", ld->data);
- printf ("dl_bss = %#x\n", ld->bss);
- printf ("dl_end = %#x\n", ld->end);
- printf ("dl_dmodule = %#x\n", ld->dmodule);
- printf ("dl_dlt = %#x\n", ld->dlt);
- printf ("dl_plt = %#x\n", ld->plt);
-#endif
- }
-
- /* open the old and new files, figuring out how big the old one is
- so that we can map it in */
- old_fd = unexec_open (old_name, O_RDONLY, 0);
- new_fd = unexec_open (new_name, O_RDWR | O_CREAT | O_TRUNC, 0666);
-
- /* setup the header and the statbuf for old_fd */
- unexec_read (old_fd, 0, (char *) &old_hdr, sizeof (old_hdr));
- unexec_fstat (old_fd, &old_buf);
-
- /* set up some important constants */
- n_pagsiz = EXEC_PAGESIZE;
-
- /* setup beginning of data to copy from executable */
- if (ld)
- dynamic_beg = ld->dmodule;
- else
- dynamic_beg = (caddr_t)EXEC_ALIGN (old_hdr.a_text) + old_hdr.a_data;
-
- /* set up the new exec */
- new_hdr = old_hdr;
- new_hdr.a_text = MASK_DOWN (emacs_edata, n_pagsiz);
- new_hdr.a_data = MASK_UP (current_break, n_pagsiz)
- - EXEC_ALIGN(new_hdr.a_text);
- new_hdr.a_bss = 0;
-
-#ifdef DEBUG
- printf ("old text %#x\n", old_hdr.a_text);
- printf ("new text %#x\n", new_hdr.a_text);
- printf ("old data %#x\n", old_hdr.a_data);
- printf ("new data %#x\n", new_hdr.a_data);
- printf ("old bss %#x\n", old_hdr.a_bss);
- printf ("new bss %#x\n", new_hdr.a_bss);
-#endif
-
- /* set up this variable, in case we want to reset "the break"
- when restarting */
- sbrk_of_0_at_unexec = ((unsigned long) MASK_UP (current_break, n_pagsiz));
-
- /* Write out the first approximation to the new file. The sizes of
- each section will be correct, but there will be a number of
- corrections that will need to be made. */
- {
- long old_datoff = DATA_OFFSET (old_hdr);
- long new_datoff = DATA_OFFSET (new_hdr);
- long old_dataddr = EXEC_ALIGN (old_hdr.a_text);
- long new_dataddr = EXEC_ALIGN (new_hdr.a_text);
- long new_mcaloff = MODCAL_OFFSET (new_hdr);
- long old_mcaloff = MODCAL_OFFSET (old_hdr);
- long newtext_size = new_hdr.a_text - old_dataddr;
- long newdata1_size = (unsigned long)dynamic_beg - new_dataddr;
- long dyn_size = (EXEC_ALIGN (old_hdr.a_text) + old_hdr.a_data)
- - (unsigned long)dynamic_beg;
- long newdata2_size = (unsigned long)current_break
- - ((unsigned long)dynamic_beg + dyn_size);
- long pad_size =
- MASK_UP (current_break, n_pagsiz) - ((unsigned long) current_break);
-
-#ifdef DEBUG
- printf ("current break is %#lx\n", current_break);
-
- printf ("old_dataddr = %#lx, dynamic_beg = %#lx\n",
- old_dataddr, dynamic_beg);
-#endif
-
- /*
- * First, write the text segment with new header -- copy
- * everything until the start of the data segment from the old
- * file
- */
-#ifdef DEBUG
- printf ("copying %#lx bytes of text from 0\n", old_datoff);
-#endif
- unexec_copy (new_fd, old_fd, 0, 0, old_datoff);
- /* pad out the text segment */
-#ifdef DEBUG
- printf ( "text pad size is %#x\n", old_dataddr - old_hdr.a_text);
-#endif
- unexec_pad (new_fd, old_dataddr - old_hdr.a_text);
-
- /*
- * Update debug header spoo
- */
- if (new_hdr.a_extension > 0)
- {
- new_hdr.a_extension += LESYM_OFFSET(new_hdr) - LESYM_OFFSET(old_hdr);
- }
-
- /*
- * go back and write the new header.
- */
- unexec_write (new_fd, 0, (char *) &new_hdr, sizeof (new_hdr));
-
-
- /*
- * Copy the part of the data segment which becomes text from the
- * running image.
- */
-#ifdef DEBUG
- printf ("copying %#lx bytes of new text from %#lx to position %#lx\n",
- newtext_size, old_dataddr, TEXT_OFFSET(new_hdr) + old_dataddr);
-#endif
- unexec_write (new_fd, TEXT_OFFSET(new_hdr) + old_dataddr,
- (caddr_t)old_dataddr, newtext_size);
-
-#ifdef DEBUG
- printf ("new DATA_OFFSET is %#lx\n", new_datoff);
-#endif
-
- /*
- * Copy the part of the old data segment which will be data
- * in the new executable (before the dynamic stuff)
- * from the running image.
- */
-#ifdef DEBUG
- printf ("copying %#lx bytes of data from %#lx to position %#lx\n",
- newdata1_size, new_dataddr, new_datoff);
-#endif
- unexec_write (new_fd, new_datoff, (caddr_t)new_dataddr, newdata1_size);
-
- /* copy the dynamic part of the data segment from the old executable */
- if (dyn_size)
- {
-#ifdef DEBUG
- printf ("copying %#lx bytes of dyn data from executable"
- " at address %#lx to position %#lx\n",
- dyn_size, dynamic_beg, new_datoff + newdata1_size);
-#endif
- unexec_copy (new_fd, old_fd, old_datoff + newtext_size + newdata1_size,
- new_datoff + newdata1_size, dyn_size);
- }
-
- /* copy remaining data (old bss) from the running image */
-#ifdef DEBUG
- printf ("copying %#lx bytes of data from %#lx to position %#lx\n",
- newdata2_size, new_dataddr + newdata1_size + dyn_size,
- new_datoff + newdata1_size + dyn_size);
-#endif
- unexec_write (new_fd, new_datoff + newdata1_size + dyn_size,
- (caddr_t)(new_dataddr + newdata1_size + dyn_size),
- newdata2_size);
-
- /* pad out the data segment */
-#ifdef DEBUG
- printf ( "pad size is %#x\n", pad_size);
-#endif
- unexec_pad (new_fd, pad_size);
-
- /* Finally, copy the rest of the junk from the old file. */
-#ifdef DEBUG
- printf ("Copying %#lx bytes of junk from %#lx (old) to %#lx (new)\n",
- old_buf.st_size - old_mcaloff, old_mcaloff, new_mcaloff);
-#endif
- unexec_copy (new_fd, old_fd, old_mcaloff, new_mcaloff,
- old_buf.st_size - old_mcaloff);
-
- {
- long curpos, offset;
- struct _debug_header dhdr;
- int new_header_delta;
-
- new_header_delta = LESYM_OFFSET(new_hdr) - LESYM_OFFSET(old_hdr);
- if ((new_header_delta > 0) &&
- ((offset = EXT_OFFSET(old_hdr)) > 0))
- {
- curpos = lseek(new_fd, 0, SEEK_CUR);
- lseek(old_fd, offset, 0);
- if (read(old_fd, &dhdr, sizeof(dhdr)) == sizeof(dhdr))
- {
- dhdr.header_offset += new_header_delta;
- dhdr.gntt_offset += new_header_delta;
- dhdr.lntt_offset += new_header_delta;
- dhdr.slt_offset += new_header_delta;
- dhdr.vt_offset += new_header_delta;
- dhdr.xt_offset += new_header_delta;
- lseek(new_fd, EXT_OFFSET(new_hdr), SEEK_SET);
- if (write(new_fd, &dhdr, sizeof(dhdr)) != sizeof(dhdr))
- {
- unexec_error("Unable to write debug information to \"%s\"\n",
- 1, new_name);
- }
- lseek(new_fd, curpos, SEEK_SET);
- }
- else
- {
- unexec_error("Unable to read debug information from \"%s\"\n",
- 1, old_name);
- }
- }
- }
- }
-
-
- /* make the output file executable -- then quit */
- unexec_fchmod (new_fd, 0755);
- close (old_fd);
- close (new_fd);
- return 0;
-}
-
-
-int
-run_time_remap (char *UNUSED (dummy))
-{
- unsigned long current_sbrk = (unsigned long) sbrk (0);
-
- if (sbrk_of_0_at_unexec < current_sbrk)
- fprintf (stderr, "Absurd new brk addr = 0x%x (current = 0x%x)\n",
- sbrk_of_0_at_unexec, current_sbrk);
- else
- {
- errno = 0;
- if (brk ((caddr_t) sbrk_of_0_at_unexec))
- fprintf (stderr, "failed to change brk addr to 0x%x: %s\n",
- sbrk_of_0_at_unexec, SYS_ERR);
- }
-
- return 0;
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexmips.c
--- a/src/unexmips.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,359 +0,0 @@
-/* Unexec for MIPS (including IRIS4D).
- Copyright (C) 1988, 1992, 1993, 1994
- Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: FSF 19.31. */
-
-#include <config.h>
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <errno.h>
-#include <varargs.h>
-#include "compiler.h"
-
-#ifdef MACH
-
-#include <a.out.h>
-
-/* I don't know why this isn't defined. */
-#ifndef STYP_INIT
-#define STYP_INIT 0x80000000
-#endif
-
-/* I don't know why this isn't defined. */
-#ifndef _RDATA
-#define _RDATA ".rdata"
-#define STYP_RDATA 0x00000100
-#endif
-
-/* Small ("near") data section. */
-#ifndef _SDATA
-#define _SDATA ".sdata"
-#define STYP_SDATA 0x00000200
-#endif
-
-/* Small ("near") bss section. */
-#ifndef _SBSS
-#define _SBSS ".sbss"
-#define STYP_SBSS 0x00000400
-#endif
-
-/* We don't seem to have a sym.h or syms.h anywhere, so we'll do it the
- hard way. This stinks. */
-typedef struct {
- short magic;
- short vstamp;
- long ilineMax;
- struct { long foo, offset; } offsets[11];
-} HDRR, *pHDRR;
-
-#else /* not MACH */
-
-#include <filehdr.h>
-#include <aouthdr.h>
-#include <scnhdr.h>
-#include <sym.h>
-
-#endif /* not MACH */
-
-#if defined (IRIS_4D) || defined (sony)
-#include "getpagesize.h"
-#include <fcntl.h>
-#endif
-
-static void fatal_unexec ();
-static void mark_x ();
-
-#define READ(_fd, _buffer, _size, _error_message, _error_arg) \
- errno = EEOF; \
- if (read (_fd, _buffer, _size) != _size) \
- fatal_unexec (_error_message, _error_arg);
-
-#define WRITE(_fd, _buffer, _size, _error_message, _error_arg) \
- if (write (_fd, _buffer, _size) != _size) \
- fatal_unexec (_error_message, _error_arg);
-
-#define SEEK(_fd, _position, _error_message, _error_arg) \
- errno = EEOF; \
- if (lseek (_fd, _position, L_SET) != _position) \
- fatal_unexec (_error_message, _error_arg);
-
-extern char *strerror ();
-#define EEOF -1
-
-static struct scnhdr *text_section;
-static struct scnhdr *init_section;
-static struct scnhdr *finit_section;
-static struct scnhdr *rdata_section;
-static struct scnhdr *data_section;
-static struct scnhdr *lit8_section;
-static struct scnhdr *lit4_section;
-static struct scnhdr *sdata_section;
-static struct scnhdr *sbss_section;
-static struct scnhdr *bss_section;
-
-struct headers {
- struct filehdr fhdr;
- struct aouthdr aout;
- struct scnhdr section[10];
-};
-
-/* Define name of label for entry point for the dumped executable. */
-
-#ifndef DEFAULT_ENTRY_ADDRESS
-#define DEFAULT_ENTRY_ADDRESS __start
-#endif
-
-unexec (new_name, a_name, data_start, bss_start, entry_address)
- char *new_name, *a_name;
- unsigned data_start;
- unsigned UNUSED (bss_start);
- unsigned entry_address;
-{
- int new_, old;
- int pagesize, brk;
- int newsyms, symrel;
- int nread;
- struct headers hdr;
- int i;
- int vaddr, scnptr;
-#define BUFSIZE 8192
- char buffer[BUFSIZE];
-
- old = open (a_name, O_RDONLY, 0);
- if (old < 0) fatal_unexec ("opening %s", a_name);
-
- new_ = creat (new_name, 0666);
- if (new_ < 0) fatal_unexec ("creating %s", new_name);
-
- hdr = *((struct headers *)TEXT_START);
-#ifdef MIPS2
- if (hdr.fhdr.f_magic != MIPSELMAGIC
- && hdr.fhdr.f_magic != MIPSEBMAGIC
- && hdr.fhdr.f_magic != (MIPSELMAGIC | 1)
- && hdr.fhdr.f_magic != (MIPSEBMAGIC | 1))
- {
- fprintf (stderr,
- "unexec: input file magic number is %x, not %x, %x, %x or %x.\n",
- hdr.fhdr.f_magic,
- MIPSELMAGIC, MIPSEBMAGIC,
- MIPSELMAGIC | 1, MIPSEBMAGIC | 1);
- exit(1);
- }
-#else /* not MIPS2 */
- if (hdr.fhdr.f_magic != MIPSELMAGIC
- && hdr.fhdr.f_magic != MIPSEBMAGIC)
- {
- fprintf (stderr, "unexec: input file magic number is %x, not %x or %x.\n",
- hdr.fhdr.f_magic, MIPSELMAGIC, MIPSEBMAGIC);
- exit (1);
- }
-#endif /* not MIPS2 */
- if (hdr.fhdr.f_opthdr != sizeof (hdr.aout))
- {
- fprintf (stderr, "unexec: input a.out header is %d bytes, not %d.\n",
- hdr.fhdr.f_opthdr, sizeof (hdr.aout));
- exit (1);
- }
- if (hdr.aout.magic != ZMAGIC)
- {
- fprintf (stderr, "unexec: input file a.out magic number is %o, not %o.\n",
- hdr.aout.magic, ZMAGIC);
- exit (1);
- }
-
-#define CHECK_SCNHDR(ptr, name, flags) \
- ptr = NULL; \
- for (i = 0; i < hdr.fhdr.f_nscns && !ptr; i++) \
- if (strcmp (hdr.section[i].s_name, name) == 0) \
- { \
- if (hdr.section[i].s_flags != flags) \
- fprintf (stderr, "unexec: %x flags (%x expected) in %s section.\n", \
- hdr.section[i].s_flags, flags, name); \
- ptr = hdr.section + i; \
- }
-
- CHECK_SCNHDR (text_section, _TEXT, STYP_TEXT);
- CHECK_SCNHDR (init_section, _INIT, STYP_INIT);
- CHECK_SCNHDR (rdata_section, _RDATA, STYP_RDATA);
- CHECK_SCNHDR (data_section, _DATA, STYP_DATA);
-#ifdef _LIT8
- CHECK_SCNHDR (lit8_section, _LIT8, STYP_LIT8);
- CHECK_SCNHDR (lit4_section, _LIT4, STYP_LIT4);
-#endif /* _LIT8 */
- CHECK_SCNHDR (sdata_section, _SDATA, STYP_SDATA);
- CHECK_SCNHDR (sbss_section, _SBSS, STYP_SBSS);
- CHECK_SCNHDR (bss_section, _BSS, STYP_BSS);
-#if 0 /* Apparently this error check goes off on irix 3.3,
- but it doesn't indicate a real problem. */
- if (i != hdr.fhdr.f_nscns)
- fprintf (stderr, "unexec: %d sections found instead of %d.\n",
- i, hdr.fhdr.f_nscns);
-#endif
-
- text_section->s_scnptr = 0;
-
- pagesize = getpagesize ();
- /* Casting to int avoids compiler error on NEWS-OS 5.0.2. */
- brk = (((int) (sbrk (0))) + pagesize - 1) & (-pagesize);
- hdr.aout.dsize = brk - DATA_START;
- hdr.aout.bsize = 0;
- if (entry_address == 0)
- {
- extern DEFAULT_ENTRY_ADDRESS ();
- hdr.aout.entry = (unsigned)DEFAULT_ENTRY_ADDRESS;
- }
- else
- hdr.aout.entry = entry_address;
-
- hdr.aout.bss_start = hdr.aout.data_start + hdr.aout.dsize;
- rdata_section->s_size = data_start - DATA_START;
-
- /* Adjust start and virtual addresses of rdata_section, too. */
- rdata_section->s_vaddr = DATA_START;
- rdata_section->s_paddr = DATA_START;
- rdata_section->s_scnptr = text_section->s_scnptr + hdr.aout.tsize;
-
- data_section->s_vaddr = data_start;
- data_section->s_paddr = data_start;
- data_section->s_size = brk - data_start;
- data_section->s_scnptr = rdata_section->s_scnptr + rdata_section->s_size;
- vaddr = data_section->s_vaddr + data_section->s_size;
- scnptr = data_section->s_scnptr + data_section->s_size;
- if (lit8_section != NULL)
- {
- lit8_section->s_vaddr = vaddr;
- lit8_section->s_paddr = vaddr;
- lit8_section->s_size = 0;
- lit8_section->s_scnptr = scnptr;
- }
- if (lit4_section != NULL)
- {
- lit4_section->s_vaddr = vaddr;
- lit4_section->s_paddr = vaddr;
- lit4_section->s_size = 0;
- lit4_section->s_scnptr = scnptr;
- }
- if (sdata_section != NULL)
- {
- sdata_section->s_vaddr = vaddr;
- sdata_section->s_paddr = vaddr;
- sdata_section->s_size = 0;
- sdata_section->s_scnptr = scnptr;
- }
- if (sbss_section != NULL)
- {
- sbss_section->s_vaddr = vaddr;
- sbss_section->s_paddr = vaddr;
- sbss_section->s_size = 0;
- sbss_section->s_scnptr = scnptr;
- }
- if (bss_section != NULL)
- {
- bss_section->s_vaddr = vaddr;
- bss_section->s_paddr = vaddr;
- bss_section->s_size = 0;
- bss_section->s_scnptr = scnptr;
- }
-
- WRITE (new_, (void *) TEXT_START, hdr.aout.tsize,
- "writing text section to %s", new_name);
- WRITE (new_, (void *) DATA_START, hdr.aout.dsize,
- "writing data section to %s", new_name);
-
- SEEK (old, hdr.fhdr.f_symptr, "seeking to start of symbols in %s", a_name);
- errno = EEOF;
- nread = read (old, buffer, BUFSIZE);
- if (nread < sizeof (HDRR)) fatal_unexec ("reading symbols from %s", a_name);
- newsyms = hdr.aout.tsize + hdr.aout.dsize;
- symrel = newsyms - hdr.fhdr.f_symptr;
- hdr.fhdr.f_symptr = newsyms;
-#define symhdr ((pHDRR)buffer)
-#ifdef MACH
- for (i = 0; i < 11; i++)
- symhdr->offsets[i].offset += symrel;
-#else
- symhdr->cbLineOffset += symrel;
- symhdr->cbDnOffset += symrel;
- symhdr->cbPdOffset += symrel;
- symhdr->cbSymOffset += symrel;
- symhdr->cbOptOffset += symrel;
- symhdr->cbAuxOffset += symrel;
- symhdr->cbSsOffset += symrel;
- symhdr->cbSsExtOffset += symrel;
- symhdr->cbFdOffset += symrel;
- symhdr->cbRfdOffset += symrel;
- symhdr->cbExtOffset += symrel;
-#endif
-#undef symhdr
- do
- {
- if (write (new_, buffer, nread) != nread)
- fatal_unexec ("writing symbols to %s", new_name);
- nread = read (old, buffer, BUFSIZE);
- if (nread < 0) fatal_unexec ("reading symbols from %s", a_name);
-#undef BUFSIZE
- } while (nread != 0);
-
- SEEK (new_, 0, "seeking to start of header in %s", new_name);
- WRITE (new_, &hdr, sizeof (hdr),
- "writing header of %s", new_name);
-
- close (old);
- close (new_);
- mark_x (new_name);
-}
-
-/*
- * mark_x
- *
- * After successfully building the new a.out, mark it executable
- */
-
-static void
-mark_x (name)
- char *name;
-{
- struct stat sbuf;
- int um = umask (777);
- umask (um);
- if (stat (name, &sbuf) < 0)
- fatal_unexec ("getting protection on %s", name);
- sbuf.st_mode |= 0111 & ~um;
- if (chmod (name, sbuf.st_mode) < 0)
- fatal_unexec ("setting protection on %s", name);
-}
-
-static void
-fatal_unexec (s, va_alist)
- va_dcl
-{
- va_list ap;
- if (errno == EEOF)
- fputs ("unexec: unexpected end of file, ", stderr);
- else
- fprintf (stderr, "unexec: %s, ", strerror (errno));
- va_start (ap);
- _doprnt (s, ap, stderr);
- fputs (".\n", stderr);
- exit (1);
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexnext.c
--- a/src/unexnext.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,303 +0,0 @@
-/* Dump Emacs in macho format.
- Copyright (C) 1990-1993 Free Software Foundation, Inc.
- Written by Bradley Taylor (btaylor@next.com).
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: NeXT port */
-
-#include <stdio.h>
-#include <libc.h>
-#include <nlist.h>
-#include <mach/mach.h>
-#include <mach-o/ldsyms.h>
-#include <mach-o/loader.h>
-
-int malloc_cookie;
-
-static void fatal_unexec(char *format, ...)
- {
- va_list ap;
-
- va_start(ap, format);
- fprintf(stderr, "unexec: ");
- vfprintf(stderr, format, ap);
- fprintf(stderr, "\n");
- va_end(ap);
- exit(1);
- }
-
-static void mcopy(int ffd,int tfd,
- unsigned long fpos,unsigned long tpos,unsigned long len)
- {
- if ((ffd==-1)&&(tfd==-1))
- {
- char *f,*t,*e;
- if (fpos>tpos)
- {
- f=(char *)fpos;
- t=(char *)tpos;
- e=(char *)(fpos+len);
- while(f<e) *t++=*f++;
- }
- else if (tpos>fpos)
- {
- f=(char *)(fpos+len);
- t=(char *)(tpos+len);
- e=(char *)fpos;
- while(f>e) *--t=*--f;
- }
- }
- else if (ffd==-1)
- {
- if (lseek(tfd,tpos,L_SET)<0)
- fatal_unexec("cannot seek target");
- if (write(tfd,(void *)fpos,len)!=len)
- fatal_unexec("cannot write target");
- }
- else if (tfd==-1)
- {
- if (lseek(ffd,fpos,L_SET)<0)
- fatal_unexec("cannot seek source");
- if (read(ffd,(void *)tpos,len)!=len)
- fatal_unexec("cannot read source");
- }
- else
- {
- int bread;
- char *buf=alloca(1<<16);
-
- if (lseek(ffd,fpos,L_SET)<0)
- fatal_unexec("cannot seek source");
-
- if (lseek(tfd,tpos,L_SET)<0)
- fatal_unexec("cannot seek target");
-
- while((len>0) && (bread=read(ffd,buf,MIN(1<<16,len)))>0)
- {
- if (bread<0)
- fatal_unexec("cannot read source");
- if (write(tfd,buf,bread)!=bread)
- fatal_unexec("cannot write target");
- len-=bread;
- }
- }
- }
-
-static void unexec_doit(int infd,int outfd)
- {
- int i,j,hpos,opos;
- extern int malloc_freezedry(void);
- struct region
- {
- struct region *next;
- unsigned long addr;
- unsigned long size;
- vm_prot_t prot;
- vm_prot_t mprot;
- } *regions=0,*cregion,**pregions;
- struct mach_header mh;
- struct segment_command *lc,*sp;
- struct symtab_command *st;
- struct section *sect;
-
- malloc_cookie=malloc_freezedry();
-
- {
- vm_task_t task=task_self();
- vm_address_t addr;
- vm_size_t size;
- vm_prot_t prot,mprot;
- vm_inherit_t inhe;
- boolean_t shrd;
- port_t name;
- vm_offset_t offset;
-
- for(addr=VM_MIN_ADDRESS,pregions=®ions;
- vm_region(task,&addr,&size,&prot,&mprot,
- &inhe,&shrd,&name,&offset)==KERN_SUCCESS;
- addr += size)
- {
- (*pregions)=alloca(sizeof(struct region));
- (*pregions)->addr=addr;
- (*pregions)->size=size;
- (*pregions)->prot=prot;
- (*pregions)->mprot=mprot;
- (*pregions)->next=0;
- pregions=&((*pregions)->next);
- }
- }
-
- for(cregion=regions;cregion;cregion=cregion->next)
- while ((cregion->next) &&
- (cregion->next->addr==cregion->addr+cregion->size) &&
- (cregion->next->prot==cregion->prot) &&
- (cregion->next->mprot==cregion->mprot))
- {
- cregion->size += cregion->next->size;
- cregion->next = cregion->next->next;
- }
-
- mcopy(infd,-1,0,(unsigned long) &mh,sizeof(mh));
- lc=alloca(mh.sizeofcmds);
- mcopy(infd,-1,sizeof(mh),(unsigned long) lc,mh.sizeofcmds);
-
- for(pregions=®ions;*pregions;)
- {
- if (!((*pregions)->prot&VM_PROT_WRITE)
- || ((*pregions)->addr>=0x3000000))
- goto kill_region;
-
- for(sp=lc,i=0;
- i<mh.ncmds;
- i++,sp=(struct segment_command *)(((char *)sp)+sp->cmdsize))
- {
- unsigned long ob,oe;
- if (sp->cmd!=LC_SEGMENT||(strcmp(sp->segname,SEG_DATA)==0)) continue;
- ob=MAX((*pregions)->addr,sp->vmaddr);
- oe=MIN((*pregions)->addr+(*pregions)->size,sp->vmaddr+sp->vmsize);
- if (ob >= oe) continue;
- if (ob==(*pregions)->addr)
- if (oe==(*pregions)->addr+(*pregions)->size)
- {
- goto kill_region;
- }
- else
- {
- (*pregions)->addr=oe;
- (*pregions)->size-=(oe-ob);
- }
- else
- if (oe==(*pregions)->addr+(*pregions)->size)
- {
- (*pregions)->size-=(oe-ob);
- }
- else
- {
- cregion=alloca(sizeof(*cregion));
- cregion->addr=oe;
- cregion->size=((*pregions)->addr+(*pregions)->size)-oe;
- cregion->prot=(*pregions)->prot;
- cregion->mprot=(*pregions)->mprot;
- cregion->next=(*pregions)->next;
- (*pregions)->size=ob-(*pregions)->addr;
- (*pregions)->next=cregion;
- }
- }
- pregions=&((*pregions)->next);
- continue;
- kill_region:
- *pregions=(*pregions)->next;
- }
-
- for(sp=lc,i=mh.ncmds,hpos=sizeof(mh),opos=0;
- i>0;
- i--,sp=(struct segment_command *)(((char *)sp)+sp->cmdsize))
- switch (sp->cmd)
- {
- case LC_SEGMENT:
- if (strcmp(sp->segname,SEG_DATA)==0)
- {
- mh.ncmds--;
- j=sp->cmdsize;
- while (regions)
- {
- mcopy(-1,outfd,regions->addr,opos,regions->size);
- sp->cmd=LC_SEGMENT;
- sp->cmdsize=sizeof(*sp);
- strncpy(sp->segname,SEG_DATA,sizeof(sp->segname));
- sp->vmaddr=regions->addr;
- sp->vmsize=regions->size;
- sp->filesize=regions->size;
- sp->maxprot=regions->prot;
- sp->initprot=regions->mprot;
- sp->nsects=0;
- sp->flags=0;
- sp->fileoff=opos;
- opos+=sp->filesize;
- mcopy(-1,outfd,(unsigned long)sp,hpos,sp->cmdsize);
- hpos+=sp->cmdsize;
- mh.ncmds++;
- regions=regions->next;
- }
- sp->cmdsize=j;
- regions=0;
- }
- else if (strcmp(sp->segname,SEG_LINKEDIT)==0)
- {
- mh.ncmds--;
- }
- else
- {
- mcopy(infd,outfd,sp->fileoff,opos,sp->filesize);
- sect=(struct section *) (((char *)sp)+sizeof(*sp));
- for(j=0;j<sp->nsects;j++)
- {
- if (sect[j].offset!=0)
- sect[j].offset=(sect[j].offset-sp->fileoff)+opos;
- if (sect[j].reloff!=0)
- sect[j].reloff=(sect[j].reloff-sp->fileoff)+opos;
- }
- sp->fileoff=opos;
- opos+=sp->filesize;
- mcopy(-1,outfd,(unsigned long)sp,hpos,sp->cmdsize);
- hpos+=sp->cmdsize;
- }
- break;
- case LC_SYMTAB:
- st=(struct symtab_command *)sp;
-
- mcopy(infd,outfd,st->symoff,opos,st->nsyms*sizeof(struct nlist));
- st->symoff=opos;
- opos+=sizeof(struct nlist)*st->nsyms;
-
- mcopy(infd,outfd,st->stroff,opos,st->strsize);
- ((struct symtab_command *)sp)->stroff=opos;
- opos+=((struct symtab_command *)sp)->strsize;
- default:
- mcopy(-1,outfd,(unsigned long)sp,hpos,sp->cmdsize);
- hpos+=sp->cmdsize;
- }
- mh.sizeofcmds=hpos-sizeof(mh);
- mcopy(-1,outfd,(unsigned long) &mh,0,sizeof(mh));
- }
-
-void unexec(char *outfile,char *infile)
- {
- char tmpfile[PATH_MAX_EXTERNAL];
- int infd,outfd;
-
- if ((infd=open(infile, O_RDONLY, 0))<0)
- fatal_unexec("cannot open input file `%s'", infile);
-
- strcpy(tmpfile,outfile);
- strcat(tmpfile,"-temp");
-
- if ((outfd=open(tmpfile, O_RDWR|O_TRUNC|O_CREAT, 0755))<0)
- fatal_unexec("cannot open temporary output file `%s'",tmpfile);
-
- unexec_doit(infd,outfd);
-
- close(infd);
- close(outfd);
- if (rename(tmpfile, outfile)<0)
- {
- unlink(tmpfile);
- fatal_unexec("cannot rename `%s' to `%s'", tmpfile, outfile);
- }
- }
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexsni.c
--- a/src/unexsni.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,840 +0,0 @@
-/* Unexec for Siemens machines running Sinix (modified SVR4).
- Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995
- Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-XEmacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
-In other words, you are welcome to use, share and improve this program.
-You are forbidden to forbid anyone else to use, share and improve
-what you give them. Help stamp out software-hoarding! */
-
-/* Synched up with: FSF 19.31. */
-
-/*
- * unexec.c - Convert a running program into an a.out file.
- *
- * Author: Spencer W. Thomas
- * Computer Science Dept.
- * University of Utah
- * Date: Tue Mar 2 1982
- * Modified heavily since then.
- *
- * Synopsis:
- * unexec (new_name, a_name, data_start, bss_start, entry_address)
- * char *new_name, *a_name;
- * unsigned data_start, bss_start, entry_address;
- *
- * Takes a snapshot of the program and makes an a.out format file in the
- * file named by the string argument new_name.
- * If a_name is non-NULL, the symbol table will be taken from the given file.
- * On some machines, an existing a_name file is required.
- *
- * The boundaries within the a.out file may be adjusted with the data_start
- * and bss_start arguments. Either or both may be given as 0 for defaults.
- *
- * Data_start gives the boundary between the text segment and the data
- * segment of the program. The text segment can contain shared, read-only
- * program code and literal data, while the data segment is always unshared
- * and unprotected. Data_start gives the lowest unprotected address.
- * The value you specify may be rounded down to a suitable boundary
- * as required by the machine you are using.
- *
- * Specifying zero for data_start means the boundary between text and data
- * should not be the same as when the program was loaded.
- * If NO_REMAP is defined, the argument data_start is ignored and the
- * segment boundaries are never changed.
- *
- * Bss_start indicates how much of the data segment is to be saved in the
- * a.out file and restored when the program is executed. It gives the lowest
- * unsaved address, and is rounded up to a page boundary. The default when 0
- * is given assumes that the entire data segment is to be stored, including
- * the previous data and bss as well as any additional storage allocated with
- * break (2).
- *
- * The new file is set up to start at entry_address.
- *
- * If you make improvements I'd like to get them too.
- * harpo!utah-cs!thomas, thomas@Utah-20
- *
- */
-
-/* Even more heavily modified by james@bigtex.cactus.org of Dell Computer Co.
- * ELF support added.
- *
- * Basic theory: the data space of the running process needs to be
- * dumped to the output file. Normally we would just enlarge the size
- * of .data, scooting everything down. But we can't do that in ELF,
- * because there is often something between the .data space and the
- * .bss space.
- *
- * In the temacs dump below, notice that the Global Offset Table
- * (.got) and the Dynamic link data (.dynamic) come between .data1 and
- * .bss. It does not work to overlap .data with these fields.
- *
- * The solution is to create a new .data segment. This segment is
- * filled with data from the current process. Since the contents of
- * various sections refer to sections by index, the new .data segment
- * is made the last in the table to avoid changing any existing index.
- */
-
-/* Modified by wtien@urbana.mcd.mot.com of Motorola Inc.
- *
- * The above mechanism does not work if the unexeced ELF file is being
- * re-layout by other applications (such as `strip'). All the applications
- * that re-layout the internal of ELF will layout all sections in ascending
- * order of their file offsets. After the re-layout, the data2 section will
- * still be the LAST section in the section header vector, but its file offset
- * is now being pushed far away down, and causes part of it not to be mapped
- * in (ie. not covered by the load segment entry in PHDR vector), therefore
- * causes the new binary to fail.
- *
- * The solution is to modify the unexec algorithm to insert the new data2
- * section header right before the new bss section header, so their file
- * offsets will be in the ascending order. Since some of the section's (all
- * sections AFTER the bss section) indexes are now changed, we also need to
- * modify some fields to make them point to the right sections. This is done
- * by macro PATCH_INDEX. All the fields that need to be patched are:
- *
- * 1. ELF header e_shstrndx field.
- * 2. section header sh_link and sh_info field.
- * 3. symbol table entry st_shndx field.
- */
-
-/*
- * New modifications for Siemens Nixdorf's MIPS-based machines.
- * Marco.Walther@mch.sni.de
- *
- * The problem: Before the bss segment we have a so called sbss segment
- * (small bss) and maybe an sdata segment. These segments
- * must also be handled correct.
- *
- * /home1/marco/emacs/emacs-19.22/src
- * dump -hv temacs
- *
- * temacs:
- *
- * **** SECTION HEADER TABLE ****
- * [No] Type Flags Addr Offset Size Name
- * Link Info Adralgn Entsize
- *
- * [1] PBIT -A-- 0x4000f4 0xf4 0x13 .interp
- * 0 0 0x1 0
- *
- * [2] REGI -A-- 0x400108 0x108 0x18 .reginfo
- * 0 0 0x4 0x18
- *
- * [3] DYNM -A-- 0x400120 0x120 0xb8 .dynamic
- * 6 0 0x4 0x8
- *
- * [4] HASH -A-- 0x4001d8 0x1d8 0x8a0 .hash
- * 5 0 0x4 0x4
- *
- * [5] DYNS -A-- 0x400a78 0xa78 0x11f0 .dynsym
- * 6 2 0x4 0x10
- *
- * [6] STRT -A-- 0x401c68 0x1c68 0xbf9 .dynstr
- * 0 0 0x1 0
- *
- * [7] REL -A-- 0x402864 0x2864 0x18 .rel.dyn
- * 5 14 0x4 0x8
- *
- * [8] PBIT -AI- 0x402880 0x2880 0x60 .init
- * 0 0 0x10 0x1
- *
- * [9] PBIT -AI- 0x4028e0 0x28e0 0x1234 .plt
- * 0 0 0x4 0x4
- *
- * [10] PBIT -AI- 0x403b20 0x3b20 0xee400 .text
- * 0 0 0x20 0x1
- *
- * [11] PBIT -AI- 0x4f1f20 0xf1f20 0x60 .fini
- * 0 0 0x10 0x1
- *
- * [12] PBIT -A-- 0x4f1f80 0xf1f80 0xd90 .rdata
- * 0 0 0x10 0x1
- *
- * [13] PBIT -A-- 0x4f2d10 0xf2d10 0x17e0 .rodata
- * 0 0 0x10 0x1
- *
- * [14] PBIT WA-- 0x5344f0 0xf44f0 0x4b3e4 .data <----
- * 0 0 0x10 0x1
- *
- * [15] PBIT WA-G 0x57f8d4 0x13f8d4 0x2a84 .got
- * 0 0 0x4 0x4
- *
- * [16] PBIT WA-G 0x582360 0x142360 0x10 .sdata <----
- * 0 0 0x10 0x1
- *
- * [17] NOBI WA-G 0x582370 0x142370 0xb84 .sbss <----
- * 0 0 0x4 0
- *
- * [18] NOBI WA-- 0x582f00 0x142370 0x27ec0 .bss <----
- * 0 0 0x10 0x1
- *
- * [19] SYMT ---- 0 0x142370 0x10e40 .symtab
- * 20 1108 0x4 0x10
- *
- * [20] STRT ---- 0 0x1531b0 0xed9e .strtab
- * 0 0 0x1 0
- *
- * [21] STRT ---- 0 0x161f4e 0xb5 .shstrtab
- * 0 0 0x1 0
- *
- * [22] PBIT ---- 0 0x162003 0x28e2a .comment
- * 0 0 0x1 0x1
- *
- * [23] PBIT ---- 0 0x18ae2d 0x592 .debug
- * 0 0 0x1 0
- *
- * [24] PBIT ---- 0 0x18b3bf 0x80 .line
- * 0 0 0x1 0
- *
- * [25] MDBG ---- 0 0x18b440 0x60 .mdebug
- * 0 0 0x4 0
- *
- *
- * dump -hv emacs
- *
- * emacs:
- *
- * **** SECTION HEADER TABLE ****
- * [No] Type Flags Addr Offset Size Name
- * Link Info Adralgn Entsize
- *
- * [1] PBIT -A-- 0x4000f4 0xf4 0x13 .interp
- * 0 0 0x1 0
- *
- * [2] REGI -A-- 0x400108 0x108 0x18 .reginfo
- * 0 0 0x4 0x18
- *
- * [3] DYNM -A-- 0x400120 0x120 0xb8 .dynamic
- * 6 0 0x4 0x8
- *
- * [4] HASH -A-- 0x4001d8 0x1d8 0x8a0 .hash
- * 5 0 0x4 0x4
- *
- * [5] DYNS -A-- 0x400a78 0xa78 0x11f0 .dynsym
- * 6 2 0x4 0x10
- *
- * [6] STRT -A-- 0x401c68 0x1c68 0xbf9 .dynstr
- * 0 0 0x1 0
- *
- * [7] REL -A-- 0x402864 0x2864 0x18 .rel.dyn
- * 5 14 0x4 0x8
- *
- * [8] PBIT -AI- 0x402880 0x2880 0x60 .init
- * 0 0 0x10 0x1
- *
- * [9] PBIT -AI- 0x4028e0 0x28e0 0x1234 .plt
- * 0 0 0x4 0x4
- *
- * [10] PBIT -AI- 0x403b20 0x3b20 0xee400 .text
- * 0 0 0x20 0x1
- *
- * [11] PBIT -AI- 0x4f1f20 0xf1f20 0x60 .fini
- * 0 0 0x10 0x1
- *
- * [12] PBIT -A-- 0x4f1f80 0xf1f80 0xd90 .rdata
- * 0 0 0x10 0x1
- *
- * [13] PBIT -A-- 0x4f2d10 0xf2d10 0x17e0 .rodata
- * 0 0 0x10 0x1
- *
- * [14] PBIT WA-- 0x5344f0 0xf44f0 0x4b3e4 .data <----
- * 0 0 0x10 0x1
- *
- * [15] PBIT WA-G 0x57f8d4 0x13f8d4 0x2a84 .got
- * 0 0 0x4 0x4
- *
- * [16] PBIT WA-G 0x582360 0x142360 0xb94 .sdata <----
- * 0 0 0x10 0x1
- *
- * [17] PBIT WA-- 0x582f00 0x142f00 0x94100 .data <----
- * 0 0 0x10 0x1
- *
- * [18] NOBI WA-G 0x617000 0x1d7000 0 .sbss <----
- * 0 0 0x4 0
- *
- * [19] NOBI WA-- 0x617000 0x1d7000 0 .bss <----
- * 0 0 0x4 0x1
- *
- * [20] SYMT ---- 0 0x1d7000 0x10e40 .symtab
- * 21 1109 0x4 0x10
- *
- * [21] STRT ---- 0 0x1e7e40 0xed9e .strtab
- * 0 0 0x1 0
- *
- * [22] STRT ---- 0 0x1f6bde 0xb5 .shstrtab
- * 0 0 0x1 0
- *
- * [23] PBIT ---- 0 0x1f6c93 0x28e2a .comment
- * 0 0 0x1 0x1
- *
- * [24] PBIT ---- 0 0x21fabd 0x592 .debug
- * 0 0 0x1 0
- *
- * [25] PBIT ---- 0 0x22004f 0x80 .line
- * 0 0 0x1 0
- *
- * [26] MDBG ---- 0 0x2200d0 0x60 .mdebug
- * 0 0 0x4 0
- *
- */
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <memory.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <elf.h>
-#include <sys/mman.h>
-#include "compiler.h"
-
-#ifndef emacs
-#define fatal(a, b, c) fprintf(stderr, a, b, c), exit(1)
-#else
-extern void fatal(char *, ...);
-#endif
-
-/* Get the address of a particular section or program header entry,
- * accounting for the size of the entries.
- */
-
-#define OLD_SECTION_H(n) \
- (*(Elf32_Shdr *) ((byte *) old_section_h + old_file_h->e_shentsize * (n)))
-#define NEW_SECTION_H(n) \
- (*(Elf32_Shdr *) ((byte *) new_section_h + new_file_h->e_shentsize * (n)))
-#define OLD_PROGRAM_H(n) \
- (*(Elf32_Phdr *) ((byte *) old_program_h + old_file_h->e_phentsize * (n)))
-#define NEW_PROGRAM_H(n) \
- (*(Elf32_Phdr *) ((byte *) new_program_h + new_file_h->e_phentsize * (n)))
-
-#define PATCH_INDEX(n) \
- do { \
- if ((n) >= old_sbss_index) \
- (n) += 1 + (old_sdata_index ? 0 : 1); } while (0)
-
-typedef unsigned char byte;
-
-/* Round X up to a multiple of Y. */
-
-int
-round_up (x, y)
- int x, y;
-{
- int rem = x % y;
- if (rem == 0)
- return x;
- return x - rem + y;
-}
-
-/* ****************************************************************
- * unexec
- *
- * driving logic.
- *
- * In ELF, this works by replacing the old .bss section with a new
- * .data section, and inserting an empty .bss immediately afterwards.
- *
- */
-void
-unexec (new_name, old_name, data_start, bss_start, entry_address)
- char *new_name, *old_name;
- unsigned UNUSED (data_start);
- unsigned UNUSED (bss_start);
- unsigned UNUSED (entry_address);
-{
- extern unsigned int bss_end;
- int new_file, old_file, new_file_size;
-
- /* Pointers to the base of the image of the two files. */
- caddr_t old_base, new_base;
-
- /* Pointers to the file, program and section headers for the old and new
- * files.
- */
- Elf32_Ehdr *old_file_h, *new_file_h;
- Elf32_Phdr *old_program_h, *new_program_h;
- Elf32_Shdr *old_section_h, *new_section_h;
-
- /* Point to the section name table in the old file */
- char *old_section_names;
-
- Elf32_Addr old_bss_addr, new_bss_addr;
- Elf32_Addr old_sbss_addr;
- Elf32_Word old_bss_size, new_data2_size;
- Elf32_Word old_sbss_size, new_data3_size;
- Elf32_Off new_data2_offset;
- Elf32_Off new_data3_offset;
- Elf32_Addr new_data2_addr;
- Elf32_Addr new_data3_addr;
-
- Elf32_Word old_sdata_size, new_sdata_size;
- int old_sdata_index = 0;
-
- int n, nn, old_data_index, new_data2_align;
- int old_bss_index;
- int old_sbss_index;
- int old_bss_padding;
- struct stat stat_buf;
-
- /* Open the old file & map it into the address space. */
-
- old_file = open (old_name, O_RDONLY);
-
- if (old_file < 0)
- fatal ("Can't open %s for reading: errno %d\n", old_name, errno);
-
- if (fstat (old_file, &stat_buf) == -1)
- fatal ("Can't fstat(%s): errno %d\n", old_name, errno);
-
- old_base = mmap (0, stat_buf.st_size, PROT_READ, MAP_SHARED, old_file, 0);
-
- if (old_base == (caddr_t) -1)
- fatal ("Can't mmap(%s): errno %d\n", old_name, errno);
-
-#ifdef DEBUG
- fprintf (stderr, "mmap(%s, %x) -> %x\n", old_name, stat_buf.st_size,
- old_base);
-#endif
-
- /* Get pointers to headers & section names */
-
- old_file_h = (Elf32_Ehdr *) old_base;
- old_program_h = (Elf32_Phdr *) ((byte *) old_base + old_file_h->e_phoff);
- old_section_h = (Elf32_Shdr *) ((byte *) old_base + old_file_h->e_shoff);
- old_section_names = (char *) old_base
- + OLD_SECTION_H(old_file_h->e_shstrndx).sh_offset;
-
- /* Find the old .sbss section.
- */
-
- for (old_sbss_index = 1; old_sbss_index < old_file_h->e_shnum;
- old_sbss_index++)
- {
-#ifdef DEBUG
- fprintf (stderr, "Looking for .sbss - found %s\n",
- old_section_names + OLD_SECTION_H(old_sbss_index).sh_name);
-#endif
- if (!strcmp (old_section_names + OLD_SECTION_H(old_sbss_index).sh_name,
- ".sbss"))
- break;
- }
- if (old_sbss_index == old_file_h->e_shnum)
- fatal ("Can't find .sbss in %s.\n", old_name, 0);
-
- if (!strcmp(old_section_names + OLD_SECTION_H(old_sbss_index - 1).sh_name,
- ".sdata"))
- {
- old_sdata_index = old_sbss_index - 1;
- }
-
-
- /* Find the old .bss section.
- */
-
- for (old_bss_index = 1; old_bss_index < old_file_h->e_shnum; old_bss_index++)
- {
-#ifdef DEBUG
- fprintf (stderr, "Looking for .bss - found %s\n",
- old_section_names + OLD_SECTION_H(old_bss_index).sh_name);
-#endif
- if (!strcmp (old_section_names + OLD_SECTION_H(old_bss_index).sh_name,
- ".bss"))
- break;
- }
- if (old_bss_index == old_file_h->e_shnum)
- fatal ("Can't find .bss in %s.\n", old_name, 0);
-
- if (old_sbss_index != (old_bss_index - 1))
- fatal (".sbss should come immediately before .bss in %s.\n", old_name, 0);
-
- /* Figure out parameters of the new data3 and data2 sections.
- * Change the sbss and bss sections.
- */
-
- old_bss_addr = OLD_SECTION_H(old_bss_index).sh_addr;
- old_bss_size = OLD_SECTION_H(old_bss_index).sh_size;
-
- old_sbss_addr = OLD_SECTION_H(old_sbss_index).sh_addr;
- old_sbss_size = OLD_SECTION_H(old_sbss_index).sh_size;
-
- if (old_sdata_index)
- {
- old_sdata_size = OLD_SECTION_H(old_sdata_index).sh_size;
- }
-
-#if defined(emacs) || !defined(DEBUG)
- bss_end = (unsigned int) sbrk (0);
- new_bss_addr = (Elf32_Addr) bss_end;
-#else
- new_bss_addr = old_bss_addr + old_bss_size + 0x1234;
-#endif
- if (old_sdata_index)
- {
- new_sdata_size = OLD_SECTION_H(old_sbss_index).sh_offset -
- OLD_SECTION_H(old_sdata_index).sh_offset + old_sbss_size;
- }
-
- new_data3_addr = old_sbss_addr;
- new_data3_size = old_sbss_size;
- new_data3_offset = OLD_SECTION_H(old_sbss_index).sh_offset;
-
- new_data2_addr = old_bss_addr;
- new_data2_size = new_bss_addr - old_bss_addr;
- new_data2_align = (new_data3_offset + old_sbss_size) %
- OLD_SECTION_H(old_bss_index).sh_addralign;
- new_data2_align = new_data2_align ?
- OLD_SECTION_H(old_bss_index).sh_addralign - new_data2_align :
- 0;
- new_data2_offset = new_data3_offset + old_sbss_size + new_data2_align;
-
- old_bss_padding = OLD_SECTION_H(old_bss_index).sh_offset -
- OLD_SECTION_H(old_sbss_index).sh_offset;
-#ifdef DEBUG
- fprintf (stderr, "old_bss_index %d\n", old_bss_index);
- fprintf (stderr, "old_bss_addr %x\n", old_bss_addr);
- fprintf (stderr, "old_bss_size %x\n", old_bss_size);
- fprintf (stderr, "new_bss_addr %x\n", new_bss_addr);
- fprintf (stderr, "new_data2_addr %x\n", new_data2_addr);
- fprintf (stderr, "new_data2_size %x\n", new_data2_size);
- fprintf (stderr, "new_data2_offset %x\n", new_data2_offset);
- fprintf (stderr, "old_sbss_index %d\n", old_sbss_index);
- fprintf (stderr, "old_sbss_addr %x\n", old_sbss_addr);
- fprintf (stderr, "old_sbss_size %x\n", old_sbss_size);
- if (old_sdata_index)
- {
- fprintf (stderr, "old_sdata_size %x\n", old_sdata_size);
- fprintf (stderr, "new_sdata_size %x\n", new_sdata_size);
- }
- else
- {
- fprintf (stderr, "new_data3_addr %x\n", new_data3_addr);
- fprintf (stderr, "new_data3_size %x\n", new_data3_size);
- fprintf (stderr, "new_data3_offset %x\n", new_data3_offset);
- }
-#endif
-
- if ((unsigned) new_bss_addr < (unsigned) old_bss_addr + old_bss_size)
- fatal (".bss shrank when undumping???\n", 0, 0);
-
- /* Set the output file to the right size and mmap(2) it. Set
- * pointers to various interesting objects. stat_buf still has
- * old_file data.
- */
-
- new_file = open (new_name, O_RDWR | O_CREAT, 0666);
- if (new_file < 0)
- fatal ("Can't creat(%s): errno %d\n", new_name, errno);
-
- new_file_size = stat_buf.st_size +
- ((1 + (old_sdata_index ? 0 : 1)) * old_file_h->e_shentsize) +
- new_data2_size + new_data3_size + new_data2_align;
-
- if (ftruncate (new_file, new_file_size))
- fatal ("Can't ftruncate(%s): errno %d\n", new_name, errno);
-
- new_base = mmap (0, new_file_size, PROT_READ | PROT_WRITE, MAP_SHARED,
- new_file, 0);
-
- if (new_base == (caddr_t) -1)
- fatal ("Can't mmap(%s): errno %d\n", new_name, errno);
-
- new_file_h = (Elf32_Ehdr *) new_base;
- new_program_h = (Elf32_Phdr *) ((byte *) new_base + old_file_h->e_phoff);
- new_section_h = (Elf32_Shdr *) ((byte *) new_base +
- old_file_h->e_shoff +
- new_data2_size +
- new_data2_align +
- new_data3_size);
-
- /* Make our new file, program and section headers as copies of the
- * originals.
- */
-
- memcpy (new_file_h, old_file_h, old_file_h->e_ehsize);
- memcpy (new_program_h, old_program_h,
- old_file_h->e_phnum * old_file_h->e_phentsize);
-
- /* Modify the e_shstrndx if necessary. */
- PATCH_INDEX (new_file_h->e_shstrndx);
-
- /* Fix up file header. We'll add one section. Section header is
- * further away now.
- */
-
- new_file_h->e_shoff += new_data2_size + new_data2_align + new_data3_size;
- new_file_h->e_shnum += 1 + (old_sdata_index ? 0 : 1);
-
-#ifdef DEBUG
- fprintf (stderr, "Old section offset %x\n", old_file_h->e_shoff);
- fprintf (stderr, "Old section count %d\n", old_file_h->e_shnum);
- fprintf (stderr, "New section offset %x\n", new_file_h->e_shoff);
- fprintf (stderr, "New section count %d\n", new_file_h->e_shnum);
-#endif
-
- /* Fix up a new program header. Extend the writable data segment so
- * that the bss area is covered too. Find that segment by looking
- * for a segment that ends just before the .bss area. Make sure
- * that no segments are above the new .data2. Put a loop at the end
- * to adjust the offset and address of any segment that is above
- * data2, just in case we decide to allow this later.
- */
-
- for (n = new_file_h->e_phnum - 1; n >= 0; n--)
- {
- /* Compute maximum of all requirements for alignment of section. */
- int alignment = (NEW_PROGRAM_H (n)).p_align;
- if ((OLD_SECTION_H (old_bss_index)).sh_addralign > alignment)
- alignment = OLD_SECTION_H (old_bss_index).sh_addralign;
-
- if ((OLD_SECTION_H (old_sbss_index)).sh_addralign > alignment)
- alignment = OLD_SECTION_H (old_sbss_index).sh_addralign;
-
- /* Supposedly this condition is okay for the SGI. */
-#if 0
- if (NEW_PROGRAM_H(n).p_vaddr + NEW_PROGRAM_H(n).p_filesz > old_bss_addr)
- fatal ("Program segment above .bss in %s\n", old_name, 0);
-#endif
-
- if (NEW_PROGRAM_H(n).p_type == PT_LOAD
- && (round_up ((NEW_PROGRAM_H (n)).p_vaddr
- + (NEW_PROGRAM_H (n)).p_filesz,
- alignment)
- == round_up (old_bss_addr, alignment)))
- break;
- }
- if (n < 0)
- fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
-
- NEW_PROGRAM_H(n).p_filesz += new_data2_size + new_data2_align +
- new_data3_size;
- NEW_PROGRAM_H(n).p_memsz = NEW_PROGRAM_H(n).p_filesz;
-
-#if 1 /* Maybe allow section after data2 - does this ever happen? */
- for (n = new_file_h->e_phnum - 1; n >= 0; n--)
- {
- if (NEW_PROGRAM_H(n).p_vaddr
- && NEW_PROGRAM_H(n).p_vaddr >= new_data3_addr)
- NEW_PROGRAM_H(n).p_vaddr += new_data2_size - old_bss_size +
- new_data3_size - old_sbss_size;
-
- if (NEW_PROGRAM_H(n).p_offset >= new_data3_offset)
- NEW_PROGRAM_H(n).p_offset += new_data2_size + new_data2_align +
- new_data3_size;
- }
-#endif
-
- /* Fix up section headers based on new .data2 section. Any section
- * whose offset or virtual address is after the new .data2 section
- * gets its value adjusted. .bss size becomes zero and new address
- * is set. data2 section header gets added by copying the existing
- * .data header and modifying the offset, address and size.
- */
- for (old_data_index = 1; old_data_index < old_file_h->e_shnum;
- old_data_index++)
- if (!strcmp (old_section_names + OLD_SECTION_H(old_data_index).sh_name,
- ".data"))
- break;
- if (old_data_index == old_file_h->e_shnum)
- fatal ("Can't find .data in %s.\n", old_name, 0);
-
- /* Walk through all section headers, insert the new data2 section right
- before the new bss section. */
- for (n = 1, nn = 1; n < old_file_h->e_shnum; n++, nn++)
- {
- caddr_t src;
-
- if (n == old_sbss_index)
-
- /* If it is sbss section, insert the new data3 section before it. */
- {
- /* Steal the data section header for this data3 section. */
- if (!old_sdata_index)
- {
- memcpy (&NEW_SECTION_H(nn), &OLD_SECTION_H(old_data_index),
- new_file_h->e_shentsize);
-
- NEW_SECTION_H(nn).sh_addr = new_data3_addr;
- NEW_SECTION_H(nn).sh_offset = new_data3_offset;
- NEW_SECTION_H(nn).sh_size = new_data3_size;
- NEW_SECTION_H(nn).sh_flags = OLD_SECTION_H(n).sh_flags;
- /* Use the sbss section's alignment. This will assure that the
- new data3 section always be placed in the same spot as the old
- sbss section by any other application. */
- NEW_SECTION_H(nn).sh_addralign = OLD_SECTION_H(n).sh_addralign;
-
- /* Now copy over what we have in the memory now. */
- memcpy (NEW_SECTION_H(nn).sh_offset + new_base,
- (caddr_t) OLD_SECTION_H(n).sh_addr,
- new_data3_size);
- /* the new .data2 section should also come before the
- * new .sbss section */
- nn += 2;
- }
- else
- {
- /* We always have a .sdata section: append the contents of the
- * old .sbss section.
- */
- memcpy (new_data3_offset + new_base,
- (caddr_t) OLD_SECTION_H(n).sh_addr,
- new_data3_size);
- nn ++;
- }
- }
- else if (n == old_bss_index)
-
- /* If it is bss section, insert the new data2 section before it. */
- {
- Elf32_Word tmp_align;
- Elf32_Addr tmp_addr;
-
- tmp_align = OLD_SECTION_H(n).sh_addralign;
- tmp_addr = OLD_SECTION_H(n).sh_addr;
-
- nn -= 2;
- /* Steal the data section header for this data2 section. */
- memcpy (&NEW_SECTION_H(nn), &OLD_SECTION_H(old_data_index),
- new_file_h->e_shentsize);
-
- NEW_SECTION_H(nn).sh_addr = new_data2_addr;
- NEW_SECTION_H(nn).sh_offset = new_data2_offset;
- NEW_SECTION_H(nn).sh_size = new_data2_size;
- /* Use the bss section's alignment. This will assure that the
- new data2 section always be placed in the same spot as the old
- bss section by any other application. */
- NEW_SECTION_H(nn).sh_addralign = tmp_align;
-
- /* Now copy over what we have in the memory now. */
- memcpy (NEW_SECTION_H(nn).sh_offset + new_base,
- (caddr_t) tmp_addr, new_data2_size);
- nn += 2;
- }
-
- memcpy (&NEW_SECTION_H(nn), &OLD_SECTION_H(n),
- old_file_h->e_shentsize);
-
- if (old_sdata_index && n == old_sdata_index)
- /* The old .sdata section has now a new size */
- NEW_SECTION_H(nn).sh_size = new_sdata_size;
-
- /* The new bss section's size is zero, and its file offset and virtual
- address should be off by NEW_DATA2_SIZE. */
- if (n == old_sbss_index)
- {
- /* NN should be `old_sbss_index + 2' at this point. */
- NEW_SECTION_H(nn).sh_offset += new_data2_size + new_data2_align +
- new_data3_size;
- NEW_SECTION_H(nn).sh_addr += new_data2_size + new_data2_align +
- new_data3_size;
- /* Let the new bss section address alignment be the same as the
- section address alignment followed the old bss section, so
- this section will be placed in exactly the same place. */
- NEW_SECTION_H(nn).sh_addralign =
- OLD_SECTION_H(nn + (old_sdata_index ? 1 : 0)).sh_addralign;
- NEW_SECTION_H(nn).sh_size = 0;
- }
- else if (n == old_bss_index)
- {
- /* NN should be `old_bss_index + 2' at this point. */
- NEW_SECTION_H(nn).sh_offset += new_data2_size + new_data2_align +
- new_data3_size - old_bss_padding;
- NEW_SECTION_H(nn).sh_addr += new_data2_size;
- /* Let the new bss section address alignment be the same as the
- section address alignment followed the old bss section, so
- this section will be placed in exactly the same place. */
- NEW_SECTION_H(nn).sh_addralign =
- OLD_SECTION_H((nn - (old_sdata_index ? 0 : 1))).sh_addralign;
- NEW_SECTION_H(nn).sh_size = 0;
- }
- /* Any section that was original placed AFTER the bss section should now
- be off by NEW_DATA2_SIZE. */
- else if (NEW_SECTION_H(nn).sh_offset >= new_data3_offset)
- NEW_SECTION_H(nn).sh_offset += new_data2_size +
- new_data2_align +
- new_data3_size -
- old_bss_padding;
-
- /* If any section hdr refers to the section after the new .data
- section, make it refer to next one because we have inserted
- a new section in between. */
-
- PATCH_INDEX(NEW_SECTION_H(nn).sh_link);
- PATCH_INDEX(NEW_SECTION_H(nn).sh_info);
-
- /* Now, start to copy the content of sections. */
- if (NEW_SECTION_H(nn).sh_type == SHT_NULL
- || NEW_SECTION_H(nn).sh_type == SHT_NOBITS)
- continue;
-
- /* Write out the sections. .data, .data1 and .sdata get copied from
- * the current process instead of the old file.
- */
- if (!strcmp (old_section_names + OLD_SECTION_H(n).sh_name, ".data") ||
- !strcmp (old_section_names + OLD_SECTION_H(n).sh_name, ".data1") ||
- (old_sdata_index && (n == old_sdata_index)))
- src = (caddr_t) OLD_SECTION_H(n).sh_addr;
- else
- src = old_base + OLD_SECTION_H(n).sh_offset;
-
- memcpy (NEW_SECTION_H(nn).sh_offset + new_base, src,
- ((n == old_sdata_index) ?
- old_sdata_size :
- NEW_SECTION_H(nn).sh_size));
-
- /* If it is the symbol table, its st_shndx field needs to be patched. */
- if (NEW_SECTION_H(nn).sh_type == SHT_SYMTAB
- || NEW_SECTION_H(nn).sh_type == SHT_DYNSYM)
- {
- Elf32_Shdr *spt = &NEW_SECTION_H(nn);
- unsigned int num = spt->sh_size / spt->sh_entsize;
- Elf32_Sym * sym = (Elf32_Sym *) (NEW_SECTION_H(nn).sh_offset +
- new_base);
- for (; num--; sym++)
- {
- if ((sym->st_shndx == SHN_UNDEF)
- || (sym->st_shndx == SHN_ABS)
- || (sym->st_shndx == SHN_COMMON))
- continue;
-
- PATCH_INDEX(sym->st_shndx);
- }
- }
- }
-
- /* Close the files and make the new file executable */
-
- if (close (old_file))
- fatal ("Can't close(%s): errno %d\n", old_name, errno);
-
- if (close (new_file))
- fatal ("Can't close(%s): errno %d\n", new_name, errno);
-
- if (stat (new_name, &stat_buf) == -1)
- fatal ("Can't stat(%s): errno %d\n", new_name, errno);
-
- n = umask (777);
- umask (n);
- stat_buf.st_mode |= 0111 & ~n;
- if (chmod (new_name, stat_buf.st_mode) == -1)
- fatal ("Can't chmod(%s): errno %d\n", new_name, errno);
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexsol2.c
--- a/src/unexsol2.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* Unexec function for Solaris 2.x
- Copyright (C) 1994 Sun Microsystems, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not in FSF. */
-
-/* #pragma ident "@(#) $Id: unexsol2.c,v 1.4 2004/09/20 19:20:07 james Exp $" */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <dlfcn.h>
-#include "compiler.h"
-
-#define DYNODUMP_SO "../dynodump/dynodump.so"
-#define DYNODUMP_SYM "dynodump"
-
-int unexec (char *new_name, char *old_name, unsigned int data_start,
- unsigned int bss_start, unsigned int entry_address);
-int
-unexec(char *new_name, char *UNUSED (old_name),
- unsigned int UNUSED (data_start), unsigned int UNUSED (bss_start),
- unsigned int UNUSED (entry_address))
-{
- void *handle;
- void (*func)(const char *file);
-
- if ((handle = dlopen (DYNODUMP_SO, RTLD_LAZY)) == NULL)
- {
- fprintf (stderr, "unexec(): dlopen(%s): %s\n",
- (char *) DYNODUMP_SO, dlerror());
- exit (1);
- }
-
- if ((func = (void (*)(const char *)) dlsym (handle, DYNODUMP_SYM)) == NULL)
- {
- fprintf (stderr, "unexec(): dlsym(%s): %s \n",
- (char *) DYNODUMP_SYM, dlerror());
- exit (1);
- }
-
- (*func)(new_name);
-
- dlclose (handle);
-
- return 0;
-}
diff -r 75975fd0b7fc -r aa5ed11f473b src/unexsunos4.c
--- a/src/unexsunos4.c Wed Nov 18 22:44:28 2009 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,658 +0,0 @@
-/* Code to do an unexec for Sun O/S 4.1 for a temacs linked -Bdynamic.
- Copyright (C) 1992, 1993 Free Software Foundation, Inc.
-
-This file is part of XEmacs.
-
-XEmacs is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-XEmacs is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with XEmacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-/* Synched up with: Not synched with FSF. */
-
-/*
-Created 29-Oct-92 by Harlan Sexton
-Tweaked 06-Aug-93 by Dean Michaels to work with sun3.
- */
-
-/********************** Included .h Files **************************/
-
-#include <config.h>
-
-/* I don't understand this, but it's necessary to get some slots in struct exec
- from /usr/include/sys/exec.h when running LCC in strict ANSI mode. We don't
- need this in K&R mode...
- */
-#if defined(__lucid) && defined(__sparc) && !defined(sun)
-# define sun 1
-#endif
-
-#include <stdarg.h>
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdio.h>
-#include <a.out.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <stab.h>
-#include <sys/dir.h>
-#include <link.h>
-#include "compiler.h"
-
-/********************** Macros *************************************/
-
-#define SYS_ERR \
- ((errno > 0)?((errno < sys_nerr)?(sys_errlist[errno]):\
- "unknown system error"): "unknown error")
-
-#define MASK_UP(x,p_of_two) \
- ((((unsigned long) (x)) + ((p_of_two) - 1)) & (~((p_of_two) - 1)))
-
-#define MASK_DOWN(x,p_of_two) (((unsigned long) (x)) & (~((p_of_two) - 1)))
-
-#ifndef mc68020
-#define relocation_info reloc_info_sparc
-#endif
-
-/********************** Typedefs and Structs ***********************/
-
-struct translation_struct
-{
- long txtaddr;
- long txtoff;
- long dataddr;
- long datoff;
- long bssaddr;
-};
-
-/********************** Function Prototypes/Declarations ***********/
-
-static void unexec_error (const char *m, int use_errno, ...);
-static int unexec_open (char *filename, int flag, int mode);
-static caddr_t unexec_mmap (int fd, size_t len, int prot, int flags);
-static long unexec_seek (int fd, long position);
-static void unexec_read (int fd, long position, char *buf, int bytes);
-static void unexec_write (int fd, long position, char *buf, int bytes);
-static void unexec_pad (int fd, int bytes);
-static void unexec_fstat (int fd, struct stat *statptr);
-static void unexec_fchmod (int fd, int mode);
-static long unexec_addr_to_offset (long addr, struct translation_struct *ts);
-static void copy_relocation_site (struct relocation_info *ri,
- caddr_t from_base_addr,
- caddr_t to_base_addr,
- struct translation_struct *ts);
-static void reset_symtab (struct nlist *start, struct nlist *end,
- char *strtab, long edata_value, long end_value,
- int ld_so_table, int shlib_image);
-int run_time_remap (char *dummy);
-
-/********************** Variables **********************************/
-
-/* for reporting error messages from system calls */
-extern int sys_nerr;
-extern char *sys_errlist[];
-extern int errno;
-extern int _DYNAMIC;
-extern char **environ;
-
-static unsigned long mprotect_bottom_addr;
-static unsigned long mprotect_top_addr;
-
-static unsigned long sbrk_of_0_at_unexec;
-
-/*******************************************************************/
-
-static void
-unexec_error (const char *fmt, int use_errno, ...)
-{
- const char *err_msg = SYS_ERR;
- va_list args;
-
- fprintf (stderr, "unexec - ");
- va_start (args, use_errno);
- vfprintf (stderr, fmt, args);
- va_end (args);
-
- if (use_errno)
- fprintf (stderr, ": %s", err_msg);
- fprintf (stderr, "\n");
- exit (1);
- return;
-}
-
-static int
-unexec_open (char *filename, int flag, int mode)
-{
- int fd;
-
- errno = 0;
-
- fd = open (filename, flag, mode);
-
- if (fd < 0)
- unexec_error ("Failure opening file %s", 1, (void *) filename, 0, 0);
- return fd;
-}
-
-static caddr_t
-unexec_mmap (int fd, size_t len, int prot, int flags)
-{
- caddr_t return_val;
-
- unexec_seek (fd, 0);
- errno = 0;
- return_val = mmap (0, len, prot, flags, fd, 0);
-
- if (return_val == (caddr_t) -1)
- unexec_error ("Failure mmap'ing file", 1, 0, 0, 0);
- return return_val;
-}
-
-
-static long
-unexec_seek (int fd, long position)
-{
- long seek_value;
-
- if (fd <= 0)
- unexec_error ("No file open in which to seek", 0, 0, 0, 0);
-
- errno = 0;
-
- if (position < 0)
- seek_value = (long) lseek (fd, 0, L_INCR);
- else
- seek_value = (long) lseek (fd, position, L_SET);
-
- if (seek_value < 0)
- unexec_error ("Failed to do a seek to 0x%x in %s", 1,
- (char *) position, "unexec() output file", 0);
-
- return seek_value;
-}
-
-static void
-unexec_read (int fd, long position, char *buf, int bytes)
-{
- int n_read;
- int remains = bytes;
- position = unexec_seek (fd, position);
-
- if (bytes < 0)
- unexec_error ("Attempted read of %d bytes", 0, (char *) bytes, 0, 0);
-
- errno = 0;
-
- while (remains > 0)
- {
- n_read = read (fd, buf, remains);
- if (n_read <= 0)
- unexec_error ("Read failed for 0x%x bytes at offset 0x%x in %s",
- 1, (char *) bytes, (char *) position,
- "unexec() output file");
- buf += n_read;
- remains -= n_read;
- }
-
- return;
-}
-
-static void
-unexec_write (int fd, long position, char *buf, int bytes)
-{
- int n_written;
- int remains = bytes;
- position = unexec_seek (fd, position);
-
- if (bytes < 0)
- unexec_error ("Attempted write of %d bytes in %s",
- 0, (char *) bytes, "unexec() output file", 0);
-
- errno = 0;
-
- while (remains > 0)
- {
- n_written = write (fd, buf, remains);
- if (n_written <= 0)
- unexec_error ("Write failed for 0x%x bytes at offset 0x%x in %s",
- 1, (char *) bytes, (char *) position,
- "unexec() output file");
- buf += n_written;
- remains -= n_written;
- }
-
- return;
-}
-
-static void
-unexec_pad (int fd, int bytes)
-{
- if (bytes > 0)
- {
- char buf[1024];
- int remaining = bytes;
-
- memset (buf, 0, sizeof (buf));
-
- while (remaining > 0)
- {
- int this_write = (remaining > sizeof(buf))?sizeof(buf):remaining;
- unexec_write (fd, -1, buf, this_write);
- remaining -= this_write;
- }
- }
-}
-
-static void
-unexec_fstat (int fd, struct stat *statptr)
-{
- errno = 0;
- if (-1 == fstat (fd, statptr))
- unexec_error ("fstat() failed for descriptor %d", 1, (char *) fd, 0, 0);
- return;
-}
-
-static void
-unexec_fchmod (int fd, int mode)
-{
- errno = 0;
- if (-1 == fchmod (fd, mode))
- unexec_error ("fchmod() failed for descriptor %d", 1, (char *) fd, 0, 0);
- return;
-}
-
-static long
-unexec_addr_to_offset (long addr, struct translation_struct *ts)
-
-{
- if ((addr < ts->txtaddr) || (addr >= ts->bssaddr))
- unexec_error ("bad address 0x%x to addr_to_offset()",
- 0, (char *) addr, 0, 0);
- if (addr >= ts->dataddr)
- return ((long) ((addr - ts->dataddr) + ts->datoff));
- else
- return ((long) ((addr - ts->txtaddr) + ts->txtoff));
-}
-
-
-/*
- * "LD.SO" DATA AND SYMBOL TABLE OPERATIONS
- */
-
-static void
-copy_relocation_site (struct relocation_info *ri,
- caddr_t from_base_addr,
- caddr_t to_base_addr,
- struct translation_struct *ts)
-{
- long offset = unexec_addr_to_offset (ri->r_address, ts);
- caddr_t from = from_base_addr + offset;
- caddr_t to = to_base_addr + offset;
-
-#ifdef mc68020
-#define r_type r_length
-#endif /* mc68020 */
- switch (ri->r_type)
- {
-#ifdef mc68020
- case 0:
- *((char *) to) = *((char *) from);
- break;
- case 1:
- *((short *) to) = *((short *) from);
- break;
- case 2:
- *((long *) to) = *((long *) from);
- break;
-#else /* !mc68020 */
- case RELOC_8:
- case RELOC_DISP8:
- *((char *) to) = *((char *) from);
- break;
- case RELOC_16:
- case RELOC_DISP16:
- *((short *) to) = *((short *) from);
- break;
- case RELOC_LO10:
- case RELOC_13:
- case RELOC_22:
- case RELOC_HI22:
- case RELOC_WDISP22:
- case RELOC_WDISP30:
- case RELOC_32:
- case RELOC_DISP32:
- case RELOC_GLOB_DAT:
- *((long *) to) = *((long *) from);
- break;
- case RELOC_JMP_SLOT:
- {
- long *target = (long *) to;
- long *source = (long *) from;
- *target = *source;
- target++;
- source++;
- *target = *source;
- target++;
- source++;
- *target = *source;
- }
- break;
-#endif /* !mc68020 */
- default:
- unexec_error ("unknown reloc type %d seen during unexec()",
- 0, (char *) ri->r_type, 0, 0);
- break;
- }
- return;
-}
-
-static void
-reset_symtab (struct nlist *start, struct nlist *end, char *strtab,
- long edata_value, long end_value, int ld_so_table,
- int shlib_image)
-{
- struct nlist *tmp = start;
- int found_edata = 0;
- int found_end = 0;
-
- while (tmp < end)
- {
- int type = tmp->n_type;
- int named = (ld_so_table)?1:(tmp->n_un.n_strx);
-
- if ((type == (N_UNDF | N_EXT)) &&
- (tmp->n_value != 0))
- unexec_error ("unexec'ing image has COMMON symbols in it -- we quit!",
- 0, 0, 0, 0);
-
- if (!(type & N_STAB))
- {
- if (!found_edata &&
- (type == (N_EXT | N_DATA)) &&
- named &&
- !strcmp ("_edata", strtab + tmp->n_un.n_strx))
- {
- tmp->n_value = edata_value;
- found_edata = 1;
- }
-
-
- if ((type & N_TYPE) == N_BSS)
- {
- if (!found_end &&
- (type == (N_EXT | N_BSS)) &&
- named &&
- !strcmp ("_end", strtab + tmp->n_un.n_strx))
- {
- tmp->n_value = end_value;
- found_end = 1;
- }
- else if (type & N_EXT)
- tmp->n_type = N_DATA | N_EXT;
- else
- tmp->n_type = N_DATA;
- }
-
- /* the way things are being handled here, having sbrk() in the
- image is fatal for an image linked with shared lib's (although
- the code could be modified to support it), but this should
- never happen anyway */
- if (shlib_image &&
- (type == (N_EXT | N_TEXT)) &&
- named &&
- !strcmp ("_sbrk", strtab + tmp->n_un.n_strx))
- unexec_error ("unexec'd shlib image has sbrk() in it -- we quit!",
- 0, 0, 0, 0);
- }
-
- tmp++;
- }
-}
-
-extern int getpagesize (void);
-
-/*
- * EXPORTED FUNCTIONS
- */
-
-/* this has to be a global variable to prevent the optimizers from
- * assuming that it can not be 0.
-*/
-static void *dynamic_addr = (void *) &_DYNAMIC;
-
-int
-unexec (char *new_name, char *old_name, unsigned int emacs_edata,
- unsigned int UNUSED (dummy1), unsigned int UNUSED (dummy2))
-{
- /* ld.so data */
- struct link_dynamic *ld = 0;
- struct link_dynamic_2 *ld2 = 0;
- /* old and new state */
- int old_fd;
- int new_fd;
- caddr_t old_base_addr;
- caddr_t new_base_addr;
- struct exec old_hdr;
- struct exec new_hdr;
- struct stat old_buf;
- struct stat new_buf;
- /* some process specific "constants" */
- unsigned long n_pagsiz;
- long page_size = getpagesize ();
- caddr_t plt_end;
- caddr_t current_break = (caddr_t) sbrk (0);
-
- if (!page_size)
- unexec_error ("unexec() failed because we can't get the size of a page!",
- 0, 0, 0, 0);
-
- /* see if this is a -Bdynamic image -- if so, find ld.so structures */
- if (dynamic_addr)
- {
- ld = (struct link_dynamic *) dynamic_addr;
- ld2 = ld->ld_un.ld_2;
- if (ld->ld_version < 2)
- unexec_error ("%s linked with obsolete version of ld -- we quit!",
- 0, old_name, 0, 0);
- }
-
- /* open the old and new files, figuring out how big the old one is
- so that we can map it in */
- old_fd = unexec_open (old_name, O_RDONLY, 0);
- new_fd = unexec_open (new_name, O_RDWR | O_CREAT | O_TRUNC, 0666);
-
- /* setup the header and the statbuf for old_fd */
- unexec_read (old_fd, 0, (char *) &old_hdr, sizeof (old_hdr));
- unexec_fstat (old_fd, &old_buf);
-
-
- /* set up some important constants */
- n_pagsiz = N_PAGSIZ (old_hdr);
- if (dynamic_addr)
- plt_end = (caddr_t) MASK_UP (ld2->ld_plt + ld2->ld_plt_sz, sizeof (double));
- else
- plt_end = (caddr_t) N_DATADDR (old_hdr);
-
- /* never write protect the variable "environ", defined in /lib/crt0.o, and
- set in process.c */
- mprotect_bottom_addr = ((unsigned long) &environ) + sizeof (char **);
- /* never protect ABOVE the end of data emacs_edata specified */
- mprotect_top_addr = MIN (emacs_edata, N_DATADDR (old_hdr) + old_hdr.a_data);
-
- /* Set up the image of the old file */
- old_base_addr = unexec_mmap (old_fd, old_buf.st_size, PROT_READ, MAP_PRIVATE);
- close (old_fd);
-
- /* set up the new exec */
- new_hdr = old_hdr;
- new_hdr.a_data = (((unsigned long) MASK_UP (current_break, n_pagsiz)) -
- ((unsigned long) N_DATADDR (old_hdr)));
- new_hdr.a_bss = 0;
-
- /* set up this variable, in case we want to reset "the break"
- when restarting */
- sbrk_of_0_at_unexec = ((unsigned long) MASK_UP (current_break, n_pagsiz));
-
- /* Write out the first approximation to the new file. The sizes of
- each section will be correct, but there will be a number of
- corrections that will need to be made. */
- {
- long old_datoff = N_DATOFF (old_hdr);
- long old_dataddr = N_DATADDR (old_hdr);
- long new_treloff = N_TRELOFF (new_hdr);
- long old_treloff = N_TRELOFF (old_hdr);
- long ld_so_size = ((unsigned long) plt_end) - old_dataddr;
- long real_data_size = current_break - plt_end;
- long pad_size =
- MASK_UP (current_break, n_pagsiz) - ((unsigned long) current_break);
-
-
- /* First, write the text segment with new header -- copy everything until
- the start of the data segment from the old file, and then go back and
- write the new header. */
- unexec_write (new_fd, 0, old_base_addr, old_datoff + ld_so_size);
- unexec_write (new_fd, 0, (char *) &new_hdr, sizeof (new_hdr));
-
- /* Copy the rest of the data segment from the running image. */
- unexec_write (new_fd, old_datoff + ld_so_size,
- plt_end, real_data_size);
-
- /* pad out the data segment */
- unexec_pad (new_fd, pad_size);
-
- /* Finally, copy the symbol table information from the old file. */
- unexec_write (new_fd, new_treloff,
- old_base_addr + old_treloff,
- old_buf.st_size - old_treloff);
- }
-
-
- /* Next, map in the output file so that we can jump around fixing it
- up. We retain the old file so that we can refer to it. */
- unexec_fstat (new_fd, &new_buf);
- new_base_addr = unexec_mmap (new_fd,
- MASK_UP (new_buf.st_size, page_size),
- PROT_READ | PROT_WRITE, MAP_SHARED);
-
-
-
- /* We need to do 2 things. First, make sure that _edata and _end (and
- hence, curbrk) are set to the correct values. At the same time, for
- neatness and to help with debugging, mark all the types of all ld.so
- and nm BSS symbols in the new file to be DATA, and make sure that
- there are no COMMON symbols in the output file, as any references to
- these can lose really big. Second, reset all of the ld.so "relocation
- sites" in the new file to have the values that appear in the old file
- -- the failure to do this was the biggest loser in the old version of
- this code. */
-
- /* STEP 1 */
- {
- /* Reset the regular symbol table first. */
- reset_symtab ((struct nlist *) (new_base_addr + N_SYMOFF(new_hdr)),
- (struct nlist *) (new_base_addr + N_SYMOFF(new_hdr) +
- new_hdr.a_syms),
- (char *) (new_base_addr + N_STROFF(new_hdr)),
- N_DATADDR (new_hdr) + new_hdr.a_data,
- N_BSSADDR (new_hdr) + new_hdr.a_bss,
- 0, !!dynamic_addr);
- /* Now reset the ld.so symbol table. */
- if (dynamic_addr)
- reset_symtab ((struct nlist *) (new_base_addr + ld2->ld_stab),
- (struct nlist *) (new_base_addr + ld2->ld_symbols),
- (char *) (new_base_addr + ld2->ld_symbols),
- N_DATADDR (new_hdr) + new_hdr.a_data,
- N_BSSADDR (new_hdr) + new_hdr.a_bss,
- 1, !!dynamic_addr);
- }
-
- /* STEP 2 */
- if (dynamic_addr)
- {
- struct translation_struct ts;
- struct relocation_info *tmp =
- (struct relocation_info *) (old_base_addr + ld2->ld_rel);
- struct relocation_info *end =
- (struct relocation_info *)(old_base_addr + ld2->ld_hash);
-
- /* set up the structure that we use to translate addresses in the
- old file into file offsets */
- ts.txtaddr = N_TXTADDR (old_hdr);
- ts.txtoff = N_TXTOFF (old_hdr);
- ts.dataddr = N_DATADDR (old_hdr);
- ts.datoff = N_DATOFF (old_hdr);
- ts.bssaddr = N_BSSADDR (old_hdr);
-
- while (tmp < end)
- {
- copy_relocation_site (tmp, old_base_addr, new_base_addr, &ts);
- tmp++;
- }
- }
-
-
- /* get rid of the mmap-ed file space and make the output file
- executable -- then quit */
- munmap (new_base_addr, MASK_UP (new_buf.st_size, page_size));
- munmap (old_base_addr, MASK_UP (old_buf.st_size, page_size));
- unexec_fchmod (new_fd, 0755);
- close (new_fd);
- return 0;
-}
-
-
-int
-run_time_remap (char *UNUSED (dummy))
-{
- long page_size = getpagesize();
- unsigned long base_addr = MASK_UP (mprotect_bottom_addr, page_size);
- unsigned long top_addr = MASK_DOWN (mprotect_top_addr, page_size);
- long len = top_addr - base_addr;
-
- if (!dynamic_addr)
- {
- unsigned long current_sbrk = (unsigned long) sbrk (0);
-
- if (sbrk_of_0_at_unexec < current_sbrk)
- {
- if (sbrk_of_0_at_unexec != 0)
- /* GCC -Wall even catches incorrect printf type errors.
- How utterly cool. */
- fprintf (stderr,
- "Absurd new brk addr = 0x%lx (current = 0x%lx)\n",
- sbrk_of_0_at_unexec, current_sbrk);
- }
- else
- {
- errno = 0;
- if (brk ((caddr_t) sbrk_of_0_at_unexec))
- fprintf (stderr, "failed to change brk addr to 0x%lx: %s\n",
- sbrk_of_0_at_unexec, SYS_ERR);
- }
- }
-
- if (len > 0)
- {
- errno = 0;
- if (mprotect ((caddr_t) base_addr, len, PROT_READ | PROT_EXEC))
- fprintf (stderr, "failed to change protection on data pages: %s\n",
- SYS_ERR);
- }
-
- return 0;
-}
-
diff -r 75975fd0b7fc -r aa5ed11f473b tests/ChangeLog
--- a/tests/ChangeLog Wed Nov 18 22:44:28 2009 +0900
+++ b/tests/ChangeLog Wed Nov 18 08:49:14 2009 -0700
@@ -1,3 +1,7 @@
+2009-11-10 Jerry James <james@xemacs.org>
+
+ * autoconf/regressiontest.pl: Remove reference to dynodump.
+
2009-11-16 Stephen J. Turnbull <stephen@xemacs.org>
Remove C asserts from test-format-data-conversion.
diff -r 75975fd0b7fc -r aa5ed11f473b tests/autoconf/regressiontest.pl
--- a/tests/autoconf/regressiontest.pl Wed Nov 18 22:44:28 2009 +0900
+++ b/tests/autoconf/regressiontest.pl Wed Nov 18 08:49:14 2009 -0700
@@ -44,8 +44,6 @@
"Makefile.in",
"./Makefile",
"./GNUmakefile",
- "dynodump/Makefile.in",
- "dynodump/Makefile",
"lib-src/Makefile.in",
"lib-src/Makefile",
"lib-src/GNUmakefile",