[COMMIT] fix rangetab.c
19 years, 4 months
Ben Wing
Ben Wing
NOTE: This patch has been committed.
src/ChangeLog addition:
2004-12-06 Ben Wing <ben(a)xemacs.org>
* rangetab.c (rangetab_instantiate):
Fix compile error.
build source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: src/rangetab.c
Index: src/rangetab.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/rangetab.c,v
retrieving revision 1.18
diff -u -p -r1.18 rangetab.c
--- src/rangetab.c 2004/12/06 03:52:17 1.18
+++ src/rangetab.c 2004/12/06 23:26:14
＠＠ -645,7 +645,7 ＠＠ rangetab_data_validate (Lisp_Object UNUS
static Lisp_Object
rangetab_instantiate (Lisp_Object plist)
{
- Lisp_Object data = Qnil, type = Qnil;
+ Lisp_Object data = Qnil, type = Qnil, rangetab;
PROPERTY_LIST_LOOP_3 (key, value, plist)
{
＠＠ -655,7 +655,7 ＠＠ rangetab_instantiate (Lisp_Object plist)
abort ();
}
- Lisp_Object rangetab = Fmake_range_table (type);
+ rangetab = Fmake_range_table (type);
{
PROPERTY_LIST_LOOP_3 (range, val, data)
- 1 participants
- 0 comments
[COMMIT] fix gnuclient compile
19 years, 4 months
Ben Wing
Ben Wing
NOTE: This patch has been committed.
lib-src/ChangeLog addition:
2004-12-06 Ben Wing <ben(a)xemacs.org>
* gnuclient.c:
* gnuclient.c (get_current_working_directory):
* gnuclient.c (filename_expand):
* gnuclient.c (main):
Use QXE_PATH_MAX.
build source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: lib-src/gnuclient.c
Index: lib-src/gnuclient.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/gnuclient.c,v
retrieving revision 1.26
diff -u -p -r1.26 gnuclient.c
--- lib-src/gnuclient.c 2004/09/20 19:19:10 1.26
+++ lib-src/gnuclient.c 2004/12/06 23:22:54
＠＠ -74,10 +74,10 ＠＠ main (int argc, char *argv[])
} /* main */
#else /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */
-static char cwd[PATH_MAX+2]; /* current working directory when calculated */
+static char cwd[QXE_PATH_MAX+2];/* current working directory when calculated */
static char *cp = NULL; /* ptr into valid bit of cwd above */
-static pid_t emacs_pid; /* Process id for emacs process */
+static pid_t emacs_pid; /* Process id for emacs process */
void initialize_signals (void);
＠＠ -149,7 +149,7 ＠＠ get_current_working_directory (void)
if (cp == NULL)
{ /* haven't calculated it yet */
#ifdef HAVE_GETCWD
- if (getcwd (cwd,PATH_MAX) == NULL)
+ if (getcwd (cwd,QXE_PATH_MAX) == NULL)
#else
if (getwd (cwd) == 0)
#endif /* HAVE_GETCWD */
＠＠ -182,7 +182,7 ＠＠ filename_expand (char *fullpath, char *f
/* filename - filename to expand */
{
#ifdef CYGWIN
- char cygwinFilename[PATH_MAX+1];
+ char cygwinFilename[QXE_PATH_MAX+1];
extern void cygwin_conv_to_posix_path(const char *, char *);
#endif
＠＠ -297,8 +297,8 ＠＠ int
main (int argc, char *argv[])
{
int starting_line = 1; /* line to start editing at */
- char command[PATH_MAX+50]; /* emacs command buffer */
- char fullpath[PATH_MAX+1]; /* full pathname to file */
+ char command[QXE_PATH_MAX+50];/* emacs command buffer */
+ char fullpath[QXE_PATH_MAX+1];/* full pathname to file */
char *eval_form = NULL; /* form to evaluate with `-eval' */
char *eval_function = NULL; /* function to evaluate with `-f' */
char *load_library = NULL; /* library to load */
＠＠ -317,7 +317,7 ＠＠ main (int argc, char *argv[])
char *hostarg = NULL; /* remote hostname */
char *remotearg;
char thishost[HOSTNAMSZ]; /* this hostname */
- char remotepath[PATH_MAX+1]; /* remote pathname */
+ char remotepath[QXE_PATH_MAX+1]; /* remote pathname */
char *path;
int rflg = 0; /* pathname given on cmdline */
char *portarg;
- 1 participants
- 0 comments
[COMMIT] Support package-prefix and fix mail-locking in configure
19 years, 4 months
Ben Wing
Ben Wing
NOTE: This patch has been committed.
These need some more testing, but I suggest these both go into 21.4.
--package-prefix is analogous to the PACKAGE_PREFIX variable in
nt/config.inc, which is already present in 21.4.
ChangeLog addition:
2004-12-05 Ben Wing <ben(a)xemacs.org>
* configure.usage:
* configure.in (AC_INIT_PARSE_ARGS):
* configure.in (TAB):
* configure.in (XE_COMPUTE_RUNPATH):
* configure:
Support --package-prefix and mmdf and pop arguments to --mail-locking.
Document in configure.usage.
build source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: configure configure.in configure.usage
Index: configure.usage
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.usage,v
retrieving revision 1.36
diff -u -p -r1.36 configure.usage
--- configure.usage 2004/04/06 12:13:55 1.36
+++ configure.usage 2004/12/05 06:16:07
＠＠ -98,6 +98,17 ＠＠ Run-time path-searching options:
searched before the installation packages.
--with-site-modules=no Disable site-modules directory in the XEmacs hierarchy,
which is searched before the installation modules.
+--package-prefix=PATH Specify a directory under which packages will
+ be searched. The directories `xemacs-packages' and
+ (if MULE support exists) `mule-packages' (along with,
+ optionally, `site-packages') should exist under this
+ directory. This is preferred to specifying
+ `--package-path' directly and is equivalent to
+ --package-path="~/.xemacs::${package-prefix}/\
+ site-packages:${package_prefix}/xemacs-packages:\
+ ${package_prefix}/mule-packages"
+ (or the same without `.../mule-packages' if no
+ MULE support exists)
--package-path=PATH Directories to search for packages to dump with xemacs.
PATH splits into three parts separated by double
colons (::), an early, a late, and a last part,
＠＠ -259,8 +270,10 ＠＠ Mail options:
-------------
--mail-locking=TYPE (*) Specify the locking to be used by movemail to prevent
- concurrent updates of mail spool files. Valid types
- are `lockf', `flock', `dot', `locking' or `mmdf'.
+ concurrent updates of mail spool files. Valid types
+ are `lockf', `flock', `file', `dot' (same as `file'),
+ `locking', `mmdf' and `pop' (equivalent to
+ `--with-pop=yes').
--with-pop Support POP for mail retrieval.
--with-kerberos Support Kerberos-authenticated POP.
--with-hesiod Support Hesiod to get the POP server host.
Index: configure.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v
retrieving revision 1.233
diff -u -p -r1.233 configure.in
--- configure.in 2004/11/14 12:31:12 1.233
+++ configure.in 2004/12/05 06:16:11
＠＠ -698,8 +698,10 ＠＠ The default is to autodetect native and
flock ) val=flock ;;
file | dot ) val=file ;;
locking ) val=locking ;;
+ mmdf ) val=mmdf ;;
+ pop ) val=pop ;;
* ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
- \`lockf', \`flock', \`file', \`locking', or \`mmdf'."]) ;;
+ \`lockf', \`flock', \`file', \`dot', \`locking', \`mmdf', or \`pop'."]) ;;
esac
eval "$opt=\"$val\""
;;
＠＠ -785,7 +787,7 ＠＠ The default is to autodetect native and
dnl Has the user specified one of the path options?
prefix | exec_prefix | bindir | datadir | statedir | libdir | \
mandir | infodir | infopath | lispdir | etcdir | \
- archlibdir | docdir | package_path | moduledir )
+ archlibdir | docdir | package_path | package_prefix | moduledir )
dnl If the value was omitted, get it from the next argument.
if test "$valomitted" = "yes"; then
if test "$#" = 0; then
＠＠ -806,6 +808,7 ＠＠ The default is to autodetect native and
etcdir ) AC_DEFINE(ETCDIR_USER_DEFINED) ;;
infodir ) AC_DEFINE(INFODIR_USER_DEFINED) ;;
infopath ) AC_DEFINE(INFOPATH_USER_DEFINED) ;;
+ package_prefix ) AC_DEFINE(PACKAGE_PATH_USER_DEFINED) ;;
package_path ) AC_DEFINE(PACKAGE_PATH_USER_DEFINED) ;;
datadir )
AC_DEFINE(INFODIR_USER_DEFINED)
＠＠ -1952,7 +1955,7 ＠＠ test "$extra_verbose" = "yes" && \
objects_machine objects_system c_switch_machine c_switch_system
ld_switch_machine ld_switch_system unexec ld_switch_shared
ld lib_gcc ld_text_start_addr start_files ordinary_link
- have_terminfo mail_use_flock mail_use_lockf) && echo ""
+ have_terminfo mail_use_flock mail_use_lockf mail_using_locking) && echo ""
dnl Pick up mingw include path
dnl We only cope with headers in mingw, not mingw32: no previous version of
＠＠ -2809,7 +2812,8 ＠＠ elif test "$mail_locking" = "locking"; t
elif test "$mail_locking" = "pop"; then
with_pop=yes
mail_locking=
-else mail_locking="dot-locking"; AC_DEFINE(MAIL_LOCK_DOT)
+elif test "$mail_locking" = "mmdf"; then AC_DEFINE(MAIL_LOCK_MMDF)
+else mail_locking="file"; AC_DEFINE(MAIL_LOCK_DOT)
fi
test "$mail_locking" = "lockf" -a "$ac_cv_func_lockf" != "yes" && \
XE_DIE("lockf mail locking requested but not available.")
＠＠ -5204,6 +5208,14 ＠＠ while true; do
esac
done
AC_SUBST(INFOPATH)
+
+if test -z "$package_path" && test -n "$package_prefix" ; then
+ if test "$with_mule" = "yes" ; then
+ package_path="~/.xemacs::${package_prefix}/site-packages:${package_prefix}/xemacs-packages:${package_prefix}/mule-packages"
+ else
+ package_path="~/.xemacs::${package_prefix}/site-packages:${package_prefix}/xemacs-packages"
+ fi
+fi
AC_SUBST(package_path)
AC_SUBST(PACKAGE_PATH_USER_DEFINED)
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.232
diff -u -p -r1.232 configure
--- configure 2004/11/14 12:31:10 1.232
+++ configure 2004/12/05 06:16:16
＠＠ -532,9 +532,11 ＠＠ echo " Use \`$progname --help' to show
flock ) val=flock ;;
file | dot ) val=file ;;
locking ) val=locking ;;
+ mmdf ) val=mmdf ;;
+ pop ) val=pop ;;
* ) (echo "$progname: Usage error:"
echo " " "The \`--$optname' option must have one of these values:
- \`lockf', \`flock', \`file', \`locking', or \`mmdf'."
+ \`lockf', \`flock', \`file', \`dot', \`locking', \`mmdf', or \`pop'."
echo " Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
esac
eval "$opt=\"$val\""
＠＠ -618,7 +620,7 ＠＠ echo " Use \`$progname --help' to show
prefix | exec_prefix | bindir | datadir | statedir | libdir | \
mandir | infodir | infopath | lispdir | etcdir | \
- archlibdir | docdir | package_path | moduledir )
+ archlibdir | docdir | package_path | package_prefix | moduledir )
if test "$valomitted" = "yes"; then
if test "$#" = 0; then
(echo "$progname: Usage error:"
＠＠ -686,6 +688,14 ＠＠ cat >> confdefs.h <<\EOF
EOF
}
;;
+ package_prefix ) { test "$extra_verbose" = "yes" && cat << \EOF
+ Defining PACKAGE_PATH_USER_DEFINED
+EOF
+cat >> confdefs.h <<\EOF
+#define PACKAGE_PATH_USER_DEFINED 1
+EOF
+}
+ ;;
package_path ) { test "$extra_verbose" = "yes" && cat << \EOF
Defining PACKAGE_PATH_USER_DEFINED
EOF
＠＠ -849,7 +859,7 ＠＠ echo " Use \`$progname --help' to show
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:853: checking whether ln -s works" >&5
+echo "configure:863: checking whether ln -s works" >&5
rm -f conftestdata
if ln -s X conftestdata 2>/dev/null
＠＠ -1135,7 +1145,7 ＠＠ EOF
echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1139: checking "host system type"" >&5
+echo "configure:1149: checking "host system type"" >&5
internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
＠＠ -1673,7 +1683,7 ＠＠ xe_save_CFLAGS="$CFLAGS"
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1677: checking for $ac_word" >&5
+echo "configure:1687: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1700,7 +1710,7 ＠＠ 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
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1704: checking for $ac_word" >&5
+echo "configure:1714: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1748,7 +1758,7 ＠＠ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1752: checking for $ac_word" >&5
+echo "configure:1762: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1777,7 +1787,7 ＠＠ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1781: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1791: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
＠＠ -1790,12 +1800,12 ＠＠ cross_compiling=no
cat > conftest.$ac_ext << EOF
-#line 1794 "configure"
+#line 1804 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
＠＠ -1823,19 +1833,19 ＠＠ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1827: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1837: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1832: checking whether we are using GNU C" >&5
+echo "configure:1842: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
＠＠ -1853,7 +1863,7 ＠＠ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1857: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1867: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
＠＠ -1886,7 +1896,7 ＠＠ if test "$with_gcc" = "no" -a "$GCC"
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1890: checking for $ac_word" >&5
+echo "configure:1900: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1913,7 +1923,7 ＠＠ 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
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1917: checking for $ac_word" >&5
+echo "configure:1927: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1961,7 +1971,7 ＠＠ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1965: checking for $ac_word" >&5
+echo "configure:1975: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1990,7 +2000,7 ＠＠ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1994: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2004: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
＠＠ -2003,12 +2013,12 ＠＠ cross_compiling=no
cat > conftest.$ac_ext << EOF
-#line 2007 "configure"
+#line 2017 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
＠＠ -2036,19 +2046,19 ＠＠ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2040: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2050: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2045: checking whether we are using GNU C" >&5
+echo "configure:2055: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
＠＠ -2066,7 +2076,7 ＠＠ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2070: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2080: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
＠＠ -2099,7 +2109,7 ＠＠ elif test "$with_gcc" = "yes" -a "$GCC"
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2103: checking for $ac_word" >&5
+echo "configure:2113: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -2126,7 +2136,7 ＠＠ 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
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2130: checking for $ac_word" >&5
+echo "configure:2140: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -2174,7 +2184,7 ＠＠ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2178: checking for $ac_word" >&5
+echo "configure:2188: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -2203,7 +2213,7 ＠＠ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2207: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2217: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
＠＠ -2216,12 +2226,12 ＠＠ cross_compiling=no
cat > conftest.$ac_ext << EOF
-#line 2220 "configure"
+#line 2230 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
＠＠ -2249,19 +2259,19 ＠＠ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2253: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2263: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2258: checking whether we are using GNU C" >&5
+echo "configure:2268: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
＠＠ -2279,7 +2289,7 ＠＠ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2283: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2293: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
＠＠ -2312,7 +2322,7 ＠＠ CFLAGS="$xe_save_CFLAGS"
if test "$GCC" = "yes"; then
cat > conftest.$ac_ext <<EOF
-#line 2316 "configure"
+#line 2326 "configure"
#include "confdefs.h"
int main () {
#if __GNUC__ >= 3
＠＠ -2322,7 +2332,7 ＠＠ return 0;
#endif
}
EOF
-if { (eval echo configure:2326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
＠＠ -2348,7 +2358,7 ＠＠ test -n "$CPP" -a -d "$CPP" && CPP=
test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2352: checking how to run the C preprocessor" >&5
+echo "configure:2362: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
＠＠ -2361,13 +2371,13 ＠＠ if test -z "$CPP"; then
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 2365 "configure"
+#line 2375 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
＠＠ -2378,13 +2388,13 ＠＠ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2382 "configure"
+#line 2392 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
＠＠ -2395,13 +2405,13 ＠＠ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2399 "configure"
+#line 2409 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
＠＠ -2427,9 +2437,9 ＠＠ echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2431: checking for AIX" >&5
+echo "configure:2441: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 2433 "configure"
+#line 2443 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
＠＠ -2456,9 +2466,9 ＠＠ rm -f conftest*
echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2460: checking for GNU libc" >&5
+echo "configure:2470: checking for GNU libc" >&5
cat > conftest.$ac_ext <<EOF
-#line 2462 "configure"
+#line 2472 "configure"
#include "confdefs.h"
#include <features.h>
int main() {
＠＠ -2470,7 +2480,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:2474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_glibc=yes
else
＠＠ -2565,7 +2575,7 ＠＠ EOF
esac
cat > conftest.$ac_ext <<EOF
-#line 2569 "configure"
+#line 2579 "configure"
#include "confdefs.h"
int main () {
#if defined __SUNPRO_C
＠＠ -2581,7 +2591,7 ＠＠ return 0;
#endif
}
EOF
-if { (eval echo configure:2585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
＠＠ -2815,7 +2825,7 ＠＠ if test "$pdump" = "yes"; then
fi
test "$extra_verbose" = "yes" && \
- for var in libs_machine libs_system libs_termcap libs_standard objects_machine objects_system c_switch_machine c_switch_system ld_switch_machine ld_switch_system unexec ld_switch_shared ld lib_gcc ld_text_start_addr start_files ordinary_link have_terminfo mail_use_flock mail_use_lockf; do eval "echo \"$var = '\$$var'\""; done && echo ""
+ for var in libs_machine libs_system libs_termcap libs_standard objects_machine objects_system c_switch_machine c_switch_system ld_switch_machine ld_switch_system unexec ld_switch_shared ld lib_gcc ld_text_start_addr start_files ordinary_link have_terminfo mail_use_flock mail_use_lockf mail_using_locking; do eval "echo \"$var = '\$$var'\""; done && echo ""
case "$opsys" in mingw* | cygwin*)
cygwin_include=`eval "gcc -print-file-name=libc.a"` ;
＠＠ -2835,17 +2845,17 ＠＠ test "$__DECC" = "yes" && c_switch_site=
if test "$__USLC__" = yes; then
echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2839: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2849: checking for whether the -Kalloca compiler flag is needed" >&5
need_kalloca=no
cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
+#line 2852 "configure"
#include "confdefs.h"
int main() {
void *x = alloca(4);
; return 0; }
EOF
-if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
:
else
＠＠ -2856,14 +2866,14 ＠＠ else
xe_save_c_switch_system="$c_switch_system"
c_switch_system="$c_switch_system -Kalloca"
cat > conftest.$ac_ext <<EOF
-#line 2860 "configure"
+#line 2870 "configure"
#include "confdefs.h"
int main() {
void *x = alloca(4);
; return 0; }
EOF
-if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
need_kalloca=yes
else
＠＠ -2892,7 +2902,7 ＠＠ fi
echo $ac_n "checking for preferred CFLAGS""... $ac_c" 1>&6
-echo "configure:2896: checking for preferred CFLAGS" >&5
+echo "configure:2906: checking for preferred CFLAGS" >&5
if test "$cflags_specified" = "no"; then
if test "$GCC" = "yes"; then
＠＠ -2915,7 +2925,7 ＠＠ echo "$ac_t""${CFLAGS}" 1>&6
echo $ac_n "checking for preferred warning flags for XEMACS_CC""... $ac_c" 1>&6
-echo "configure:2919: checking for preferred warning flags for XEMACS_CC" >&5
+echo "configure:2929: checking for preferred warning flags for XEMACS_CC" >&5
xe_cflags_warning=""
＠＠ -2948,7 +2958,7 ＠＠ test -z "$xe_cflags_warning" && xe_cflag
echo "$ac_t""${xe_cflags_warning}" 1>&6
echo $ac_n "checking for preferred warning flags for CC""... $ac_c" 1>&6
-echo "configure:2952: checking for preferred warning flags for CC" >&5
+echo "configure:2962: checking for preferred warning flags for CC" >&5
echo "$ac_t""${cflags_warning}" 1>&6
XE_CFLAGS="$xe_cflags_warning $CFLAGS"
＠＠ -2956,7 +2966,7 ＠＠ CFLAGS="$cflags_warning $CFLAGS"
if test "$GCC" = "yes"; then
echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2960: checking for buggy gcc versions" >&5
+echo "configure:2970: checking for buggy gcc versions" >&5
GCC_VERSION=`$CC --version`
case `uname -s`:`uname -m`:$GCC_VERSION in
*:sun4*:2.8.1|*:sun4*:egcs-2.90.*)
＠＠ -3014,7 +3024,7 ＠＠ fi
if test "$pdump" != "yes"; then
echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
-echo "configure:3018: checking for \"-z nocombreloc\" linker flag" >&5
+echo "configure:3028: checking for \"-z nocombreloc\" linker flag" >&5
case "`ld --help 2>&1`" in
*-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6
ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
＠＠ -3103,7 +3113,7 ＠＠ test "$pdump" = "yes" && extra_objs="$ex
fi
echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:3107: checking for dynodump" >&5
+echo "configure:3117: checking for dynodump" >&5
if test "$unexec" != "unexsol2.o"; then
echo "$ac_t""no" 1>&6
else
＠＠ -3140,12 +3150,12 ＠＠ if test "$unexec" = "unexaix.o"; then
done
echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:3144: checking for terminateAndUnload in -lC" >&5
+echo "configure:3154: checking for terminateAndUnload in -lC" >&5
ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`
xe_check_libs=" -lC "
cat > conftest.$ac_ext <<EOF
-#line 3149 "configure"
+#line 3159 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -3156,7 +3166,7 ＠＠ int main() {
terminateAndUnload()
; return 0; }
EOF
-if { (eval echo configure:3160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -3198,7 +3208,7 ＠＠ gcc_compiler_specs=""
libc_version=""
echo $ac_n "checking for compiler version information""... $ac_c" 1>&6
-echo "configure:3202: checking for compiler version information" >&5
+echo "configure:3212: checking for compiler version information" >&5
if test "$GCC" = "yes"; then
compiler_version=`$XEMACS_CC --version | head -1`
＠＠ -3249,7 +3259,7 ＠＠ if test -z "$compiler_version"; then
fi
echo $ac_n "checking for standard C library version information""... $ac_c" 1>&6
-echo "configure:3253: checking for standard C library version information" >&5
+echo "configure:3263: checking for standard C library version information" >&5
case "$canonical" in
*-*-linux*)
＠＠ -3361,7 +3371,7 ＠＠ fi
if test "$add_runtime_path" = "yes"; then
echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3365: checking "for runtime libraries flag"" >&5
+echo "configure:3375: checking "for runtime libraries flag"" >&5
case "$opsys" in
sol2 ) dash_r="-R" ;;
decosf* | linux* | irix*) dash_r="-rpath " ;;
＠＠ -3383,14 +3393,14 ＠＠ if test "$GCC" = "yes"; then
done
fi
cat > conftest.$ac_ext <<EOF
-#line 3387 "configure"
+#line 3397 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
dash_r="$try_dash_r"
else
＠＠ -3491,10 +3501,10 ＠＠ else
fi
after_morecore_hook_exists=yes
echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3495: checking for malloc_set_state" >&5
+echo "configure:3505: checking for malloc_set_state" >&5
cat > conftest.$ac_ext <<EOF
-#line 3498 "configure"
+#line 3508 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char malloc_set_state(); below. */
＠＠ -3517,7 +3527,7 ＠＠ malloc_set_state();
; return 0; }
EOF
-if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_malloc_set_state=yes"
else
＠＠ -3537,16 +3547,16 ＠＠ doug_lea_malloc=no
fi
echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3541: checking whether __after_morecore_hook exists" >&5
+echo "configure:3551: checking whether __after_morecore_hook exists" >&5
cat > conftest.$ac_ext <<EOF
-#line 3543 "configure"
+#line 3553 "configure"
#include "confdefs.h"
extern void (* __after_morecore_hook)();
int main() {
__after_morecore_hook = 0
; return 0; }
EOF
-if { (eval echo configure:3550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
＠＠ -3602,7 +3612,7 ＠＠ fi
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3606: checking for $ac_word" >&5
+echo "configure:3616: checking for $ac_word" >&5
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
＠＠ -3657,7 +3667,7 ＠＠ ac_configure=$ac_aux_dir/configure # Thi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3661: checking for a BSD compatible install" >&5
+echo "configure:3671: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
＠＠ -3711,7 +3721,7 ＠＠ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3715: checking for $ac_word" >&5
+echo "configure:3725: checking for $ac_word" >&5
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
＠＠ -3743,15 +3753,15 ＠＠ for ac_hdr in a.out.h elf.h cygwin
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3747: checking for $ac_hdr" >&5
+echo "configure:3757: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3750 "configure"
+#line 3760 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -3781,10 +3791,10 ＠＠ fi
done
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3785: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3795: checking for sys/wait.h that is POSIX.1 compatible" >&5
cat > conftest.$ac_ext <<EOF
-#line 3788 "configure"
+#line 3798 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
＠＠ -3800,7 +3810,7 ＠＠ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:3804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
＠＠ -3824,10 +3834,10 ＠＠ EOF
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3828: checking for ANSI C header files" >&5
+echo "configure:3838: checking for ANSI C header files" >&5
cat > conftest.$ac_ext <<EOF
-#line 3831 "configure"
+#line 3841 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
＠＠ -3835,7 +3845,7 ＠＠ cat > conftest.$ac_ext <<EOF
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -3852,7 +3862,7 ＠＠ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3856 "configure"
+#line 3866 "configure"
#include "confdefs.h"
#include <string.h>
EOF
＠＠ -3870,7 +3880,7 ＠＠ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3874 "configure"
+#line 3884 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
＠＠ -3888,7 +3898,7 ＠＠ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
cat > conftest.$ac_ext <<EOF
-#line 3892 "configure"
+#line 3902 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
＠＠ -3899,7 +3909,7 ＠＠ if (XOR (islower (i), ISLOWER (i)) || to
exit (0); }
EOF
-if { (eval echo configure:3903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
＠＠ -3925,10 +3935,10 ＠＠ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3929: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3939: checking whether time.h and sys/time.h may both be included" >&5
cat > conftest.$ac_ext <<EOF
-#line 3932 "configure"
+#line 3942 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
＠＠ -3937,7 +3947,7 ＠＠ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
＠＠ -3961,10 +3971,10 ＠＠ EOF
fi
echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3965: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3975: checking for sys_siglist declaration in signal.h or unistd.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 3968 "configure"
+#line 3978 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
＠＠ -3976,7 +3986,7 ＠＠ int main() {
char *msg = *(sys_siglist + 1);
; return 0; }
EOF
-if { (eval echo configure:3980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_decl_sys_siglist=yes
else
＠＠ -4002,9 +4012,9 ＠＠ fi
echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:4006: checking for utime" >&5
+echo "configure:4016: checking for utime" >&5
cat > conftest.$ac_ext <<EOF
-#line 4008 "configure"
+#line 4018 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <utime.h>
＠＠ -4012,7 +4022,7 ＠＠ int main() {
struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
; return 0; }
EOF
-if { (eval echo configure:4016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -4031,10 +4041,10 ＠＠ else
for ac_func in utimes
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4035: checking for $ac_func" >&5
+echo "configure:4045: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4038 "configure"
+#line 4048 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -4057,7 +4067,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -4089,10 +4099,10 ＠＠ rm -f conftest*
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4093: checking return type of signal handlers" >&5
+echo "configure:4103: checking return type of signal handlers" >&5
cat > conftest.$ac_ext <<EOF
-#line 4096 "configure"
+#line 4106 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
＠＠ -4109,7 +4119,7 ＠＠ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:4113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
＠＠ -4131,10 +4141,10 ＠＠ EOF
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:4135: checking for size_t" >&5
+echo "configure:4145: checking for size_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4138 "configure"
+#line 4148 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4165,10 +4175,10 ＠＠ EOF
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:4169: checking for pid_t" >&5
+echo "configure:4179: checking for pid_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4172 "configure"
+#line 4182 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4199,10 +4209,10 ＠＠ EOF
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4203: checking for uid_t in sys/types.h" >&5
+echo "configure:4213: checking for uid_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 4206 "configure"
+#line 4216 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
＠＠ -4238,10 +4248,10 ＠＠ EOF
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:4242: checking for mode_t" >&5
+echo "configure:4252: checking for mode_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4245 "configure"
+#line 4255 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4272,10 +4282,10 ＠＠ EOF
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4276: checking for off_t" >&5
+echo "configure:4286: checking for off_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4279 "configure"
+#line 4289 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4306,10 +4316,10 ＠＠ EOF
fi
echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4310: checking for ssize_t" >&5
+echo "configure:4320: checking for ssize_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4313 "configure"
+#line 4323 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4342,9 +4352,9 ＠＠ fi
if test "$ac_cv_header_inttypes_h" != "yes"; then
echo $ac_n "checking for intptr_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4346: checking for intptr_t in sys/types.h" >&5
+echo "configure:4356: checking for intptr_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 4348 "configure"
+#line 4358 "configure"
#include "confdefs.h"
#include <sys/types.h>
intptr_t x;
＠＠ -4353,7 +4363,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:4357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -4374,9 +4384,9 ＠＠ rm -f conftest*
fi
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4378: checking for socklen_t" >&5
+echo "configure:4388: checking for socklen_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4380 "configure"
+#line 4390 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
＠＠ -4386,7 +4396,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:4390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
＠＠ -4395,7 +4405,7 ＠＠ else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 4399 "configure"
+#line 4409 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
＠＠ -4405,7 +4415,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:4409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""size_t" 1>&6
＠＠ -4437,9 +4447,9 ＠＠ fi
rm -f conftest*
echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4441: checking for struct timeval" >&5
+echo "configure:4451: checking for struct timeval" >&5
cat > conftest.$ac_ext <<EOF
-#line 4443 "configure"
+#line 4453 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
＠＠ -4455,7 +4465,7 ＠＠ int main() {
static struct timeval x; x.tv_sec = x.tv_usec;
; return 0; }
EOF
-if { (eval echo configure:4459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
HAVE_TIMEVAL=yes
＠＠ -4477,10 +4487,10 ＠＠ fi
rm -f conftest*
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4481: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4491: checking whether struct tm is in sys/time.h or time.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 4484 "configure"
+#line 4494 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
＠＠ -4488,7 +4498,7 ＠＠ int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:4492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
＠＠ -4512,10 +4522,10 ＠＠ EOF
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4516: checking for tm_zone in struct tm" >&5
+echo "configure:4526: checking for tm_zone in struct tm" >&5
cat > conftest.$ac_ext <<EOF
-#line 4519 "configure"
+#line 4529 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
＠＠ -4523,7 +4533,7 ＠＠ int main() {
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:4527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
＠＠ -4546,10 +4556,10 ＠＠ EOF
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4550: checking for tzname" >&5
+echo "configure:4560: checking for tzname" >&5
cat > conftest.$ac_ext <<EOF
-#line 4553 "configure"
+#line 4563 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
＠＠ -4559,7 +4569,7 ＠＠ int main() {
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
＠＠ -4585,10 +4595,10 ＠＠ fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4589: checking for working const" >&5
+echo "configure:4599: checking for working const" >&5
cat > conftest.$ac_ext <<EOF
-#line 4592 "configure"
+#line 4602 "configure"
#include "confdefs.h"
int main() {
＠＠ -4637,7 +4647,7 ＠＠ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:4641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
＠＠ -4662,7 +4672,7 ＠＠ fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4666: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4676: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
cat > conftestmake <<\EOF
＠＠ -4687,12 +4697,12 ＠＠ fi
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4691: checking whether byte ordering is bigendian" >&5
+echo "configure:4701: checking whether byte ordering is bigendian" >&5
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 4696 "configure"
+#line 4706 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
＠＠ -4703,11 +4713,11 ＠＠ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:4707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 4711 "configure"
+#line 4721 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
＠＠ -4718,7 +4728,7 ＠＠ int main() {
#endif
; return 0; }
EOF
-if { (eval echo configure:4722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
＠＠ -4735,7 +4745,7 ＠＠ fi
rm -f conftest*
if test $ac_cv_c_bigendian = unknown; then
cat > conftest.$ac_ext <<EOF
-#line 4739 "configure"
+#line 4749 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
＠＠ -4748,7 +4758,7 ＠＠ main () {
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_c_bigendian=no
else
＠＠ -4775,10 +4785,10 ＠＠ fi
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4779: checking size of short" >&5
+echo "configure:4789: checking size of short" >&5
cat > conftest.$ac_ext <<EOF
-#line 4782 "configure"
+#line 4792 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4789,7 +4799,7 ＠＠ main()
exit(0);
}
EOF
-if { (eval echo configure:4793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_short=`cat conftestval`
else
＠＠ -4817,10 +4827,10 ＠＠ if test "$ac_cv_sizeof_short" = 0; then
exit 1
fi
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4821: checking size of int" >&5
+echo "configure:4831: checking size of int" >&5
cat > conftest.$ac_ext <<EOF
-#line 4824 "configure"
+#line 4834 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4831,7 +4841,7 ＠＠ main()
exit(0);
}
EOF
-if { (eval echo configure:4835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_int=`cat conftestval`
else
＠＠ -4853,10 +4863,10 ＠＠ EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4857: checking size of long" >&5
+echo "configure:4867: checking size of long" >&5
cat > conftest.$ac_ext <<EOF
-#line 4860 "configure"
+#line 4870 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4867,7 +4877,7 ＠＠ main()
exit(0);
}
EOF
-if { (eval echo configure:4871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_long=`cat conftestval`
else
＠＠ -4889,10 +4899,10 ＠＠ EOF
echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4893: checking size of long long" >&5
+echo "configure:4903: checking size of long long" >&5
cat > conftest.$ac_ext <<EOF
-#line 4896 "configure"
+#line 4906 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4903,7 +4913,7 ＠＠ main()
exit(0);
}
EOF
-if { (eval echo configure:4907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_long_long=`cat conftestval`
else
＠＠ -4925,10 +4935,10 ＠＠ EOF
echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4929: checking size of void *" >&5
+echo "configure:4939: checking size of void *" >&5
cat > conftest.$ac_ext <<EOF
-#line 4932 "configure"
+#line 4942 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4939,7 +4949,7 ＠＠ main()
exit(0);
}
EOF
-if { (eval echo configure:4943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_void_p=`cat conftestval`
else
＠＠ -4961,10 +4971,10 ＠＠ EOF
echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:4965: checking size of double" >&5
+echo "configure:4975: checking size of double" >&5
cat > conftest.$ac_ext <<EOF
-#line 4968 "configure"
+#line 4978 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
＠＠ -4975,7 +4985,7 ＠＠ main()
exit(0);
}
EOF
-if { (eval echo configure:4979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_double=`cat conftestval`
else
＠＠ -4998,7 +5008,7 ＠＠ EOF
echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:5002: checking for long file names" >&5
+echo "configure:5012: checking for long file names" >&5
ac_cv_sys_long_file_names=yes
# Test for long file names in all the places we know might matter:
＠＠ -5044,10 +5054,10 ＠＠ fi
echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:5048: checking for sin" >&5
+echo "configure:5058: checking for sin" >&5
cat > conftest.$ac_ext <<EOF
-#line 5051 "configure"
+#line 5061 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sin(); below. */
＠＠ -5070,7 +5080,7 ＠＠ sin();
; return 0; }
EOF
-if { (eval echo configure:5074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_sin=yes"
else
＠＠ -5088,12 +5098,12 ＠＠ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:5092: checking for sin in -lm" >&5
+echo "configure:5102: checking for sin in -lm" >&5
ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
xe_check_libs=" -lm "
cat > conftest.$ac_ext <<EOF
-#line 5097 "configure"
+#line 5107 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -5104,7 +5114,7 ＠＠ int main() {
sin()
; return 0; }
EOF
-if { (eval echo configure:5108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5139,14 +5149,14 ＠＠ fi
cat > conftest.$ac_ext <<EOF
-#line 5143 "configure"
+#line 5153 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
return atanh(1.0) + asinh(1.0) + acosh(1.0);
; return 0; }
EOF
-if { (eval echo configure:5150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_INVERSE_HYPERBOLIC
＠＠ -5165,10 +5175,10 ＠＠ rm -f conftest*
for ac_func in mkstemp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5169: checking for $ac_func" >&5
+echo "configure:5179: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5172 "configure"
+#line 5182 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -5191,7 +5201,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -5220,14 +5230,14 ＠＠ done
echo "checking type of mail spool file locking" 1>&6
-echo "configure:5224: checking type of mail spool file locking" >&5
+echo "configure:5234: checking type of mail spool file locking" >&5
for ac_func in lockf flock
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5228: checking for $ac_func" >&5
+echo "configure:5238: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5231 "configure"
+#line 5241 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -5250,7 +5260,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -5313,7 +5323,15 ＠＠ EOF
elif test "$mail_locking" = "pop"; then
with_pop=yes
mail_locking=
-else mail_locking="dot-locking"; { test "$extra_verbose" = "yes" && cat << \EOF
+elif test "$mail_locking" = "mmdf"; then { test "$extra_verbose" = "yes" && cat << \EOF
+ Defining MAIL_LOCK_MMDF
+EOF
+cat >> confdefs.h <<\EOF
+#define MAIL_LOCK_MMDF 1
+EOF
+}
+
+else mail_locking="file"; { test "$extra_verbose" = "yes" && cat << \EOF
Defining MAIL_LOCK_DOT
EOF
cat >> confdefs.h <<\EOF
＠＠ -5332,12 +5350,12 ＠＠ test "$mail_locking" = "locking" -a "$ac
case "$opsys" in decosf*)
echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5336: checking for cma_open in -lpthreads" >&5
+echo "configure:5354: checking for cma_open in -lpthreads" >&5
ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpthreads "
cat > conftest.$ac_ext <<EOF
-#line 5341 "configure"
+#line 5359 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -5348,7 +5366,7 ＠＠ int main() {
cma_open()
; return 0; }
EOF
-if { (eval echo configure:5352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5385,7 +5403,7 ＠＠ esac
echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5389: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5407: checking whether the -xildoff compiler flag is required" >&5
if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
then echo "$ac_t""no" 1>&6;
＠＠ -5397,7 +5415,7 ＠＠ fi
if test "$opsys" = "sol2"; then
if test "$os_release" -ge 506; then
echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:5401: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5419: checking for \"-z ignore\" linker flag" >&5
case "`ld -h 2>&1`" in
*-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
ld_switch_site="-z ignore $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
＠＠ -5408,7 +5426,7 ＠＠ fi
echo "checking "for specified window system"" 1>&6
-echo "configure:5412: checking "for specified window system"" >&5
+echo "configure:5430: checking "for specified window system"" >&5
GNOME_CONFIG=no
＠＠ -5416,7 +5434,7 ＠＠ GTK_CONFIG=no
if test "$with_gnome" != "no"; then
echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5420: checking for GNOME configuration script" >&5
+echo "configure:5438: checking for GNOME configuration script" >&5
for possible in gnome-config
do
possible_version=`${possible} --version 2> /dev/null`
＠＠ -5447,7 +5465,7 ＠＠ fi
if test "$with_gtk" != "no";then
echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5451: checking for GTK configuration script" >&5
+echo "configure:5469: checking for GTK configuration script" >&5
for possible in gtk12-config gtk14-config gtk-config
do
possible_version=`${possible} --version 2> /dev/null`
＠＠ -5469,18 +5487,18 ＠＠ fi
if test "${GTK_CONFIG}" != "no"; then
echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5473: checking gtk version" >&5
+echo "configure:5491: checking gtk version" >&5
GTK_VERSION=`${GTK_CONFIG} --version`
echo "$ac_t""${GTK_VERSION}" 1>&6
echo $ac_n "checking gtk libs""... $ac_c" 1>&6
-echo "configure:5478: checking gtk libs" >&5
+echo "configure:5496: checking gtk libs" >&5
GTK_LIBS=`${GTK_CONFIG} --libs`
libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
echo "$ac_t""${GTK_LIBS}" 1>&6
echo $ac_n "checking gtk cflags""... $ac_c" 1>&6
-echo "configure:5484: checking gtk cflags" >&5
+echo "configure:5502: checking gtk cflags" >&5
GTK_CFLAGS=`${GTK_CONFIG} --cflags`
if test "$GCC" = "yes"; then
GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
＠＠ -5490,19 +5508,19 ＠＠ echo "configure:5484: checking gtk cflag
echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5494: checking for main in -lgdk_imlib" >&5
+echo "configure:5512: checking for main in -lgdk_imlib" >&5
ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdk_imlib "
cat > conftest.$ac_ext <<EOF
-#line 5499 "configure"
+#line 5517 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5524,12 +5542,12 ＠＠ fi
echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5528: checking for Imlib_init in -lImlib" >&5
+echo "configure:5546: checking for Imlib_init in -lImlib" >&5
ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
xe_check_libs=" -lImlib "
cat > conftest.$ac_ext <<EOF
-#line 5533 "configure"
+#line 5551 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -5540,7 +5558,7 ＠＠ int main() {
Imlib_init()
; return 0; }
EOF
-if { (eval echo configure:5544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5563,10 +5581,10 ＠＠ fi
for ac_func in gdk_imlib_init
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5567: checking for $ac_func" >&5
+echo "configure:5585: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5570 "configure"
+#line 5588 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -5589,7 +5607,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:5593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -5673,15 +5691,15 ＠＠ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5677: checking for $ac_hdr" >&5
+echo "configure:5695: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5680 "configure"
+#line 5698 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -5712,19 +5730,19 ＠＠ done
echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5716: checking for main in -lxml" >&5
+echo "configure:5734: checking for main in -lxml" >&5
ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lxml "
cat > conftest.$ac_ext <<EOF
-#line 5721 "configure"
+#line 5739 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5746,19 +5764,19 ＠＠ fi
echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5750: checking for main in -lglade" >&5
+echo "configure:5768: checking for main in -lglade" >&5
ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lglade "
cat > conftest.$ac_ext <<EOF
-#line 5755 "configure"
+#line 5773 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5780,19 +5798,19 ＠＠ fi
echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5784: checking for main in -lglade-gnome" >&5
+echo "configure:5802: checking for main in -lglade-gnome" >&5
ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lglade-gnome "
cat > conftest.$ac_ext <<EOF
-#line 5789 "configure"
+#line 5807 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5813,7 +5831,7 ＠＠ fi
cat > conftest.$ac_ext <<EOF
-#line 5817 "configure"
+#line 5835 "configure"
#include "confdefs.h"
#include <glade/glade-xml.h>
EOF
＠＠ -5872,7 +5890,7 ＠＠ if test "$with_x11" != "no"; then
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:5876: checking for X" >&5
+echo "configure:5894: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
＠＠ -5932,12 +5950,12 ＠＠ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 5936 "configure"
+#line 5954 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -6006,14 +6024,14 ＠＠ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6010 "configure"
+#line 6028 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:6017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
＠＠ -6122,17 +6140,17 ＠＠ else
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:6126: checking whether -R must be followed by a space" >&5
+echo "configure:6144: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 6129 "configure"
+#line 6147 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:6136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
＠＠ -6148,14 +6166,14 ＠＠ rm -f conftest*
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 6152 "configure"
+#line 6170 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:6159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
＠＠ -6191,12 +6209,12 ＠＠ ac_cv_lib_dnet_dnet_ntoa=no
else
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:6195: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:6213: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldnet "
cat > conftest.$ac_ext <<EOF
-#line 6200 "configure"
+#line 6218 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6207,7 +6225,7 ＠＠ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:6211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6231,12 +6249,12 ＠＠ fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:6235: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:6253: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldnet_stub "
cat > conftest.$ac_ext <<EOF
-#line 6240 "configure"
+#line 6258 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6247,7 +6265,7 ＠＠ int main() {
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:6251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6276,10 +6294,10 ＠＠ fi
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey(a)clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:6280: checking for gethostbyname" >&5
+echo "configure:6298: checking for gethostbyname" >&5
cat > conftest.$ac_ext <<EOF
-#line 6283 "configure"
+#line 6301 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
＠＠ -6302,7 +6320,7 ＠＠ gethostbyname();
; return 0; }
EOF
-if { (eval echo configure:6306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
＠＠ -6323,12 +6341,12 ＠＠ fi
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6327: checking for gethostbyname in -lnsl" >&5
+echo "configure:6345: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
xe_check_libs=" -lnsl "
cat > conftest.$ac_ext <<EOF
-#line 6332 "configure"
+#line 6350 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6339,7 +6357,7 ＠＠ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:6343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6369,10 +6387,10 ＠＠ fi
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:6373: checking for connect" >&5
+echo "configure:6391: checking for connect" >&5
cat > conftest.$ac_ext <<EOF
-#line 6376 "configure"
+#line 6394 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
＠＠ -6395,7 +6413,7 ＠＠ connect();
; return 0; }
EOF
-if { (eval echo configure:6399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
＠＠ -6418,12 +6436,12 ＠＠ fi
xe_msg_checking="for connect in -lsocket"
test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6422: checking "$xe_msg_checking"" >&5
+echo "configure:6440: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
xe_check_libs=" -lsocket $X_EXTRA_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6427 "configure"
+#line 6445 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6434,7 +6452,7 ＠＠ int main() {
connect()
; return 0; }
EOF
-if { (eval echo configure:6438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6458,10 +6476,10 ＠＠ fi
# gomez(a)mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:6462: checking for remove" >&5
+echo "configure:6480: checking for remove" >&5
cat > conftest.$ac_ext <<EOF
-#line 6465 "configure"
+#line 6483 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
＠＠ -6484,7 +6502,7 ＠＠ remove();
; return 0; }
EOF
-if { (eval echo configure:6488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
＠＠ -6505,12 +6523,12 ＠＠ fi
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6509: checking for remove in -lposix" >&5
+echo "configure:6527: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
xe_check_libs=" -lposix "
cat > conftest.$ac_ext <<EOF
-#line 6514 "configure"
+#line 6532 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6521,7 +6539,7 ＠＠ int main() {
remove()
; return 0; }
EOF
-if { (eval echo configure:6525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6545,10 +6563,10 ＠＠ fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6549: checking for shmat" >&5
+echo "configure:6567: checking for shmat" >&5
cat > conftest.$ac_ext <<EOF
-#line 6552 "configure"
+#line 6570 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
＠＠ -6571,7 +6589,7 ＠＠ shmat();
; return 0; }
EOF
-if { (eval echo configure:6575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
＠＠ -6592,12 +6610,12 ＠＠ fi
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6596: checking for shmat in -lipc" >&5
+echo "configure:6614: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
xe_check_libs=" -lipc "
cat > conftest.$ac_ext <<EOF
-#line 6601 "configure"
+#line 6619 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6608,7 +6626,7 ＠＠ int main() {
shmat()
; return 0; }
EOF
-if { (eval echo configure:6612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6644,12 +6662,12 ＠＠ fi
xe_msg_checking="for IceConnectionNumber in -lICE"
test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6648: checking "$xe_msg_checking"" >&5
+echo "configure:6666: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
xe_check_libs=" -lICE $X_EXTRA_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6653 "configure"
+#line 6671 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6660,7 +6678,7 ＠＠ int main() {
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:6664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6706,15 +6724,15 ＠＠ EOF
ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:6710: checking for Xm/Xm.h" >&5
+echo "configure:6728: checking for Xm/Xm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6713 "configure"
+#line 6731 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -6731,12 +6749,12 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:6735: checking for XmStringFree in -lXm" >&5
+echo "configure:6753: checking for XmStringFree in -lXm" >&5
ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 6740 "configure"
+#line 6758 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6747,7 +6765,7 ＠＠ int main() {
XmStringFree()
; return 0; }
EOF
-if { (eval echo configure:6751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6899,7 +6917,7 ＠＠ EOF
echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6903: checking for X defines extracted by xmkmf" >&5
+echo "configure:6921: checking for X defines extracted by xmkmf" >&5
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
＠＠ -6948,15 +6966,15 ＠＠ EOF
ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6952: checking for X11/Intrinsic.h" >&5
+echo "configure:6970: checking for X11/Intrinsic.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6955 "configure"
+#line 6973 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -6980,12 +6998,12 ＠＠ fi
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6984: checking for XOpenDisplay in -lX11" >&5
+echo "configure:7002: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 6989 "configure"
+#line 7007 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6996,7 +7014,7 ＠＠ int main() {
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:7000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7021,12 +7039,12 ＠＠ fi
xe_msg_checking="for XGetFontProperty in -lX11"
test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7025: checking "$xe_msg_checking"" >&5
+echo "configure:7043: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 -b i486-linuxaout"
cat > conftest.$ac_ext <<EOF
-#line 7030 "configure"
+#line 7048 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7037,7 +7055,7 ＠＠ int main() {
XGetFontProperty()
; return 0; }
EOF
-if { (eval echo configure:7041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7064,12 +7082,12 ＠＠ fi
echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:7068: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:7086: checking for XShapeSelectInput in -lXext" >&5
ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXext "
cat > conftest.$ac_ext <<EOF
-#line 7073 "configure"
+#line 7091 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7080,7 +7098,7 ＠＠ int main() {
XShapeSelectInput()
; return 0; }
EOF
-if { (eval echo configure:7084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7103,12 +7121,12 ＠＠ fi
echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:7107: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:7125: checking for XtOpenDisplay in -lXt" >&5
ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXt "
cat > conftest.$ac_ext <<EOF
-#line 7112 "configure"
+#line 7130 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7119,7 +7137,7 ＠＠ int main() {
XtOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:7123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7142,14 +7160,14 ＠＠ fi
echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:7146: checking the version of X11 being used" >&5
+echo "configure:7164: checking the version of X11 being used" >&5
cat > conftest.$ac_ext <<EOF
-#line 7148 "configure"
+#line 7166 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
EOF
-if { (eval echo configure:7153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest foobar; x11_release=$?
else
＠＠ -7180,10 +7198,10 ＠＠ EOF
for ac_func in XConvertCase
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7184: checking for $ac_func" >&5
+echo "configure:7202: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 7187 "configure"
+#line 7205 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -7206,7 +7224,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:7210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -7238,15 +7256,15 ＠＠ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7242: checking for $ac_hdr" >&5
+echo "configure:7260: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7245 "configure"
+#line 7263 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7279,10 +7297,10 ＠＠ done
for ac_func in XRegisterIMInstantiateCallback
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7283: checking for $ac_func" >&5
+echo "configure:7301: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 7286 "configure"
+#line 7304 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -7305,7 +7323,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:7309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -7333,9 +7351,9 ＠＠ fi
done
echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:7337: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:7355: checking for standard XRegisterIMInstantiateCallback prototype" >&5
cat > conftest.$ac_ext <<EOF
-#line 7339 "configure"
+#line 7357 "configure"
#include "confdefs.h"
#define NeedFunctionPrototypes 1
＠＠ -7347,7 +7365,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:7351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
＠＠ -7368,12 +7386,12 ＠＠ rm -f conftest*
test -z "$with_xmu" && {
echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:7372: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:7390: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXmu "
cat > conftest.$ac_ext <<EOF
-#line 7377 "configure"
+#line 7395 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7384,7 +7402,7 ＠＠ int main() {
XmuReadBitmapDataFromFile()
; return 0; }
EOF
-if { (eval echo configure:7388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7423,19 +7441,19 ＠＠ EOF
echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7427: checking for main in -lXbsd" >&5
+echo "configure:7445: checking for main in -lXbsd" >&5
ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXbsd "
cat > conftest.$ac_ext <<EOF
-#line 7432 "configure"
+#line 7450 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7472,22 +7490,22 ＠＠ fi
fi
if test "$with_msw" != "no"; then
echo "checking for MS-Windows" 1>&6
-echo "configure:7476: checking for MS-Windows" >&5
+echo "configure:7494: checking for MS-Windows" >&5
echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7479: checking for main in -lgdi32" >&5
+echo "configure:7497: checking for main in -lgdi32" >&5
ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdi32 "
cat > conftest.$ac_ext <<EOF
-#line 7484 "configure"
+#line 7502 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7538,12 +7556,12 ＠＠ EOF
test "$with_widgets" != "no" && with_widgets=msw
fi
cat > conftest.$ac_ext <<EOF
-#line 7542 "configure"
+#line 7560 "configure"
#include "confdefs.h"
#include <fcntl.h>
int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
EOF
-if { (eval echo configure:7547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_MSG_SELECT
＠＠ -7604,15 +7622,15 ＠＠ fi
if test "$with_x11" = "yes"; then
ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:7608: checking for X11/extensions/shape.h" >&5
+echo "configure:7626: checking for X11/extensions/shape.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7611 "configure"
+#line 7629 "configure"
#include "confdefs.h"
#include <X11/extensions/shape.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7662,7 +7680,7 ＠＠ case "$x_libraries" in *X11R4* )
esac
echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7666: checking for WM_COMMAND option" >&5;
+echo "configure:7684: checking for WM_COMMAND option" >&5;
if test "$with_wmcommand" != "no"; then
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_WMCOMMAND
＠＠ -7677,15 +7695,15 ＠＠ fi
test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:7681: checking for X11/Xauth.h" >&5
+echo "configure:7699: checking for X11/Xauth.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7684 "configure"
+#line 7702 "configure"
#include "confdefs.h"
#include <X11/Xauth.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7708,12 +7726,12 ＠＠ fi
}
test -z "$with_xauth" && {
echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7712: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7730: checking for XauGetAuthByAddr in -lXau" >&5
ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXau "
cat > conftest.$ac_ext <<EOF
-#line 7717 "configure"
+#line 7735 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7724,7 +7742,7 ＠＠ int main() {
XauGetAuthByAddr()
; return 0; }
EOF
-if { (eval echo configure:7728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7775,7 +7793,7 ＠＠ fi
if test "$with_modules" != "no"; then
echo "checking for module support" 1>&6
-echo "configure:7779: checking for module support" >&5
+echo "configure:7797: checking for module support" >&5
case "$opsys" in
mingw* | cygwin* ) have_dl=yes ;;
＠＠ -7792,15 +7810,15 ＠＠ EOF
* )
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:7796: checking for dlfcn.h" >&5
+echo "configure:7814: checking for dlfcn.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7799 "configure"
+#line 7817 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7817,16 +7835,16 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:7821: checking for dlopen in -lc" >&5
+echo "configure:7839: checking for dlopen in -lc" >&5
cat > conftest.$ac_ext <<EOF
-#line 7823 "configure"
+#line 7841 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:7830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7835,18 +7853,18 ＠＠ else
rm -rf conftest*
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:7839: checking for dlopen in -ldl" >&5
+echo "configure:7857: checking for dlopen in -ldl" >&5
ac_save_LIBS="$LIBS"
LIBS="$LIBS -ldl"
cat > conftest.$ac_ext <<EOF
-#line 7843 "configure"
+#line 7861 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:7850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7855,17 +7873,17 ＠＠ else
rm -rf conftest*
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:7859: checking for dlopen in -lsvld" >&5
+echo "configure:7877: checking for dlopen in -lsvld" >&5
LIBS="$ac_save_LIBS -lsvld"
cat > conftest.$ac_ext <<EOF
-#line 7862 "configure"
+#line 7880 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:7869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7895,15 +7913,15 ＠＠ EOF
else
ac_safe=`echo "dl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dl.h""... $ac_c" 1>&6
-echo "configure:7899: checking for dl.h" >&5
+echo "configure:7917: checking for dl.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7902 "configure"
+#line 7920 "configure"
#include "confdefs.h"
#include <dl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7920,16 +7938,16 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for shl_load in -lc""... $ac_c" 1>&6
-echo "configure:7924: checking for shl_load in -lc" >&5
+echo "configure:7942: checking for shl_load in -lc" >&5
cat > conftest.$ac_ext <<EOF
-#line 7926 "configure"
+#line 7944 "configure"
#include "confdefs.h"
#include <dl.h>
int main() {
shl_load ("", 0, 0);
; return 0; }
EOF
-if { (eval echo configure:7933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7938,18 +7956,18 ＠＠ else
rm -rf conftest*
echo $ac_n "checking for shl_load in -ldl""... $ac_c" 1>&6
-echo "configure:7942: checking for shl_load in -ldl" >&5
+echo "configure:7960: checking for shl_load in -ldl" >&5
ac_save_LIBS="$LIBS"
LIBS="$LIBS -ldld"
cat > conftest.$ac_ext <<EOF
-#line 7946 "configure"
+#line 7964 "configure"
#include "confdefs.h"
#include <dl.h>
int main() {
shl_load ("", 0, 0);
; return 0; }
EOF
-if { (eval echo configure:7953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7977,15 +7995,15 ＠＠ EOF
else
ac_safe=`echo "ltdl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ltdl.h""... $ac_c" 1>&6
-echo "configure:7981: checking for ltdl.h" >&5
+echo "configure:7999: checking for ltdl.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7984 "configure"
+#line 8002 "configure"
#include "confdefs.h"
#include <ltdl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -8002,18 +8020,18 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6
-echo "configure:8006: checking for lt_dlinit in -lltdl" >&5
+echo "configure:8024: checking for lt_dlinit in -lltdl" >&5
ac_save_LIBS="$LIBS"
LIBS="$LIBS -lltdl"
cat > conftest.$ac_ext <<EOF
-#line 8010 "configure"
+#line 8028 "configure"
#include "confdefs.h"
#include <ltdl.h>
int main() {
lt_dlinit ();
; return 0; }
EOF
-if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -8054,7 +8072,7 ＠＠ xehost=$canonical
xealias=$internal_configuration
echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:8058: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:8076: checking how to build dynamic libraries for ${xehost}" >&5
# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
case "$xehost" in
*-*-linux-gnu*) ;;
＠＠ -8082,9 +8100,9 ＠＠ if test "$GCC" = "yes"; then
XEGCC=yes
else
echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:8086: checking checking whether we are using GNU C" >&5
+echo "configure:8104: checking checking whether we are using GNU C" >&5
cat > conftest.$ac_ext <<EOF
-#line 8088 "configure"
+#line 8106 "configure"
#include "confdefs.h"
#ifdef __GNUC__
＠＠ -8106,7 +8124,7 ＠＠ rm -f conftest*
fi
echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:8110: checking how to produce PIC code" >&5
+echo "configure:8128: checking how to produce PIC code" >&5
wl=
can_build_shared=yes
＠＠ -8210,18 +8228,18 ＠＠ if test -n "$dll_cflags"; then
# Check to make sure the dll_cflags actually works.
echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:8214: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:8232: checking if PIC flag ${dll_cflags} really works" >&5
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $dll_cflags -DPIC"
cat > conftest.$ac_ext <<EOF
-#line 8218 "configure"
+#line 8236 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:8225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
＠＠ -8252,7 +8270,7 ＠＠ cc_produces_so=no
xldf=
xcldf=
echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:8256: checking if C compiler can produce shared libraries" >&5
+echo "configure:8274: checking if C compiler can produce shared libraries" >&5
if test "$XEGCC" = yes -o "$__ICC" = yes; then
case "$xehost_os" in
*darwin*)
＠＠ -8311,14 +8329,14 ＠＠ if test -n "$xcldf"; then
xe_libs=
ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
cat > conftest.$ac_ext <<EOF
-#line 8315 "configure"
+#line 8333 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:8322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cc_produces_so=yes
else
＠＠ -8343,7 +8361,7 ＠＠ if test -z "$LTLD"; then
if test "$XEGCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:8347: checking for ld used by GCC" >&5
+echo "configure:8365: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
＠＠ -8369,7 +8387,7 ＠＠ echo "configure:8347: checking for ld us
esac
else
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:8373: checking for GNU ld" >&5
+echo "configure:8391: checking for GNU ld" >&5
fi
if test -z "$LTLD"; then
＠＠ -8407,7 +8425,7 ＠＠ ld_dynamic_link_flags=
# Check to see if it really is or isn't GNU ld.
echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:8411: checking if the linker is GNU ld" >&5
+echo "configure:8429: checking if the linker is GNU ld" >&5
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
xe_gnu_ld=yes
＠＠ -8442,7 +8460,7 ＠＠ else
# OK - only NOW do we futz about with ld.
# See if the linker supports building shared libraries.
echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:8446: checking whether the linker supports shared libraries" >&5
+echo "configure:8464: checking whether the linker supports shared libraries" >&5
dll_ld=$CC
dll_ldflags=$LDFLAGS
ld_shlibs=yes
＠＠ -8655,10 +8673,10 ＠＠ EOF
for ac_func in dlerror _dlerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8659: checking for $ac_func" >&5
+echo "configure:8677: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 8662 "configure"
+#line 8680 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -8681,7 +8699,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:8685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -8745,15 +8763,15 ＠＠ if test "$with_tooltalk" != "no" ; then
for dir in "" "Tt/" "desktop/" ; do
ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:8749: checking for ${dir}tt_c.h" >&5
+echo "configure:8767: checking for ${dir}tt_c.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8752 "configure"
+#line 8770 "configure"
#include "confdefs.h"
#include <${dir}tt_c.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -8789,12 +8807,12 ＠＠ if test "$with_tooltalk" != "no" ; then
xe_msg_checking="for tt_message_create in -ltt"
test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:8793: checking "$xe_msg_checking"" >&5
+echo "configure:8811: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltt $extra_libs"
cat > conftest.$ac_ext <<EOF
-#line 8798 "configure"
+#line 8816 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -8805,7 +8823,7 ＠＠ int main() {
tt_message_create()
; return 0; }
EOF
-if { (eval echo configure:8809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -8859,15 +8877,15 ＠＠ fi
test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:8863: checking for Dt/Dt.h" >&5
+echo "configure:8881: checking for Dt/Dt.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8866 "configure"
+#line 8884 "configure"
#include "confdefs.h"
#include <Dt/Dt.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -8890,12 +8908,12 ＠＠ fi
}
test -z "$with_cde" && {
echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:8894: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:8912: checking for DtDndDragStart in -lDtSvc" >&5
ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
xe_check_libs=" -lDtSvc "
cat > conftest.$ac_ext <<EOF
-#line 8899 "configure"
+#line 8917 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -8906,7 +8924,7 ＠＠ int main() {
DtDndDragStart()
; return 0; }
EOF
-if { (eval echo configure:8910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -8987,7 +9005,7 ＠＠ fi
if test "$with_dragndrop" != "no" ; then
echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:8991: checking if drag and drop API is needed" >&5
+echo "configure:9009: checking if drag and drop API is needed" >&5
if test -n "$dragndrop_proto" ; then
with_dragndrop=yes
echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
＠＠ -9007,19 +9025,19 ＠＠ EOF
fi
echo "checking for LDAP" 1>&6
-echo "configure:9011: checking for LDAP" >&5
+echo "configure:9029: checking for LDAP" >&5
ldap_libs=
test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:9015: checking for ldap.h" >&5
+echo "configure:9033: checking for ldap.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9018 "configure"
+#line 9036 "configure"
#include "confdefs.h"
#include <ldap.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9042,15 +9060,15 ＠＠ fi
}
test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:9046: checking for lber.h" >&5
+echo "configure:9064: checking for lber.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9049 "configure"
+#line 9067 "configure"
#include "confdefs.h"
#include <lber.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9074,12 +9092,12 ＠＠ fi
if test "$with_ldap" != "no"; then
echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:9078: checking for ldap_search in -lldap" >&5
+echo "configure:9096: checking for ldap_search in -lldap" >&5
ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap "
cat > conftest.$ac_ext <<EOF
-#line 9083 "configure"
+#line 9101 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9090,7 +9108,7 ＠＠ int main() {
ldap_search()
; return 0; }
EOF
-if { (eval echo configure:9094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9114,12 +9132,12 ＠＠ fi
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:9118: checking "$xe_msg_checking"" >&5
+echo "configure:9136: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber"
cat > conftest.$ac_ext <<EOF
-#line 9123 "configure"
+#line 9141 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9130,7 +9148,7 ＠＠ int main() {
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:9134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9154,12 +9172,12 ＠＠ fi
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:9158: checking "$xe_msg_checking"" >&5
+echo "configure:9176: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber -lkrb"
cat > conftest.$ac_ext <<EOF
-#line 9163 "configure"
+#line 9181 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9170,7 +9188,7 ＠＠ int main() {
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:9174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9194,12 +9212,12 ＠＠ fi
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:9198: checking "$xe_msg_checking"" >&5
+echo "configure:9216: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber -lkrb -ldes"
cat > conftest.$ac_ext <<EOF
-#line 9203 "configure"
+#line 9221 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9210,7 +9228,7 ＠＠ int main() {
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:9214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9232,12 +9250,12 ＠＠ fi
}
test "$with_ldap_lber" != "yes" && {
echo $ac_n "checking for ber_pvt_opt_on in -llber""... $ac_c" 1>&6
-echo "configure:9236: checking for ber_pvt_opt_on in -llber" >&5
+echo "configure:9254: checking for ber_pvt_opt_on in -llber" >&5
ac_lib_var=`echo lber'_'ber_pvt_opt_on | sed 'y%./+-%__p_%'`
xe_check_libs=" -llber "
cat > conftest.$ac_ext <<EOF
-#line 9241 "configure"
+#line 9259 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9248,7 +9266,7 ＠＠ int main() {
ber_pvt_opt_on()
; return 0; }
EOF
-if { (eval echo configure:9252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9292,10 +9310,10 ＠＠ EOF
for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9296: checking for $ac_func" >&5
+echo "configure:9314: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 9299 "configure"
+#line 9317 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -9318,7 +9336,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:9322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -9357,20 +9375,20 ＠＠ fi
postgresql_libs=
if test "$with_postgresql" != "no"; then
echo "checking for PostgreSQL" 1>&6
-echo "configure:9361: checking for PostgreSQL" >&5
+echo "configure:9379: checking for PostgreSQL" >&5
for header_dir in "" "pgsql/" "postgresql/"; do
ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
-echo "configure:9366: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:9384: checking for ${header_dir}libpq-fe.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9369 "configure"
+#line 9387 "configure"
#include "confdefs.h"
#include <${header_dir}libpq-fe.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9394,12 +9412,12 ＠＠ fi
test -n "$libpq_fe_h_file" && {
echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:9398: checking for PQconnectdb in -lpq" >&5
+echo "configure:9416: checking for PQconnectdb in -lpq" >&5
ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpq "
cat > conftest.$ac_ext <<EOF
-#line 9403 "configure"
+#line 9421 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9410,7 +9428,7 ＠＠ int main() {
PQconnectdb()
; return 0; }
EOF
-if { (eval echo configure:9414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9443,12 +9461,12 ＠＠ EOF
echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:9447: checking for PQconnectStart in -lpq" >&5
+echo "configure:9465: checking for PQconnectStart in -lpq" >&5
ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpq "
cat > conftest.$ac_ext <<EOF
-#line 9452 "configure"
+#line 9470 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9459,7 +9477,7 ＠＠ int main() {
PQconnectStart()
; return 0; }
EOF
-if { (eval echo configure:9463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9510,7 +9528,7 ＠＠ fi
if test "$window_system" != "none"; then
echo "checking for graphics libraries" 1>&6
-echo "configure:9514: checking for graphics libraries" >&5
+echo "configure:9532: checking for graphics libraries" >&5
libpath_xpm=
incpath_xpm=
＠＠ -9536,10 +9554,10 ＠＠ echo "configure:9514: checking for graph
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:9540: checking for Xpm - no older than 3.4f" >&5
+echo "configure:9558: checking for Xpm - no older than 3.4f" >&5
xe_check_libs=-lXpm
cat > conftest.$ac_ext <<EOF
-#line 9543 "configure"
+#line 9561 "configure"
#include "confdefs.h"
#define XPM_NUMBERS
#include <X11/xpm.h>
＠＠ -9548,7 +9566,7 ＠＠ echo "configure:9540: checking for Xpm -
XpmIncludeVersion != XpmLibraryVersion() ? 1 :
XpmIncludeVersion < 30406 ? 2 : 0 ;}
EOF
-if { (eval echo configure:9552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest dummy_arg; xpm_status=$?;
if test "$xpm_status" = "0"; then
＠＠ -9592,17 +9610,17 ＠＠ EOF
libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:9596: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:9614: checking for \"FOR_MSW\" xpm" >&5
xe_check_libs=-lXpm
cat > conftest.$ac_ext <<EOF
-#line 9599 "configure"
+#line 9617 "configure"
#include "confdefs.h"
int main() {
XpmCreatePixmapFromData()
; return 0; }
EOF
-if { (eval echo configure:9606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xpm_for_msw=no
else
＠＠ -9628,15 +9646,15 ＠＠ EOF
test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:9632: checking for compface.h" >&5
+echo "configure:9650: checking for compface.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9635 "configure"
+#line 9653 "configure"
#include "confdefs.h"
#include <compface.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9659,12 +9677,12 ＠＠ fi
}
test -z "$with_xface" && {
echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9663: checking for UnGenFace in -lcompface" >&5
+echo "configure:9681: checking for UnGenFace in -lcompface" >&5
ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcompface "
cat > conftest.$ac_ext <<EOF
-#line 9668 "configure"
+#line 9686 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9675,7 +9693,7 ＠＠ int main() {
UnGenFace()
; return 0; }
EOF
-if { (eval echo configure:9679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9724,12 +9742,12 ＠＠ EOF
if test "$with_png $with_tiff" != "no no"; then
echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:9728: checking for inflate in -lc" >&5
+echo "configure:9746: checking for inflate in -lc" >&5
ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lc "
cat > conftest.$ac_ext <<EOF
-#line 9733 "configure"
+#line 9751 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9740,7 +9758,7 ＠＠ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:9744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9759,12 +9777,12 ＠＠ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:9763: checking for inflate in -lz" >&5
+echo "configure:9781: checking for inflate in -lz" >&5
ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lz "
cat > conftest.$ac_ext <<EOF
-#line 9768 "configure"
+#line 9786 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9775,7 +9793,7 ＠＠ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:9779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9794,12 +9812,12 ＠＠ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:9798: checking for inflate in -lgz" >&5
+echo "configure:9816: checking for inflate in -lgz" >&5
ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgz "
cat > conftest.$ac_ext <<EOF
-#line 9803 "configure"
+#line 9821 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9810,7 +9828,7 ＠＠ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:9814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9840,15 +9858,15 ＠＠ fi
test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:9844: checking for jpeglib.h" >&5
+echo "configure:9862: checking for jpeglib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9847 "configure"
+#line 9865 "configure"
#include "confdefs.h"
#include <jpeglib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9871,12 +9889,12 ＠＠ fi
}
test -z "$with_jpeg" && {
echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:9875: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:9893: checking for jpeg_destroy_decompress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
xe_check_libs=" -ljpeg "
cat > conftest.$ac_ext <<EOF
-#line 9880 "configure"
+#line 9898 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9887,7 +9905,7 ＠＠ int main() {
jpeg_destroy_decompress()
; return 0; }
EOF
-if { (eval echo configure:9891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9923,10 +9941,10 ＠＠ EOF
png_problem=""
test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:9927: checking for pow" >&5
+echo "configure:9945: checking for pow" >&5
cat > conftest.$ac_ext <<EOF
-#line 9930 "configure"
+#line 9948 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pow(); below. */
＠＠ -9949,7 +9967,7 ＠＠ pow();
; return 0; }
EOF
-if { (eval echo configure:9953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pow=yes"
else
＠＠ -9970,15 +9988,15 ＠＠ fi
}
test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:9974: checking for png.h" >&5
+echo "configure:9992: checking for png.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9977 "configure"
+#line 9995 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10001,12 +10019,12 ＠＠ fi
}
test -z "$with_png" && {
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:10005: checking for png_read_image in -lpng" >&5
+echo "configure:10023: checking for png_read_image in -lpng" >&5
ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpng "
cat > conftest.$ac_ext <<EOF
-#line 10010 "configure"
+#line 10028 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10017,7 +10035,7 ＠＠ int main() {
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:10021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10040,10 +10058,10 ＠＠ fi
}
if test -z "$with_png"; then
echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:10044: checking for workable png version information" >&5
+echo "configure:10062: checking for workable png version information" >&5
xe_check_libs="-lpng -lz"
cat > conftest.$ac_ext <<EOF
-#line 10047 "configure"
+#line 10065 "configure"
#include "confdefs.h"
#include <png.h>
int main(int c, char **v) {
＠＠ -10051,7 +10069,7 ＠＠ echo "configure:10044: checking for work
if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
EOF
-if { (eval echo configure:10055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest dummy_arg; png_status=$?;
if test "$png_status" = "0"; then
＠＠ -10094,15 +10112,15 ＠＠ EOF
test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:10098: checking for tiffio.h" >&5
+echo "configure:10116: checking for tiffio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10101 "configure"
+#line 10119 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10125,12 +10143,12 ＠＠ fi
}
test -z "$with_tiff" && {
echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:10129: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:10147: checking for TIFFClientOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltiff "
cat > conftest.$ac_ext <<EOF
-#line 10134 "configure"
+#line 10152 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10141,7 +10159,7 ＠＠ int main() {
TIFFClientOpen()
; return 0; }
EOF
-if { (eval echo configure:10145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10180,15 +10198,15 ＠＠ fi
if test "$with_gtk" = "yes"; then
test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:10184: checking for compface.h" >&5
+echo "configure:10202: checking for compface.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10187 "configure"
+#line 10205 "configure"
#include "confdefs.h"
#include <compface.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10211,12 +10229,12 ＠＠ fi
}
test -z "$with_xface" && {
echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:10215: checking for UnGenFace in -lcompface" >&5
+echo "configure:10233: checking for UnGenFace in -lcompface" >&5
ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcompface "
cat > conftest.$ac_ext <<EOF
-#line 10220 "configure"
+#line 10238 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10227,7 +10245,7 ＠＠ int main() {
UnGenFace()
; return 0; }
EOF
-if { (eval echo configure:10231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10266,7 +10284,7 ＠＠ fi
if test "$with_x11" = "yes"; then
echo "checking for X11 graphics libraries" 1>&6
-echo "configure:10270: checking for X11 graphics libraries" >&5
+echo "configure:10288: checking for X11 graphics libraries" >&5
fi
case "$with_widgets" in
＠＠ -10276,7 +10294,7 ＠＠ esac
if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
echo "checking for the Athena widgets" 1>&6
-echo "configure:10280: checking for the Athena widgets" >&5
+echo "configure:10298: checking for the Athena widgets" >&5
case "$with_athena" in
"xaw" | "") athena_variant=Xaw athena_3d=no ;;
＠＠ -10290,12 +10308,12 ＠＠ echo "configure:10280: checking for the
if test "$athena_3d" = "no"; then
echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:10294: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:10312: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 10299 "configure"
+#line 10317 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10306,7 +10324,7 ＠＠ int main() {
XawScrollbarSetThumb()
; return 0; }
EOF
-if { (eval echo configure:10310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10322,12 +10340,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:10326: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:10344: checking for threeDClassRec in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 10331 "configure"
+#line 10349 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10338,7 +10356,7 ＠＠ int main() {
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:10342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10369,12 +10387,12 ＠＠ fi
else
echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:10373: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:10391: checking for threeDClassRec in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 10378 "configure"
+#line 10396 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10385,7 +10403,7 ＠＠ int main() {
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:10389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10403,12 +10421,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:10407: checking for threeDClassRec in -lXaw" >&5
+echo "configure:10425: checking for threeDClassRec in -lXaw" >&5
ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXaw "
cat > conftest.$ac_ext <<EOF
-#line 10412 "configure"
+#line 10430 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10419,7 +10437,7 ＠＠ int main() {
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:10423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10450,15 +10468,15 ＠＠ fi
if test "$athena_3d" = "no"; then
ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10454: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:10472: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10457 "configure"
+#line 10475 "configure"
#include "confdefs.h"
#include <X11/Xaw/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10478,15 +10496,15 ＠＠ else
echo "$ac_t""no" 1>&6
ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:10482: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:10500: checking for X11/Xaw/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10485 "configure"
+#line 10503 "configure"
#include "confdefs.h"
#include <X11/Xaw/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10512,15 +10530,15 ＠＠ fi
else
ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:10516: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:10534: checking for X11/$athena_variant/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10519 "configure"
+#line 10537 "configure"
#include "confdefs.h"
#include <X11/$athena_variant/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10537,15 +10555,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10541: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:10559: checking for X11/$athena_variant/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10544 "configure"
+#line 10562 "configure"
#include "confdefs.h"
#include <X11/$athena_variant/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10573,15 +10591,15 ＠＠ fi
if test -z "$athena_h_path"; then
ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:10577: checking for $athena_variant/XawInit.h" >&5
+echo "configure:10595: checking for $athena_variant/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10580 "configure"
+#line 10598 "configure"
#include "confdefs.h"
#include <$athena_variant/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10598,15 +10616,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10602: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:10620: checking for $athena_variant/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10605 "configure"
+#line 10623 "configure"
#include "confdefs.h"
#include <$athena_variant/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10635,15 +10653,15 ＠＠ fi
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:10639: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:10657: checking for X11/Xaw3d/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10642 "configure"
+#line 10660 "configure"
#include "confdefs.h"
#include <X11/Xaw3d/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10660,15 +10678,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10664: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:10682: checking for X11/Xaw3d/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10667 "configure"
+#line 10685 "configure"
#include "confdefs.h"
#include <X11/Xaw3d/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10700,15 +10718,15 ＠＠ fi
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:10704: checking for Xaw3d/XawInit.h" >&5
+echo "configure:10722: checking for Xaw3d/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10707 "configure"
+#line 10725 "configure"
#include "confdefs.h"
#include <Xaw3d/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10725,15 +10743,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10729: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:10747: checking for Xaw3d/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10732 "configure"
+#line 10750 "configure"
#include "confdefs.h"
#include <Xaw3d/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10765,15 +10783,15 ＠＠ fi
if test -z "$athena_h_path"; then
ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10769: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:10787: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10772 "configure"
+#line 10790 "configure"
#include "confdefs.h"
#include <X11/Xaw/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10812,15 +10830,15 ＠＠ fi
if test "$with_x11" = "yes"; then
ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:10816: checking for Xm/Xm.h" >&5
+echo "configure:10834: checking for Xm/Xm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10819 "configure"
+#line 10837 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10837,12 +10855,12 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:10841: checking for XmStringFree in -lXm" >&5
+echo "configure:10859: checking for XmStringFree in -lXm" >&5
ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 10846 "configure"
+#line 10864 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10853,7 +10871,7 ＠＠ int main() {
XmStringFree()
; return 0; }
EOF
-if { (eval echo configure:10857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10882,9 +10900,9 ＠＠ fi
if test "$have_motif" = "yes"; then
echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:10886: checking for Lesstif" >&5
+echo "configure:10904: checking for Lesstif" >&5
cat > conftest.$ac_ext <<EOF
-#line 10888 "configure"
+#line 10906 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
#ifdef LESSTIF_VERSION
＠＠ -11257,7 +11275,7 ＠＠ fi
if test "$with_mule" = "yes" ; then
echo "checking for Mule-related features" 1>&6
-echo "configure:11261: checking for Mule-related features" >&5
+echo "configure:11279: checking for Mule-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining MULE
EOF
＠＠ -11271,15 +11289,15 ＠＠ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11275: checking for $ac_hdr" >&5
+echo "configure:11293: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11278 "configure"
+#line 11296 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11310,12 +11328,12 ＠＠ done
echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:11314: checking for strerror in -lintl" >&5
+echo "configure:11332: checking for strerror in -lintl" >&5
ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
xe_check_libs=" -lintl "
cat > conftest.$ac_ext <<EOF
-#line 11319 "configure"
+#line 11337 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11326,7 +11344,7 ＠＠ int main() {
strerror()
; return 0; }
EOF
-if { (eval echo configure:11330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11359,18 +11377,18 ＠＠ fi
echo "checking for Mule input methods" 1>&6
-echo "configure:11363: checking for Mule input methods" >&5
+echo "configure:11381: checking for Mule input methods" >&5
case "$with_xim" in "" | "yes" )
echo "checking for XIM" 1>&6
-echo "configure:11366: checking for XIM" >&5
+echo "configure:11384: checking for XIM" >&5
echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:11369: checking for XOpenIM in -lX11" >&5
+echo "configure:11387: checking for XOpenIM in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 11374 "configure"
+#line 11392 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11381,7 +11399,7 ＠＠ int main() {
XOpenIM()
; return 0; }
EOF
-if { (eval echo configure:11385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11405,12 +11423,12 ＠＠ fi
if test "$have_motif $have_lesstif" = "yes no"; then
echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:11409: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:11427: checking for XmImMbLookupString in -lXm" >&5
ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 11414 "configure"
+#line 11432 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11421,7 +11439,7 ＠＠ int main() {
XmImMbLookupString()
; return 0; }
EOF
-if { (eval echo configure:11425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11486,15 +11504,15 ＠＠ EOF
if test "$with_xfs" = "yes" ; then
echo "checking for XFontSet" 1>&6
-echo "configure:11490: checking for XFontSet" >&5
+echo "configure:11508: checking for XFontSet" >&5
echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:11493: checking for XmbDrawString in -lX11" >&5
+echo "configure:11511: checking for XmbDrawString in -lX11" >&5
ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 11498 "configure"
+#line 11516 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11505,7 +11523,7 ＠＠ int main() {
XmbDrawString()
; return 0; }
EOF
-if { (eval echo configure:11509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11545,15 +11563,15 ＠＠ EOF
test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:11549: checking for wnn/jllib.h" >&5
+echo "configure:11567: checking for wnn/jllib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11552 "configure"
+#line 11570 "configure"
#include "confdefs.h"
#include <wnn/jllib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11576,15 +11594,15 ＠＠ fi
}
test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6
-echo "configure:11580: checking for wnn/commonhd.h" >&5
+echo "configure:11598: checking for wnn/commonhd.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11583 "configure"
+#line 11601 "configure"
#include "confdefs.h"
#include <wnn/commonhd.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11609,10 +11627,10 ＠＠ fi
for ac_func in crypt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11613: checking for $ac_func" >&5
+echo "configure:11631: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 11616 "configure"
+#line 11634 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -11635,7 +11653,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:11639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -11664,12 +11682,12 ＠＠ done
test "$ac_cv_func_crypt" != "yes" && {
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:11668: checking for crypt in -lcrypt" >&5
+echo "configure:11686: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcrypt "
cat > conftest.$ac_ext <<EOF
-#line 11673 "configure"
+#line 11691 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11680,7 +11698,7 ＠＠ int main() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:11684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11715,12 +11733,12 ＠＠ fi
if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:11719: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:11737: checking for jl_dic_list_e in -lwnn" >&5
ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn "
cat > conftest.$ac_ext <<EOF
-#line 11724 "configure"
+#line 11742 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11731,7 +11749,7 ＠＠ int main() {
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11749,12 +11767,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:11753: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:11771: checking for jl_dic_list_e in -lwnn4" >&5
ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn4 "
cat > conftest.$ac_ext <<EOF
-#line 11758 "configure"
+#line 11776 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11765,7 +11783,7 ＠＠ int main() {
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11783,12 +11801,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:11787: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:11805: checking for jl_dic_list_e in -lwnn6" >&5
ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn6 "
cat > conftest.$ac_ext <<EOF
-#line 11792 "configure"
+#line 11810 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11799,7 +11817,7 ＠＠ int main() {
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11817,12 +11835,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:11821: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:11839: checking for dic_list_e in -lwnn6_fromsrc" >&5
ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn6_fromsrc "
cat > conftest.$ac_ext <<EOF
-#line 11826 "configure"
+#line 11844 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11833,7 +11851,7 ＠＠ int main() {
dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11878,12 +11896,12 ＠＠ EOF
if test "$with_wnn6" != "no"; then
echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:11882: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:11900: checking for jl_fi_dic_list in -l$libwnn" >&5
ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$libwnn "
cat > conftest.$ac_ext <<EOF
-#line 11887 "configure"
+#line 11905 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11894,7 +11912,7 ＠＠ int main() {
jl_fi_dic_list()
; return 0; }
EOF
-if { (eval echo configure:11898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11929,15 +11947,15 ＠＠ EOF
if test "$with_canna" != "no"; then
ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:11933: checking for canna/jrkanji.h" >&5
+echo "configure:11951: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11936 "configure"
+#line 11954 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11964,15 +11982,15 ＠＠ fi
c_switch_site="$c_switch_site -I/usr/local/canna/include"
ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:11968: checking for canna/jrkanji.h" >&5
+echo "configure:11986: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11971 "configure"
+#line 11989 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12000,15 +12018,15 ＠＠ fi
test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:12004: checking for canna/RK.h" >&5
+echo "configure:12022: checking for canna/RK.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12007 "configure"
+#line 12025 "configure"
#include "confdefs.h"
#include <canna/RK.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12031,12 +12049,12 ＠＠ fi
}
test -z "$with_canna" && {
echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:12035: checking for RkBgnBun in -lRKC" >&5
+echo "configure:12053: checking for RkBgnBun in -lRKC" >&5
ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
xe_check_libs=" -lRKC "
cat > conftest.$ac_ext <<EOF
-#line 12040 "configure"
+#line 12058 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12047,7 +12065,7 ＠＠ int main() {
RkBgnBun()
; return 0; }
EOF
-if { (eval echo configure:12051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12070,12 +12088,12 ＠＠ fi
}
test -z "$with_canna" && {
echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:12074: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:12092: checking for jrKanjiControl in -lcanna" >&5
ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcanna "
cat > conftest.$ac_ext <<EOF
-#line 12079 "configure"
+#line 12097 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12086,7 +12104,7 ＠＠ int main() {
jrKanjiControl()
; return 0; }
EOF
-if { (eval echo configure:12090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12132,12 +12150,12 ＠＠ if test "$need_motif" = "yes" ; then
libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi
echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:12136: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:12154: checking for layout_object_getvalue in -li18n" >&5
ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
xe_check_libs=" -li18n "
cat > conftest.$ac_ext <<EOF
-#line 12141 "configure"
+#line 12159 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12148,7 +12166,7 ＠＠ int main() {
layout_object_getvalue()
; return 0; }
EOF
-if { (eval echo configure:12152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12235,10 +12253,10 ＠＠ 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
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12239: checking for $ac_func" >&5
+echo "configure:12257: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12242 "configure"
+#line 12260 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12261,7 +12279,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:12265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12302,10 +12320,10 ＠＠ fi
for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12306: checking for $ac_func" >&5
+echo "configure:12324: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12309 "configure"
+#line 12327 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12328,7 +12346,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:12332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12357,10 +12375,10 ＠＠ done
echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:12361: checking for openpty" >&5
+echo "configure:12379: checking for openpty" >&5
cat > conftest.$ac_ext <<EOF
-#line 12364 "configure"
+#line 12382 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char openpty(); below. */
＠＠ -12383,7 +12401,7 ＠＠ openpty();
; return 0; }
EOF
-if { (eval echo configure:12387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_openpty=yes"
else
＠＠ -12402,12 +12420,12 ＠＠ else
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:12406: checking for openpty in -lutil" >&5
+echo "configure:12424: checking for openpty in -lutil" >&5
ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
xe_check_libs=" -lutil "
cat > conftest.$ac_ext <<EOF
-#line 12411 "configure"
+#line 12429 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12418,7 +12436,7 ＠＠ int main() {
openpty()
; return 0; }
EOF
-if { (eval echo configure:12422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12453,15 +12471,15 ＠＠ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12457: checking for $ac_hdr" >&5
+echo "configure:12475: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12460 "configure"
+#line 12478 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12498,15 +12516,15 ＠＠ case "$opsys" in
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12502: checking for $ac_hdr" >&5
+echo "configure:12520: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12505 "configure"
+#line 12523 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12539,15 +12557,15 ＠＠ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12543: checking for $ac_hdr" >&5
+echo "configure:12561: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12546 "configure"
+#line 12564 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12580,15 +12598,15 ＠＠ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12584: checking for $ac_hdr" >&5
+echo "configure:12602: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12587 "configure"
+#line 12605 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12624,15 +12642,15 ＠＠ for ac_hdr in stropts.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12628: checking for $ac_hdr" >&5
+echo "configure:12646: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12631 "configure"
+#line 12649 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12665,10 +12683,10 ＠＠ if test "$ac_cv_header_stropts_h" = "yes
for ac_func in isastream
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12669: checking for $ac_func" >&5
+echo "configure:12687: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12672 "configure"
+#line 12690 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12691,7 +12709,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:12695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12722,15 +12740,15 ＠＠ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12726: checking for $ac_hdr" >&5
+echo "configure:12744: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12729 "configure"
+#line 12747 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12763,10 +12781,10 ＠＠ done
for ac_func in getloadavg
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12767: checking for $ac_func" >&5
+echo "configure:12785: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12770 "configure"
+#line 12788 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12789,7 +12807,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:12793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12822,15 +12840,15 ＠＠ if test "$ac_cv_func_getloadavg" = "yes"
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12826: checking for $ac_hdr" >&5
+echo "configure:12844: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12829 "configure"
+#line 12847 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12866,12 +12884,12 ＠＠ else
echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:12870: checking for kstat_open in -lkstat" >&5
+echo "configure:12888: checking for kstat_open in -lkstat" >&5
ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lkstat "
cat > conftest.$ac_ext <<EOF
-#line 12875 "configure"
+#line 12893 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12882,7 +12900,7 ＠＠ int main() {
kstat_open()
; return 0; }
EOF
-if { (eval echo configure:12886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12917,15 +12935,15 ＠＠ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12921: checking for $ac_hdr" >&5
+echo "configure:12939: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12924 "configure"
+#line 12942 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12957,12 +12975,12 ＠＠ done
echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:12961: checking for kvm_read in -lkvm" >&5
+echo "configure:12979: checking for kvm_read in -lkvm" >&5
ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
xe_check_libs=" -lkvm "
cat > conftest.$ac_ext <<EOF
-#line 12966 "configure"
+#line 12984 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12973,7 +12991,7 ＠＠ int main() {
kvm_read()
; return 0; }
EOF
-if { (eval echo configure:12977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -13007,16 +13025,16 ＠＠ fi
fi
echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:13011: checking whether netdb declares h_errno" >&5
+echo "configure:13029: checking whether netdb declares h_errno" >&5
cat > conftest.$ac_ext <<EOF
-#line 13013 "configure"
+#line 13031 "configure"
#include "confdefs.h"
#include <netdb.h>
int main() {
return h_errno;
; return 0; }
EOF
-if { (eval echo configure:13020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -13036,16 +13054,16 ＠＠ fi
rm -f conftest*
echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:13040: checking for sigsetjmp" >&5
+echo "configure:13058: checking for sigsetjmp" >&5
cat > conftest.$ac_ext <<EOF
-#line 13042 "configure"
+#line 13060 "configure"
#include "confdefs.h"
#include <setjmp.h>
int main() {
sigjmp_buf bar; sigsetjmp (bar, 0);
; return 0; }
EOF
-if { (eval echo configure:13049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -13065,11 +13083,11 ＠＠ fi
rm -f conftest*
echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:13069: checking whether localtime caches TZ" >&5
+echo "configure:13087: checking whether localtime caches TZ" >&5
if test "$ac_cv_func_tzset" = "yes"; then
cat > conftest.$ac_ext <<EOF
-#line 13073 "configure"
+#line 13091 "configure"
#include "confdefs.h"
#include <time.h>
#if STDC_HEADERS
＠＠ -13104,7 +13122,7 ＠＠ main()
exit (0);
}
EOF
-if { (eval echo configure:13108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
emacs_cv_localtime_cache=no
else
＠＠ -13134,9 +13152,9 ＠＠ fi
if test "$HAVE_TIMEVAL" = "yes"; then
echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:13138: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:13156: checking whether gettimeofday accepts one or two arguments" >&5
cat > conftest.$ac_ext <<EOF
-#line 13140 "configure"
+#line 13158 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
＠＠ -13157,7 +13175,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:13161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""two" 1>&6
else
＠＠ -13179,19 +13197,19 ＠＠ fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:13183: checking for inline" >&5
+echo "configure:13201: checking for inline" >&5
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 13188 "configure"
+#line 13206 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:13195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
＠＠ -13228,16 +13246,16 ＠＠ test "$ac_cv_c_inline" != "no" -a "$GCC"
fi
echo $ac_n "checking for typeof""... $ac_c" 1>&6
-echo "configure:13232: checking for typeof" >&5
+echo "configure:13250: checking for typeof" >&5
cat > conftest.$ac_ext <<EOF
-#line 13234 "configure"
+#line 13252 "configure"
#include "confdefs.h"
int main() {
int i; __typeof__(i) j;
; return 0; }
EOF
-if { (eval echo configure:13241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
typeofname="__typeof__"
else
＠＠ -13245,14 +13263,14 ＠＠ else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 13249 "configure"
+#line 13267 "configure"
#include "confdefs.h"
int main() {
int i; typeof(i) j;
; return 0; }
EOF
-if { (eval echo configure:13256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
typeofname="typeof"
else
＠＠ -13281,17 +13299,17 ＠＠ if test "$__DECC" != "yes"; then
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:13285: checking for working alloca.h" >&5
+echo "configure:13303: checking for working alloca.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13288 "configure"
+#line 13306 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:13295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
＠＠ -13315,10 +13333,10 ＠＠ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:13319: checking for alloca" >&5
+echo "configure:13337: checking for alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 13322 "configure"
+#line 13340 "configure"
#include "confdefs.h"
#ifdef __GNUC__
＠＠ -13346,7 +13364,7 ＠＠ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:13350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
＠＠ -13385,10 +13403,10 ＠＠ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:13389: checking whether alloca needs Cray hooks" >&5
+echo "configure:13407: checking whether alloca needs Cray hooks" >&5
cat > conftest.$ac_ext <<EOF
-#line 13392 "configure"
+#line 13410 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
＠＠ -13412,10 +13430,10 ＠＠ echo "$ac_t""$ac_cv_os_cray" 1>&6
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13416: checking for $ac_func" >&5
+echo "configure:13434: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 13419 "configure"
+#line 13437 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -13438,7 +13456,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:13442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -13468,10 +13486,10 ＠＠ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:13472: checking stack direction for C alloca" >&5
+echo "configure:13490: checking stack direction for C alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 13475 "configure"
+#line 13493 "configure"
#include "confdefs.h"
find_stack_direction ()
{
＠＠ -13490,7 +13508,7 ＠＠ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:13494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_c_stack_direction=1
else
＠＠ -13519,9 +13537,9 ＠＠ fi
fi
echo $ac_n "checking for working alloca in function calls""... $ac_c" 1>&6
-echo "configure:13523: checking for working alloca in function calls" >&5
+echo "configure:13541: checking for working alloca in function calls" >&5
cat > conftest.$ac_ext <<EOF
-#line 13525 "configure"
+#line 13543 "configure"
#include "confdefs.h"
#if defined (__CYGWIN__)
＠＠ -13574,7 +13592,7 ＠＠ main (int argc, char *argv[])
}
EOF
-if { (eval echo configure:13578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
working_alloca_in_function_calls=yes
else
＠＠ -13597,9 +13615,9 ＠＠ EOF
echo $ac_n "checking for working scanf""... $ac_c" 1>&6
-echo "configure:13601: checking for working scanf" >&5
+echo "configure:13619: checking for working scanf" >&5
cat > conftest.$ac_ext <<EOF
-#line 13603 "configure"
+#line 13621 "configure"
#include "confdefs.h"
int
＠＠ -13614,7 +13632,7 ＠＠ main (int argc, char **argv)
}
EOF
-if { (eval echo configure:13618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
working_scanf=yes
else
＠＠ -13637,10 +13655,10 ＠＠ EOF
echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:13641: checking for working strcoll" >&5
+echo "configure:13659: checking for working strcoll" >&5
cat > conftest.$ac_ext <<EOF
-#line 13644 "configure"
+#line 13662 "configure"
#include "confdefs.h"
#include <string.h>
main ()
＠＠ -13650,7 +13668,7 ＠＠ main ()
strcoll ("123", "456") >= 0);
}
EOF
-if { (eval echo configure:13654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_strcoll_works=yes
else
＠＠ -13678,10 +13696,10 ＠＠ fi
for ac_func in getpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13682: checking for $ac_func" >&5
+echo "configure:13700: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 13685 "configure"
+#line 13703 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -13704,7 +13722,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:13708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -13732,10 +13750,10 ＠＠ fi
done
echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:13736: checking whether getpgrp takes no argument" >&5
+echo "configure:13754: checking whether getpgrp takes no argument" >&5
cat > conftest.$ac_ext <<EOF
-#line 13739 "configure"
+#line 13757 "configure"
#include "confdefs.h"
/*
＠＠ -13790,7 +13808,7 ＠＠ main()
}
EOF
-if { (eval echo configure:13794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_getpgrp_void=yes
else
＠＠ -13817,10 +13835,10 ＠＠ fi
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:13821: checking for working mmap" >&5
+echo "configure:13839: checking for working mmap" >&5
case "$opsys" in ultrix* ) have_mmap=no ;; *)
cat > conftest.$ac_ext <<EOF
-#line 13824 "configure"
+#line 13842 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <unistd.h>
＠＠ -13853,7 +13871,7 ＠＠ int main (int argc, char *argv[])
return 1;
}
EOF
-if { (eval echo configure:13857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
have_mmap=yes
else
＠＠ -13882,9 +13900,9 ＠＠ test "$GNU_MALLOC" != "yes" -a "$have_mm
if test "$rel_alloc $have_mmap" = "default yes"; then
if test "$doug_lea_malloc" = "yes"; then
echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6
-echo "configure:13886: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:13904: checking for M_MMAP_THRESHOLD" >&5
cat > conftest.$ac_ext <<EOF
-#line 13888 "configure"
+#line 13906 "configure"
#include "confdefs.h"
#include <malloc.h>
int main() {
＠＠ -13896,7 +13914,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:13900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
rel_alloc=no; echo "$ac_t""yes" 1>&6;
else
＠＠ -13921,15 +13939,15 ＠＠ EOF
ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:13925: checking for termios.h" >&5
+echo "configure:13943: checking for termios.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13928 "configure"
+#line 13946 "configure"
#include "confdefs.h"
#include <termios.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -13972,15 +13990,15 ＠＠ else
echo "$ac_t""no" 1>&6
ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:13976: checking for termio.h" >&5
+echo "configure:13994: checking for termio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13979 "configure"
+#line 13997 "configure"
#include "confdefs.h"
#include <termio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14012,10 +14030,10 ＠＠ fi
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:14016: checking for socket" >&5
+echo "configure:14034: checking for socket" >&5
cat > conftest.$ac_ext <<EOF
-#line 14019 "configure"
+#line 14037 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
＠＠ -14038,7 +14056,7 ＠＠ socket();
; return 0; }
EOF
-if { (eval echo configure:14042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
＠＠ -14053,15 +14071,15 ＠＠ if eval "test \"`echo '$ac_cv_func_'sock
echo "$ac_t""yes" 1>&6
ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:14057: checking for netinet/in.h" >&5
+echo "configure:14075: checking for netinet/in.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14060 "configure"
+#line 14078 "configure"
#include "confdefs.h"
#include <netinet/in.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14078,15 +14096,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:14082: checking for arpa/inet.h" >&5
+echo "configure:14100: checking for arpa/inet.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14085 "configure"
+#line 14103 "configure"
#include "confdefs.h"
#include <arpa/inet.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14111,9 +14129,9 ＠＠ EOF
}
echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:14115: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:14133: checking "for sun_len member in struct sockaddr_un"" >&5
cat > conftest.$ac_ext <<EOF
-#line 14117 "configure"
+#line 14135 "configure"
#include "confdefs.h"
#include <sys/types.h>
＠＠ -14124,7 +14142,7 ＠＠ int main() {
static struct sockaddr_un x; x.sun_len = 1;
; return 0; }
EOF
-if { (eval echo configure:14128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_SOCKADDR_SUN_LEN
＠＠ -14142,9 +14160,9 ＠＠ else
fi
rm -f conftest*
echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:14146: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:14164: checking "for ip_mreq struct in netinet/in.h"" >&5
cat > conftest.$ac_ext <<EOF
-#line 14148 "configure"
+#line 14166 "configure"
#include "confdefs.h"
#include <sys/types.h>
＠＠ -14154,7 +14172,7 ＠＠ int main() {
static struct ip_mreq x;
; return 0; }
EOF
-if { (eval echo configure:14158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_MULTICAST
＠＠ -14185,10 +14203,10 ＠＠ fi
echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:14189: checking for msgget" >&5
+echo "configure:14207: checking for msgget" >&5
cat > conftest.$ac_ext <<EOF
-#line 14192 "configure"
+#line 14210 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char msgget(); below. */
＠＠ -14211,7 +14229,7 ＠＠ msgget();
; return 0; }
EOF
-if { (eval echo configure:14215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_msgget=yes"
else
＠＠ -14226,15 +14244,15 ＠＠ if eval "test \"`echo '$ac_cv_func_'msgg
echo "$ac_t""yes" 1>&6
ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:14230: checking for sys/ipc.h" >&5
+echo "configure:14248: checking for sys/ipc.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14233 "configure"
+#line 14251 "configure"
#include "confdefs.h"
#include <sys/ipc.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14251,15 +14269,15 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo "$ac_t""yes" 1>&6
ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:14255: checking for sys/msg.h" >&5
+echo "configure:14273: checking for sys/msg.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14258 "configure"
+#line 14276 "configure"
#include "confdefs.h"
#include <sys/msg.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14297,15 +14315,15 ＠＠ fi
ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:14301: checking for dirent.h" >&5
+echo "configure:14319: checking for dirent.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14304 "configure"
+#line 14322 "configure"
#include "confdefs.h"
#include <dirent.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14332,15 +14350,15 ＠＠ else
echo "$ac_t""no" 1>&6
ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:14336: checking for sys/dir.h" >&5
+echo "configure:14354: checking for sys/dir.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14339 "configure"
+#line 14357 "configure"
#include "confdefs.h"
#include <sys/dir.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14373,15 +14391,15 ＠＠ fi
ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:14377: checking for nlist.h" >&5
+echo "configure:14395: checking for nlist.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14380 "configure"
+#line 14398 "configure"
#include "confdefs.h"
#include <nlist.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14411,22 +14429,22 ＠＠ fi
echo "checking "for sound support"" 1>&6
-echo "configure:14415: checking "for sound support"" >&5
+echo "configure:14433: checking "for sound support"" >&5
test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
if test "$with_native_sound" != "no"; then
if test -n "$native_sound_lib"; then
ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:14422: checking for multimedia/audio_device.h" >&5
+echo "configure:14440: checking for multimedia/audio_device.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14425 "configure"
+#line 14443 "configure"
#include "confdefs.h"
#include <multimedia/audio_device.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14482,12 +14500,12 ＠＠ fi
if test -z "$native_sound_lib"; then
echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:14486: checking for ALopenport in -laudio" >&5
+echo "configure:14504: checking for ALopenport in -laudio" >&5
ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
xe_check_libs=" -laudio "
cat > conftest.$ac_ext <<EOF
-#line 14491 "configure"
+#line 14509 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14498,7 +14516,7 ＠＠ int main() {
ALopenport()
; return 0; }
EOF
-if { (eval echo configure:14502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14529,12 +14547,12 ＠＠ fi
if test -z "$native_sound_lib"; then
echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:14533: checking for AOpenAudio in -lAlib" >&5
+echo "configure:14551: checking for AOpenAudio in -lAlib" >&5
ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
xe_check_libs=" -lAlib "
cat > conftest.$ac_ext <<EOF
-#line 14538 "configure"
+#line 14556 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14545,7 +14563,7 ＠＠ int main() {
AOpenAudio()
; return 0; }
EOF
-if { (eval echo configure:14549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14593,15 +14611,15 ＠＠ fi
for dir in "machine" "sys" "linux"; do
ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:14597: checking for ${dir}/soundcard.h" >&5
+echo "configure:14615: checking for ${dir}/soundcard.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14600 "configure"
+#line 14618 "configure"
#include "confdefs.h"
#include <${dir}/soundcard.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14655,15 +14673,15 ＠＠ fi
if test "$with_nas_sound" != "no"; then
ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:14659: checking for audio/audiolib.h" >&5
+echo "configure:14677: checking for audio/audiolib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14662 "configure"
+#line 14680 "configure"
#include "confdefs.h"
#include <audio/audiolib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14681,12 +14699,12 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:14685: checking for AuOpenServer in -laudio" >&5
+echo "configure:14703: checking for AuOpenServer in -laudio" >&5
ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`
xe_check_libs=" -laudio "
cat > conftest.$ac_ext <<EOF
-#line 14690 "configure"
+#line 14708 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14697,7 +14715,7 ＠＠ int main() {
AuOpenServer()
; return 0; }
EOF
-if { (eval echo configure:14701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14736,7 +14754,7 ＠＠ EOF
fi
libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi
cat > conftest.$ac_ext <<EOF
-#line 14740 "configure"
+#line 14758 "configure"
#include "confdefs.h"
#include <audio/Xtutil.h>
EOF
＠＠ -14767,7 +14785,7 ＠＠ if test "$with_esd_sound" != "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
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14771: checking for $ac_word" >&5
+echo "configure:14789: checking for $ac_word" >&5
if test -n "$have_esd_config"; then
ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
＠＠ -14796,10 +14814,10 ＠＠ fi
c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi
echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:14800: checking for esd_play_stream" >&5
+echo "configure:14818: checking for esd_play_stream" >&5
cat > conftest.$ac_ext <<EOF
-#line 14803 "configure"
+#line 14821 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char esd_play_stream(); below. */
＠＠ -14822,7 +14840,7 ＠＠ esd_play_stream();
; return 0; }
EOF
-if { (eval echo configure:14826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_esd_play_stream=yes"
else
＠＠ -14873,7 +14891,7 ＠＠ test -z "$with_tty" && with_tty=yes
if test "$with_tty" = "yes" ; then
echo "checking for TTY-related features" 1>&6
-echo "configure:14877: checking for TTY-related features" >&5
+echo "configure:14895: checking for TTY-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_TTY
EOF
＠＠ -14886,12 +14904,12 ＠＠ EOF
if test -z "$with_ncurses"; then
echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:14890: checking for tgetent in -lncurses" >&5
+echo "configure:14908: checking for tgetent in -lncurses" >&5
ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -lncurses "
cat > conftest.$ac_ext <<EOF
-#line 14895 "configure"
+#line 14913 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14902,7 +14920,7 ＠＠ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:14906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14935,15 +14953,15 ＠＠ EOF
ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:14939: checking for ncurses/curses.h" >&5
+echo "configure:14957: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14942 "configure"
+#line 14960 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14965,15 +14983,15 ＠＠ fi
ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:14969: checking for ncurses/term.h" >&5
+echo "configure:14987: checking for ncurses/term.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14972 "configure"
+#line 14990 "configure"
#include "confdefs.h"
#include <ncurses/term.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15003,15 +15021,15 ＠＠ fi
c_switch_site="$c_switch_site -I/usr/include/ncurses"
ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:15007: checking for ncurses/curses.h" >&5
+echo "configure:15025: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15010 "configure"
+#line 15028 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15046,12 +15064,12 ＠＠ fi
for lib in curses termlib termcap; do
echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:15050: checking for tgetent in -l$lib" >&5
+echo "configure:15068: checking for tgetent in -l$lib" >&5
ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$lib "
cat > conftest.$ac_ext <<EOF
-#line 15055 "configure"
+#line 15073 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15062,7 +15080,7 ＠＠ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:15066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15093,12 +15111,12 ＠＠ fi
else
echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:15097: checking for tgetent in -lcurses" >&5
+echo "configure:15115: checking for tgetent in -lcurses" >&5
ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcurses "
cat > conftest.$ac_ext <<EOF
-#line 15102 "configure"
+#line 15120 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15109,7 +15127,7 ＠＠ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:15113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15127,12 +15145,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:15131: checking for tgetent in -ltermcap" >&5
+echo "configure:15149: checking for tgetent in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltermcap "
cat > conftest.$ac_ext <<EOF
-#line 15136 "configure"
+#line 15154 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15143,7 +15161,7 ＠＠ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:15147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15192,15 +15210,15 ＠＠ EOF
if test "$with_gpm" != "no"; then
ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:15196: checking for gpm.h" >&5
+echo "configure:15214: checking for gpm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15199 "configure"
+#line 15217 "configure"
#include "confdefs.h"
#include <gpm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15218,12 +15236,12 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:15222: checking for Gpm_Open in -lgpm" >&5
+echo "configure:15240: checking for Gpm_Open in -lgpm" >&5
ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgpm "
cat > conftest.$ac_ext <<EOF
-#line 15227 "configure"
+#line 15245 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15234,7 +15252,7 ＠＠ int main() {
Gpm_Open()
; return 0; }
EOF
-if { (eval echo configure:15238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15286,20 +15304,20 ＠＠ fi
test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
!= "no no no" && echo "checking for database support" 1>&6
-echo "configure:15290: checking for database support" >&5
+echo "configure:15308: checking for database support" >&5
if test "$with_database_gdbm $with_database_dbm" != "no no"; then
ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:15295: checking for ndbm.h" >&5
+echo "configure:15313: checking for ndbm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15298 "configure"
+#line 15316 "configure"
#include "confdefs.h"
#include <ndbm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15329,12 +15347,12 ＠＠ fi
if test "$with_database_gdbm" != "no"; then
echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:15333: checking for dbm_open in -lgdbm" >&5
+echo "configure:15351: checking for dbm_open in -lgdbm" >&5
ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdbm "
cat > conftest.$ac_ext <<EOF
-#line 15338 "configure"
+#line 15356 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15345,7 +15363,7 ＠＠ int main() {
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:15349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15373,10 +15391,10 ＠＠ fi
if test "$with_database_dbm" != "no"; then
echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:15377: checking for dbm_open" >&5
+echo "configure:15395: checking for dbm_open" >&5
cat > conftest.$ac_ext <<EOF
-#line 15380 "configure"
+#line 15398 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dbm_open(); below. */
＠＠ -15399,7 +15417,7 ＠＠ dbm_open();
; return 0; }
EOF
-if { (eval echo configure:15403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dbm_open=yes"
else
＠＠ -15418,12 +15436,12 ＠＠ else
echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:15422: checking for dbm_open in -ldbm" >&5
+echo "configure:15440: checking for dbm_open in -ldbm" >&5
ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldbm "
cat > conftest.$ac_ext <<EOF
-#line 15427 "configure"
+#line 15445 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15434,7 +15452,7 ＠＠ int main() {
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:15438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15475,10 +15493,10 ＠＠ EOF
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:15479: checking for Berkeley db.h" >&5
+echo "configure:15497: checking for Berkeley db.h" >&5
for header in "db/db.h" "db.h"; do
cat > conftest.$ac_ext <<EOF
-#line 15482 "configure"
+#line 15500 "configure"
#include "confdefs.h"
#include <stdlib.h>
＠＠ -15500,7 +15518,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:15504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
db_h_file="$header"; break
else
＠＠ -15516,9 +15534,9 ＠＠ rm -f conftest*
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:15520: checking for Berkeley DB version" >&5
+echo "configure:15538: checking for Berkeley DB version" >&5
cat > conftest.$ac_ext <<EOF
-#line 15522 "configure"
+#line 15540 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 1
＠＠ -15530,7 +15548,7 ＠＠ if (eval "$ac_cpp conftest.$ac_ext") 2>&
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 15534 "configure"
+#line 15552 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 2
＠＠ -15542,7 +15560,7 ＠＠ if (eval "$ac_cpp conftest.$ac_ext") 2>&
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 15546 "configure"
+#line 15564 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 3
＠＠ -15576,10 +15594,10 ＠＠ fi
rm -f conftest*
echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:15580: checking for $dbfunc" >&5
+echo "configure:15598: checking for $dbfunc" >&5
cat > conftest.$ac_ext <<EOF
-#line 15583 "configure"
+#line 15601 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $dbfunc(); below. */
＠＠ -15602,7 +15620,7 ＠＠ $dbfunc();
; return 0; }
EOF
-if { (eval echo configure:15606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$dbfunc=yes"
else
＠＠ -15621,12 +15639,12 ＠＠ else
echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:15625: checking for $dbfunc in -ldb" >&5
+echo "configure:15643: checking for $dbfunc in -ldb" >&5
ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldb "
cat > conftest.$ac_ext <<EOF
-#line 15630 "configure"
+#line 15648 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15637,7 +15655,7 ＠＠ int main() {
$dbfunc()
; return 0; }
EOF
-if { (eval echo configure:15641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15671,12 +15689,12 ＠＠ fi
echo "configure: warning: "db_create is really $dbfunc"" 1>&2
echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:15675: checking for $dbfunc in -ldb" >&5
+echo "configure:15693: checking for $dbfunc in -ldb" >&5
ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldb "
cat > conftest.$ac_ext <<EOF
-#line 15680 "configure"
+#line 15698 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15687,7 +15705,7 ＠＠ int main() {
$dbfunc()
; return 0; }
EOF
-if { (eval echo configure:15691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15746,12 +15764,12 ＠＠ fi
if test "$with_socks" = "yes"; then
echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:15750: checking for SOCKSinit in -lsocks" >&5
+echo "configure:15768: checking for SOCKSinit in -lsocks" >&5
ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
xe_check_libs=" -lsocks "
cat > conftest.$ac_ext <<EOF
-#line 15755 "configure"
+#line 15773 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15762,7 +15780,7 ＠＠ int main() {
SOCKSinit()
; return 0; }
EOF
-if { (eval echo configure:15766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15818,15 +15836,15 ＠＠ fi
if test "$use_number_lib" = "gmp"; then
ac_safe=`echo "gmp.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for gmp.h""... $ac_c" 1>&6
-echo "configure:15822: checking for gmp.h" >&5
+echo "configure:15840: checking for gmp.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15825 "configure"
+#line 15843 "configure"
#include "confdefs.h"
#include <gmp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15844,12 +15862,12 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo $ac_n "checking for __gmpz_init in -lgmp""... $ac_c" 1>&6
-echo "configure:15848: checking for __gmpz_init in -lgmp" >&5
+echo "configure:15866: checking for __gmpz_init in -lgmp" >&5
ac_lib_var=`echo gmp'_'__gmpz_init | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgmp "
cat > conftest.$ac_ext <<EOF
-#line 15853 "configure"
+#line 15871 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15860,7 +15878,7 ＠＠ int main() {
__gmpz_init()
; return 0; }
EOF
-if { (eval echo configure:15864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15909,15 +15927,15 ＠＠ elif test "$use_number_lib" = "mp"; then
for library in "" "-lcrypto"; do
ac_safe=`echo "mp.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for mp.h""... $ac_c" 1>&6
-echo "configure:15913: checking for mp.h" >&5
+echo "configure:15931: checking for mp.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15916 "configure"
+#line 15934 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15937,12 +15955,12 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
xe_msg_checking="for mp_mfree in -lmp"
test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:15941: checking "$xe_msg_checking"" >&5
+echo "configure:15959: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo mp'_'mp_mfree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lmp $library"
cat > conftest.$ac_ext <<EOF
-#line 15946 "configure"
+#line 15964 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15953,7 +15971,7 ＠＠ int main() {
mp_mfree()
; return 0; }
EOF
-if { (eval echo configure:15957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15974,12 +15992,12 ＠＠ else
xe_msg_checking="for mfree in -lmp"
test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:15978: checking "$xe_msg_checking"" >&5
+echo "configure:15996: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo mp'_'mfree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lmp $library"
cat > conftest.$ac_ext <<EOF
-#line 15983 "configure"
+#line 16001 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15990,7 +16008,7 ＠＠ int main() {
mfree()
; return 0; }
EOF
-if { (eval echo configure:15994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -16032,10 +16050,10 ＠＠ EOF
LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
fi
echo $ac_n "checking for mp_move""... $ac_c" 1>&6
-echo "configure:16036: checking for mp_move" >&5
+echo "configure:16054: checking for mp_move" >&5
cat > conftest.$ac_ext <<EOF
-#line 16039 "configure"
+#line 16057 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mp_move(); below. */
＠＠ -16058,7 +16076,7 ＠＠ mp_move();
; return 0; }
EOF
-if { (eval echo configure:16062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_mp_move=yes"
else
＠＠ -16089,10 +16107,10 ＠＠ fi
LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
fi
echo $ac_n "checking for move""... $ac_c" 1>&6
-echo "configure:16093: checking for move" >&5
+echo "configure:16111: checking for move" >&5
cat > conftest.$ac_ext <<EOF
-#line 16096 "configure"
+#line 16114 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char move(); below. */
＠＠ -16115,7 +16133,7 ＠＠ move();
; return 0; }
EOF
-if { (eval echo configure:16119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_move=yes"
else
＠＠ -16162,11 +16180,11 ＠＠ EOF
fi
cat > conftest.$ac_ext <<EOF
-#line 16166 "configure"
+#line 16184 "configure"
#include "confdefs.h"
int main(int c,char *v[]){return 0;}
EOF
-if { (eval echo configure:16170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:16188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
＠＠ -16408,6 +16426,14 ＠＠ while true; do
esac
done
+
+if test -z "$package_path" && test -n "$package_prefix" ; then
+ if test "$with_mule" = "yes" ; then
+ package_path="~/.xemacs::${package_prefix}/site-packages:${package_prefix}/xemacs-packages:${package_prefix}/mule-packages"
+ else
+ package_path="~/.xemacs::${package_prefix}/site-packages:${package_prefix}/xemacs-packages"
+ fi
+fi
- 4 participants
- 4 comments
[PATCH] Fixing build errors under 21.4 due to add-log
19 years, 4 months
Vin Shelton
Vin Shelton
Without these patches, when I build the packages under 21.4, I get
build errors like this one:
While compiling toplevel forms in file /home/acs/xemacs-packages-2004-12-04/xemacs-packages/prog-modes/tcl.el:
!! error (("No such face" font-lock-string-face))
backtrace(nil t)
# bind (error-info)
byte-compile-report-error((error "No such face" font-lock-string-face))
# bind (error-info)
#<compiled-function (error-info) "...(4)" [error-info byte-compile-report-error] 2>((error "No such face" font-lock-string-face))
get-face(font-lock-string-face)
# bind (how-to-add tag-set locale parent face)
set-face-parent(change-log-date-face font-lock-string-face)
byte-code("..." [make-face change-log-date-face "Face used to highlight dates in date lines." set-face-parent font-lock-string-face change-log-name-face "Face for highlighting author names." font-lock-constant-face change-log-email-face "Face for highlighting author email addresses." font-lock-variable-name-face change-log-file-face "Face for highlighting file names." font-lock-function-name-face change-log-list-face "Face for highlighting parenthesized lists of functions or variables." font-lock-keyword-face change-log-conditionals-face "Face for highlighting conditionals of the form `[...]'." change-log-function-face "Face for highlighting items of the form `<....>'." change-log-acknowledgement-face "Face for highlighting acknowledgments." font-lock-comment-face] 3)
# bind (current-load-list)
# (unwind-protect ...)
# bind (load-file-name)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
# (unwind-protect ...)
load-internal("add-log" nil t nil nil nil)
# bind (nosuffix nomessage noerror file)
load("add-log" nil t nil)
# (unwind-protect ...)
require(add-log)
(progn (require (quote imenu)) (require (quote outline)) (require (quote dabbrev)) (require (quote add-log)))
eval((progn (require (quote imenu)) (require (quote outline)) (require (quote dabbrev)) (require (quote add-log))))
# bind (sym def G43823)
# (unwind-protect ...)
# bind (save-macro-environment form)
byte-compile-eval((progn (require (quote imenu)) (require (quote outline)) (require (quote dabbrev)) (require (quote add-log))))
(list (quote quote) (byte-compile-eval (cons ... body)))
# bind (body)
(lambda (&rest body) (list (quote quote) (byte-compile-eval ...)))((require (quote imenu)) (require (quote outline)) (require (quote dabbrev)) (require (quote add-log)))
#<subr macroexpand-internal>((eval-when-compile (require (quote imenu)) (require (quote outline)) (require (quote dabbrev)) (require (quote add-log))) ((byte-compiler-options lambda (&rest forms) (apply ... forms)) (eval-when-compile lambda (&rest body) (list ... ...)) (eval-and-compile lambda (&rest body) (byte-compile-eval ...) (cons ... body))))
# bind (cl-macro-environment cl-env cl-macro)
macroexpand((eval-when-compile (require (quote imenu)) (require (quote outline)) (require (quote dabbrev)) (require (quote add-log))) ((byte-compiler-options lambda (&rest forms) (apply ... forms)) (eval-when-compile lambda (&rest body) (list ... ...)) (eval-and-compile lambda (&rest body) (byte-compile-eval ...) (cons ... body))))
# bind (byte-compile-current-form handler form)
byte-compile-file-form((eval-when-compile (require (quote imenu)) (require (quote outline)) (require (quote dabbrev)) (require (quote add-log))))
# (unwind-protect ...)
#<compiled-function nil "...(43)" [byte-compile-unresolved-functions byte-compile-inbuffer 1 " \n
" nil looking-at ";" byte-compile-file-form read byte-compile-flush-pending byte-compile-warn-about-unresolved-functions] 3>()
# (unwind-protect ...)
call-with-condition-handler(#<compiled-function (error-info) "...(4)" [error-info byte-compile-report-error] 2> #<compiled-function nil "...(43)" [byte-compile-unresolved-functions byte-compile-inbuffer 1 " \n
" nil looking-at ";" byte-compile-file-form read byte-compile-flush-pending byte-compile-warn-about-unresolved-functions] 3>)
# (unwind-protect ...)
# bind (byte-compile-warnings-beginning byte-compile-point-max-prev byte-compile-log-buffer byte-compile-macro-environment byte-compile-function-environment byte-compile-autoload-environment byte-compile-unresolved-functions byte-compile-bound-variables byte-compile-free-references byte-compile-free-assignments byte-compile-verbose byte-optimize byte-compile-emacs19-compatibility byte-compile-dynamic byte-compile-dynamic-docstrings byte-compile-warnings byte-compile-file-domain byte-compile-outbuffer float-output-format case-fold-search print-length print-level byte-compile-constants byte-compile-variables byte-compile-tag-number byte-compile-depth byte-compile-maxdepth byte-compile-output eval filename byte-compile-inbuffer)
byte-compile-from-buffer(#<buffer " *Compiler Input*"> "/home/acs/xemacs-packages-2004-12-04/xemacs-packages/prog-modes/tcl.el")
# bind (byte-compile-current-file target-file input-buffer output-buffer byte-compile-dest-file load filename)
byte-compile-file("tcl.el")
byte-code("..." [file byte-compile-file t] 2)
# (condition-case ... . ((error (byte-code "ÂÃ!!ÂÄ!ÅÆ!«Æ Ç\"ªÂ ＠ÈN® ＠!ÉÊ A\"ÂË!Ç" ... 3))))
# bind (file)
batch-byte-compile-1("tcl.el")
# bind (error file-to-process)
batch-byte-compile-one-file()
# bind (error)
batch-byte-compile()
# bind (arg)
command-line-do-funcall("-f")
# bind (dir file-count line end-of-options file-p arg tem)
command-line-1()
# bind (command-line-args-left)
command-line()
# (condition-case ... . ((t (byte-code " Â" ... 1))))
# bind (error-data)
normal-top-level()
# (condition-case ... . error)
# (catch top-level ...)
>>Error occurred processing tcl.el:
No such face: font-lock-string-face
xemacs-packages/pcl-cvs/ChangeLog addition:
2004-12-04 Vin Shelton <acs(a)xemacs.org>
* cvs-edit.el (font-lock): Added required font-lock.
xemacs-packages/prog-modes/ChangeLog addition:
2004-12-04 Vin Shelton <acs(a)xemacs.org>
* make-mode.el: font-lock now required by add-log.
* tcl.el: font-lock now required by add-log.
packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/prog-modes/tcl.el xemacs-packages/prog-modes/make-mode.el xemacs-packages/pcl-cvs/cvs-edit.el
Index: xemacs-packages/pcl-cvs/cvs-edit.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/pcl-cvs/cvs-edit.el,v
retrieving revision 2.2
diff -a -u -u -r2.2 cvs-edit.el
--- xemacs-packages/pcl-cvs/cvs-edit.el 2001/07/14 09:08:35 2.2
+++ xemacs-packages/pcl-cvs/cvs-edit.el 2004/12/04 23:36:58
＠＠ -33,6 +33,7 ＠＠
;;; Code:
(eval-when-compile (require 'cl))
+(require 'font-lock)
(require 'add-log) ; for all the ChangeLog goodies
(require 'pcl-cvs-util)
(require 'ring)
Index: xemacs-packages/prog-modes/make-mode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/prog-modes/make-mode.el,v
retrieving revision 1.10
diff -a -u -u -r1.10 make-mode.el
--- xemacs-packages/prog-modes/make-mode.el 2003/07/21 07:03:34 1.10
+++ xemacs-packages/prog-modes/make-mode.el 2004/12/04 23:36:59
＠＠ -97,6 +97,7 ＠＠
(unless (featurep 'xemacs)
(require 'imenu))
(require 'dabbrev)
+ (require 'font-lock)
(require 'add-log))
;; Used to generate some fancy regexps
Index: xemacs-packages/prog-modes/tcl.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/prog-modes/tcl.el,v
retrieving revision 1.10
diff -a -u -u -r1.10 tcl.el
--- xemacs-packages/prog-modes/tcl.el 2003/01/06 18:31:23 1.10
+++ xemacs-packages/prog-modes/tcl.el 2004/12/04 23:37:00
＠＠ -111,6 +111,7 ＠＠
(require 'imenu)
(require 'outline)
(require 'dabbrev)
+ (require 'font-lock)
(require 'add-log))
;; I sure wish Emacs had a package that made it easy to extract this
- 3 participants
- 4 comments
[COMMIT]
19 years, 4 months
Ben Wing
Ben Wing
NOTE: This patch has been committed.
This is a commit of one of my workspaces.
RECOMMEND 21.4:
I suggest the changes to README.packages, info.el, menubar-items.el,
xemacs/packages.texi, xemacs/xemacs-faq.texi and internals/internals.texi
go into 21.4. The changes in README.packages are predicated on my previous
change to configure.in, which I recommend for 21.4.
In general, the entire contents of xemacs-faq.texi and internals.texi
should be duplicated between 21.5 and 21.4.
ChangeLog addition:
2004-12-05 Ben Wing <ben(a)xemacs.org>
* README.packages:
Fix error in specifying standard package location.
Document --package-prefix.
lib-src/ChangeLog addition:
2004-12-05 Ben Wing <ben(a)xemacs.org>
* make-docfile.c (main):
* make-docfile.c (scan_c_file):
Use QXE_PATH_MAX.
lisp/ChangeLog addition:
2004-12-05 Ben Wing <ben(a)xemacs.org>
* info.el (Info-additional-search-directory-list):
Correct doc string giving example package path.
* menubar-items.el (default-menubar):
Move Prefix Rectangle command up one level.
man/ChangeLog addition:
2004-12-05 Ben Wing <ben(a)xemacs.org>
* xemacs/packages.texi (Packages):
* xemacs/packages.texi (Manually):
* xemacs/packages.texi (Building Packages):
* xemacs/packages.texi (Local.rules File):
* xemacs/packages.texi (Available Packages):
Add long form of Lisp Reference Manual to links.
Add links pointing to Lisp Reference Manual for more detailed
package discussion.
* xemacs/xemacs-faq.texi:
As per Adrian's suggestion, mention that Pitts Jarvis is deceased.
2004-12-05 Ben Wing <ben(a)xemacs.org>
* lispref/range-tables.texi (Range Tables):
* lispref/range-tables.texi (Introduction to Range Tables):
* lispref/range-tables.texi (Working With Range Tables):
Document range-table changes.
2004-12-05 Ben Wing <ben(a)xemacs.org>
* internals/internals.texi (A History of Emacs):
Update history section.
src/ChangeLog addition:
2004-12-05 Ben Wing <ben(a)xemacs.org>
* elhash.c:
* elhash.c (find_htentry):
* elhash.c (inchash_eq):
* elhash.h:
* profile.c (create_profile_tables):
* profile.c (profile_record_consing):
* profile.c (profile_record_about_to_call):
Create inchash_eq() to allow direct incrementing of hash-table
entry. Use in profile.c to try to reduce profiling overhead.
Increase initial size of profile hash tables to reduce profiling
overhead.
* buffer.c (init_initial_directory):
* device-msw.c (mswindows_handle_page_setup_dialog_box):
* dialog-msw.c (handle_directory_proc):
* dialog-msw.c (handle_file_dialog_box):
* dialog-msw.c:
* dired-msw.c (mswindows_format_file):
* dired-msw.c (mswindows_get_files):
* editfns.c (Ftemp_directory):
* event-msw.c (mswindows_wnd_proc):
* events.c (format_event_object):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (add_tree_item):
* keymap.c (Fsingle_key_description):
* keymap.c (format_raw_keys):
* objects-msw.c (parse_font_spec):
* process-nt.c (nt_create_process):
* syswindows.h (build_tstr_string):
* syswindows.h (qxetcslen):
* text.c (eicmp_1):
* text.h (eicat_ascii):
* text.h (eicmp_ascii):
* text.h (eicpy_ascii):
* text.h (eicpy_ascii_len):
* text.h (eistr_ascii):
* text.h (eisub_ascii):
* text.h:
* unexnt.c (_start):
Rename xetcs* -> qxetcs* for consistency with qxestr*.
Rename ei*_c(_*) -> ei*_ascii(_*) since they work with ASCII-only
strings not "C strings", whatever those are. This is the last
place where "c" was incorrectly being used for "ascii".
* dialog-msw.c (handle_directory_proc):
* dialog-msw.c (handle_directory_dialog_box):
* dumper.c:
* event-msw.c (mswindows_wnd_proc):
* fileio.c (Ffile_truename):
* glyphs-gtk.c (font_instantiate):
* glyphs-x.c (font_instantiate):
* nt.c (Fmswindows_short_file_name):
* nt.c (mswindows_link):
* process-nt.c (nt_create_process):
* realpath.c (readlink_and_correct_case):
* realpath.c (qxe_realpath):
* sysdep.c (qxe_allocating_getcwd):
* sysfile.h:
* unexcw.c (unexec):
* unexnext.c (unexec):
* unexnt.c (_start):
Try to avoid differences in systems that do or do not include
final null byte in PATH_MAX. Create PATH_MAX_INTERNAL and
PATH_MAX_EXTERNAL and use them everywhere. Rewrite code in
dumper.c to avoid use of PATH_MAX. When necessary in nt.c,
use _MAX_PATH instead of MAX_PATH to be consistent with
other places.
* text.c (dfc_convert_to_internal_format):
Code to short-circuit when binary or Unicode was not working
due to EOL wrapping. Fix this code to work when either no
EOL autodetection or no CR's or LF's in the text.
* lisp.h:
* rangetab.c:
* rangetab.c (range_table_symbol_to_type):
* rangetab.c (range_table_type_to_symbol):
* rangetab.c (print_range_table):
* rangetab.c (verify_range_table):
* rangetab.c (get_range_table):
* rangetab.c (Frange_table_type):
* rangetab.c (Fcopy_range_table):
* rangetab.c (put_range_table):
* rangetab.c (Fput_range_table):
* rangetab.c (Fremove_range_table):
* rangetab.c (rangetab_type_validate):
* rangetab.c (rangetab_instantiate):
* rangetab.c (syms_of_rangetab):
* rangetab.c (structure_type_create_rangetab):
* rangetab.h:
* rangetab.h (enum range_table_type):
* regex.c (vars_of_regex):
* search.c (vars_of_search):
Implement different types of ranges (open/closed start and end).
Change default to be start-closed, end-open.
build source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: src/unexnt.c src/unexnext.c src/unexcw.c src/text.h src/text.c src/syswindows.h src/sysfile.h src/sysdep.c src/symbols.c src/search.c src/regex.c src/realpath.c src/rangetab.h src/rangetab.c src/profile.c src/process-nt.c src/objects-msw.c src/nt.c src/lisp.h src/keymap.c src/glyphs-x.c src/glyphs-msw.c src/glyphs-gtk.c src/fileio.c src/events.c src/event-msw.c src/eval.c src/elhash.h src/elhash.c src/editfns.c src/dumper.c src/dired-msw.c src/dialog-msw.c src/device-msw.c src/buffer.c man/xemacs/packages.texi man/lispref/range-tables.texi man/internals/internals.texi man/xemacs-faq.texi lisp/menubar-items.el lisp/info.el lib-src/make-docfile.c README.packages
cvs server: Diffing .
Index: README.packages
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/README.packages,v
retrieving revision 1.15
diff -u -p -r1.15 README.packages
--- README.packages 2003/08/27 18:06:54 1.15
+++ README.packages 2004/12/05 22:09:10
＠＠ -32,15 +32,15 ＠＠ A. You can grab all the packages at once
Q. How do I tell XEmacs where to find the packages?
-A. Normally, you put the packages under $prefix/lib/packages, where
+A. Normally, you put the packages under $prefix/lib/xemacs, where
$prefix is specified using the `--prefix' parameter to `configure'.
(See `Package hierarchies' below). However, if you have the packages
somewhere else (e.g. you're a developer and are compiling the packages
yourself, and want your own private copy of everything), use the
- `--package-path' parameter, something like this:
+ `--package-prefix' parameter to `configure' to specify the directory prefix
+ under which you have placed the `xemacs-packages' and (if MULE support
+ exists) `mule-packages' directories.
- configure --package-path="~/.xemacs::/src/xemacs/site-packages:/src/xemacs/xemacs-packages:/src/xemacs/mule-packages" ...
-
Q. After installing, I want XEmacs to do `foo', but when I invoke it
(or click the toolbar button or select the menu item), nothing (or
an error) happens, and it used to work.
＠＠ -97,10 +97,9 ＠＠ automatically find them at startup; howe
somewhere else (e.g. you're a developer and are compiling the packages
yourself, and want your own private copy of everything), you can tell
XEmacs specifically where to look for the packages by using the
-`--package-path' parameter to the 'configure' script. Normally, it looks
-like this:
-
-configure --package-path="~/.xemacs::/src/xemacs/site-packages:/src/xemacs/xemacs-packages:/src/xemacs/mule-packages" ...
+`--package-prefix' parameter to 'configure' to specify the directory prefix
+under which you have placed the `xemacs-packages' and (if MULE support
+exists) `mule-packages' directories.
See `configure.usage' for more info about the format of this parameter.
cvs server: Diffing dynodump
cvs server: Diffing dynodump/i386
cvs server: Diffing dynodump/ppc
cvs server: Diffing dynodump/sparc
cvs server: Diffing etc
cvs server: Diffing etc/custom
cvs server: Diffing etc/custom/example-themes
cvs server: Diffing etc/eos
cvs server: Diffing etc/idd
cvs server: Diffing etc/photos
cvs server: Diffing etc/sparcworks
cvs server: Diffing etc/tests
cvs server: Diffing etc/tests/external-widget
cvs server: Diffing etc/toolbar
cvs server: Diffing etc/unicode
cvs server: Diffing etc/unicode/ibm
cvs server: Diffing etc/unicode/mule-ucs
cvs server: Diffing etc/unicode/other
cvs server: Diffing etc/unicode/unicode-consortium
cvs server: Diffing info
cvs server: Diffing lib-src
Index: lib-src/make-docfile.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/make-docfile.c,v
retrieving revision 1.15
diff -u -p -r1.15 make-docfile.c
--- lib-src/make-docfile.c 2004/09/20 19:19:10 1.15
+++ lib-src/make-docfile.c 2004/12/05 22:09:11
＠＠ -220,11 +220,11 ＠＠ main (int argc, char **argv)
/* Allow a file containing files to process, for use w/MS Windows
(where command-line length limits are more problematic) */
FILE *argfile = fopen (argv[i] + 1, READ_TEXT);
- char arg[PATH_MAX];
+ char arg[QXE_PATH_MAX];
if (!argfile)
fatal ("Unable to open argument file %s", argv[i] + 1);
- while (fgets (arg, PATH_MAX, argfile))
+ while (fgets (arg, QXE_PATH_MAX, argfile))
{
if (arg[strlen (arg) - 1] == '\n')
arg[strlen (arg) - 1] = '\0'; /* chop \n */
＠＠ -640,10 +640,10 ＠＠ scan_c_file (const char *filename, const
register int defvarflag;
int minargs, maxargs;
int l = strlen (filename);
- char f[PATH_MAX];
+ char f[QXE_PATH_MAX];
/* XEmacs change: different method for checking filename extension */
- if (l > PATH_MAX - 1)
+ if (l > QXE_PATH_MAX - 1)
{
#ifdef ENAMETOOLONG
errno = ENAMETOOLONG;
cvs server: Diffing lisp
Index: lisp/info.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/info.el,v
retrieving revision 1.33
diff -u -p -r1.33 info.el
--- lisp/info.el 2004/01/21 09:54:27 1.33
+++ lisp/info.el 2004/12/05 22:09:23
＠＠ -392,7 +392,7 ＠＠ This variable is ignored unless running
"*List of additional directories to search for Info documentation
files. These directories are not searched for merging the `dir'
file. An example might be something like:
-\"/usr/local/lib/xemacs/packages/lisp/calc/\""
+\"/usr/local/lib/xemacs/xemacs-packages/lisp/calc/\""
:type '(repeat directory)
:group 'info)
Index: lisp/menubar-items.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/menubar-items.el,v
retrieving revision 1.43
diff -u -p -r1.43 menubar-items.el
--- lisp/menubar-items.el 2004/11/08 14:17:03 1.43
+++ lisp/menubar-items.el 2004/12/05 22:09:24
＠＠ -504,13 +504,13 ＠＠ Write your filter like this:
)
"---"
["%_Cut Rectangle" kill-rectangle]
+ ["%_Prefix Rectangle..." string-rectangle]
("Other %_Rectangles/Register"
["%_Yank Rectangle" yank-rectangle]
["Rectangle %_to Register" copy-rectangle-to-register]
["Rectangle %_from Register" insert-register]
["%_Delete Rectangle" clear-rectangle]
["%_Open Rectangle" open-rectangle]
- ["%_Prefix Rectangle..." string-rectangle]
["Rectangle %_Mousing"
(customize-set-variable 'mouse-track-rectangle-p
(not mouse-track-rectangle-p))
＠＠ -555,7 +555,7 ＠＠ Write your filter like this:
["Edit Ta%_b Stops" edit-tab-stops]
)
"---"
- ("S%_pell-Check"
+ ("Spell-Chec%_k"
["%_Buffer" ispell-buffer
:active (fboundp 'ispell-buffer)]
"---"
cvs server: Diffing lisp/mule
cvs server: Diffing lisp/term
cvs server: Diffing lock
cvs server: Diffing lwlib
cvs server: Diffing man
Index: man/xemacs-faq.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs-faq.texi,v
retrieving revision 1.79
diff -u -p -r1.79 xemacs-faq.texi
--- man/xemacs-faq.texi 2004/12/05 08:48:12 1.79
+++ man/xemacs-faq.texi 2004/12/05 22:09:28
＠＠ -1255,9 +1255,9 ＠＠ code in it.
There is also a port of XEmacs 19.14 that works on all recent versions
of MacOS, from 8.1 through MacOS X, by ＠email{pjarvis＠(a)ispchannel.com,
-Pitts Jarvis}. It runs in an equivalent of TTY mode only (one single
-Macintosh window, 25 colors), but has a large number of Mac-specific
-additions. It's available at
+Pitts Jarvis} (recently deceased). It runs in an equivalent of TTY
+mode only (one single Macintosh window, 25 colors), but has a large
+number of Mac-specific additions. It's available at
＠uref{http://homepage.mac.com/pjarvis/xemacs.html}.
＠node Q1.1.7, Q1.1.8, Q1.1.6, Introduction
cvs server: Diffing man/internals
Index: man/internals/internals.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v
retrieving revision 1.54
diff -u -p -r1.54 internals.texi
--- man/internals/internals.texi 2004/11/26 07:37:51 1.54
+++ man/internals/internals.texi 2004/12/05 22:09:42
＠＠ -964,21 +964,34 ＠＠ basically no changes for Xemacs.
＠cindex Free Software Foundation
XEmacs is a powerful, customizable text editor and development
-environment. It began as Lucid Emacs, which was in turn derived from
-GNU Emacs, a program written by Richard Stallman of the Free Software
-Foundation. GNU Emacs dates back to the 1970's, and was modelled
-after a package called ``Emacs'', written in 1976, that was a set of
-macros on top of TECO, an old, old text editor written at MIT on the
-DEC PDP 10 under one of the earliest time-sharing operating systems,
-ITS (Incompatible Timesharing System). (ITS dates back well before
-Unix.) ITS, TECO, and Emacs were products of a group of people at MIT
-who called themselves ``hackers'', who shared an idealistic belief
-system about the free exchange of information and were fanatical in
-their devotion to and time spent with computers. (The hacker
-subculture dates back to the late 1950's at MIT and is described in
-detail in Steven Levy's book ＠cite{Hackers}. This book also includes
-a lot of information about Stallman himself and the development of
-Lisp, a programming language developed at MIT that underlies Emacs.)
+environment. It began in 1991 as Lucid Emacs, which was in turn
+derived from GNU Emacs, a program written by Richard Stallman of the
+Free Software Foundation. GNU Emacs dates back to 1985 and was
+modelled after Unipress Emacs, an editor written by James Gosling in
+1981 and based on a series of other "Emacs"-like editors, including
+EINE (EINE Is Not EMACS), c. 1976, by Dan Weinreb, which run on the
+MIT Lisp Machine and was the first Emacs written in Lisp; ZWEI (ZWEI
+Was EINE Initially), c. 1978, by Dan Weinreb and Mike McMahon; Multics
+Emacs, c. 1978, by Bernie Greenberg, which was written in MacLisp and
+also used Lisp as its extension language; and ZMACS, c. 1980, a direct
+descendant of ZWEI that on ran the Symbolics LM-2, LMI LispM, and
+later, TI Explorer (1983-1989). These in turn were inspired by the
+first Emacs, a package called EMACS, written in 1976 by Richard
+Stallman, Guy Steele, and Dave Moon. This was a merger of TECMAC and
+TMACS, a pair of "TECO-macro realtime editors" written by Guy Steele,
+Dave Moon, Richard Greenblatt, Charles Frankston, et al., and added a
+dynamic loader and Meta-key cmds. It ran under ITS (the Incompatible
+Timesharing System) on a DEC PDP 10 and under TWENEX on a Tops-20 and
+was written in TECO and PDP 10 assembly. ITS was one of the first
+time-sharing operating systems and dates back well before Unix. ITS,
+TECO, and Emacs were products of a group of people at MIT who called
+themselves ``hackers'', who shared an idealistic belief system about
+the free exchange of information and were fanatical in their devotion
+to and time spent with computers. (The hacker subculture dates back to
+the late 1950's at MIT and is described in detail in Steven Levy's
+book ＠cite{Hackers}. This book also includes a lot of information
+about Stallman himself and the development of Lisp, a programming
+language developed at MIT that underlies Emacs.)
＠menu
* Through Version 18:: Unification prevails.
cvs server: Diffing man/lispref
Index: man/lispref/range-tables.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/range-tables.texi,v
retrieving revision 1.2
diff -u -p -r1.2 range-tables.texi
--- man/lispref/range-tables.texi 2001/04/12 18:22:19 1.2
+++ man/lispref/range-tables.texi 2004/12/05 22:09:44
＠＠ -13,12 +13,17 ＠＠ ranges of integers.
Note that range tables have a read syntax, like this:
＠example
-#s(range-table data ((-3 2) foo (5 20) bar))
+#s(range-table type start-closed-end-open data ((-3 2) foo (5 20) bar))
＠end example
-This maps integers in the range (-3, 2) to ＠code{foo} and integers
-in the range (5, 20) to ＠code{bar}.
+This maps integers in the range [-3, 2) to ＠code{foo} and integers
+in the range [5, 20) to ＠code{bar}.
+By default, range tables have a ＠var{type} of
+＠code{start-closed-end-open}. (＠strong{NOTE}: This is a change from
+21.4 and earlier, where there was no ＠var{type} and range tables were always
+closed on both ends.) This makes them work like text properties.
+
＠defun range-table-p object
Return non-＠code{nil} if ＠var{object} is a range table.
＠end defun
＠＠ -32,8 +37,35 ＠＠ Return non-＠code{nil} if ＠var{object} is
＠node Introduction to Range Tables
＠section Introduction to Range Tables
-＠defun make-range-table
+＠defun make-range-table &optional type
Make a new, empty range table.
+
+＠var{type} is a symbol indicating how ranges are assumed to function
+at their ends. It can be one of
+
+＠example
+SYMBOL RANGE-START RANGE-END
+------ ----------- ---------
+`start-closed-end-open' (the default) closed open
+`start-closed-end-closed' closed closed
+`start-open-end-open' open open
+`start-open-end-closed' open closed
+＠end example
+
+A ＠dfn{closed} endpoint of a range means that the number at that end
+is included in the range. For an ＠dfn{open} endpoint, the number
+would not be included.
+
+For example, a closed-open range from 5 to 20 would be indicated as
+＠samp{[5, 20)} where a bracket indicates a closed end and a
+parenthesis an open end, and would mean `all the numbers between 5 and
+20', including 5 but not 20. This seems a little strange at first but
+is in fact extremely common in the outside world as well as in
+computers and makes things work sensibly. For example, if I say
+"there are seven days between today and next week today", I'm
+including today but not next week today; if I included both, there
+would be eight days. Similarly, there are 15 (= 20 - 5) elements in
+the range ＠samp{[5, 20)}, but 16 in the range ＠samp{[5, 20]}.
＠end defun
＠defun copy-range-table range-table
＠＠ -49,11 +81,20 ＠＠ themselves be copied.
This function finds value for position ＠var{pos} in ＠var{range-table}.
If there is no corresponding value, return ＠var{default} (defaults to
＠code{nil}).
+
+＠strong{NOTE}: If you are working with ranges that are closed at the
+start and open at the end (the default), and you put a value for a
+range with ＠var{start} equal to ＠var{end}, ＠code{get-range-table} will
+＠strong{not} return that value! You would need to set ＠var{end} one
+greater than ＠var{start}.
＠end defun
＠defun put-range-table start end value range-table
This function sets the value for range (＠var{start}, ＠var{end}) to be
＠var{value} in ＠var{range-table}.
+
+＠strong{NOTE}: Unless you are working with ranges that are closed at
+both ends, nothing will happen if ＠var{start} equals ＠var{end}.
＠end defun
＠defun remove-range-table start end range-table
cvs server: Diffing man/new-users-guide
cvs server: Diffing man/xemacs
Index: man/xemacs/packages.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/packages.texi,v
retrieving revision 1.23
diff -u -p -r1.23 packages.texi
--- man/xemacs/packages.texi 2003/08/27 18:07:10 1.23
+++ man/xemacs/packages.texi 2004/12/05 22:09:44
＠＠ -15,6 +15,9 ＠＠ packages to install; the actual installa
This gives an installer the ability to tailor an XEmacs installation for
local needs with safe removal of unnecessary code.
+＠emph{NOTE}: For detailed information about how the package
+hierarchies work, ＠xref{Package Overview,,,lispref, XEmacs Lisp Reference Manual}.
+
＠menu
* Package Terminology:: Understanding different kinds of packages.
* Installing Packages:: How to install packages.
＠＠ -301,7 +304,7 ＠＠ have the form ＠file{name-<version>-pkg.t
a fresh install it is sufficient to untar the file at the top of the
package hierarchy.
-Note: If you are upgrading packages already installed, it's best to
+＠emph{NOTE}: If you are upgrading packages already installed, it's best to
remove the old package first ＠ref{Removing Packages}.
For example if we are installing the ＠file{xemacs-base}
＠＠ -330,6 +333,9 ＠＠ Or if you have GNU tar, the last step ca
tar zxvf /path/to/mule-base-1.37-pkg.tar.gz RET
＠end example
+＠emph{NOTE}: For more detailed information about how the package
+hierarchies work, ＠xref{Package Overview,,,lispref, XEmacs Lisp Reference Manual}.
+
＠node Sumo, Which Packages, Manually, Installing Packages
＠comment node-name, next, previous, up
＠cindex sumo package install
＠＠ -431,7 +437,7 ＠＠ tarballs for installation into your own
distributing to others.
For a list and description of the different ＠file{Makefile} targets,
-＠xref{Makefile Targets,,,lispref}.
+＠xref{Makefile Targets,,,lispref, XEmacs Lisp Reference Manual}.
＠node Local.rules File, Available Packages, Building Packages, Packages
＠comment node-name, next, previous, up
＠＠ -443,7 +449,7 ＠＠ file, ＠file{Local.rules.template}. Simp
＠file{Local.rules} and edit it to suit your needs.
For a complete discussion of the ＠file{Local.rules} file,
-(a)xref{Local.rules File,,,lispref}.
+(a)xref{Local.rules File,,,lispref, XEmacs Lisp Reference Manual}.
＠node Available Packages, , Local.rules File, Packages
＠comment node-name, next, previous, up
cvs server: Diffing modules
cvs server: Diffing modules/base64
cvs server: Diffing modules/common
cvs server: Diffing modules/ldap
cvs server: Diffing modules/postgresql
cvs server: Diffing modules/sample
cvs server: Diffing modules/sample/external
cvs server: Diffing modules/sample/internal
cvs server: Diffing modules/zlib
cvs server: Diffing netinstall
cvs server: Diffing nt
cvs server: Diffing nt/installer
cvs server: Diffing nt/installer/Wise
Index: src/buffer.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/buffer.c,v
retrieving revision 1.67
diff -u -p -r1.67 buffer.c
--- src/buffer.c 2004/11/04 23:06:15 1.67
+++ src/buffer.c 2004/12/05 22:10:00
＠＠ -2912,7 +2912,7 ＠＠ init_initial_directory (void)
Extbyte *modname = mswindows_get_module_file_name ();
assert (modname);
- p = xetcsrchr (modname, '\\');
+ p = qxetcsrchr (modname, '\\');
assert (p);
XECOPY_TCHAR (p, '\0');
Index: src/device-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-msw.c,v
retrieving revision 1.54
diff -u -p -r1.54 device-msw.c
--- src/device-msw.c 2004/11/04 23:06:19 1.54
+++ src/device-msw.c 2004/12/05 22:10:00
＠＠ -916,7 +916,7 ＠＠ mswindows_handle_page_setup_dialog_box (
qxeGetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_IMEASURE,
measure, sizeof (measure) / XETCHAR_SIZE);
- data = xetcscmp (measure, XETEXT ("0"));
+ data = qxetcscmp (measure, XETEXT ("0"));
memset (&pd, 0, sizeof (pd));
pd.lStructSize = sizeof (pd);
Index: src/dialog-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dialog-msw.c,v
retrieving revision 1.31
diff -u -p -r1.31 dialog-msw.c
--- src/dialog-msw.c 2004/11/04 23:06:20 1.31
+++ src/dialog-msw.c 2004/12/05 22:10:00
＠＠ -1,6 +1,6 ＠＠
/* Implements elisp-programmable dialog boxes -- MS Windows interface.
Copyright (C) 1998 Kirill M. Katsnelson <kkm(a)kis.ru>
- Copyright (C) 2000, 2001, 2002, 2003 Ben Wing.
+ Copyright (C) 2000, 2001, 2002, 2003, 2004 Ben Wing.
This file is part of XEmacs.
＠＠ -344,7 +344,7 ＠＠ static int
CALLBACK handle_directory_proc (HWND hwnd, UINT msg,
LPARAM lParam, LPARAM lpData)
{
- Extbyte szDir[MAX_PATH * MAX_XETCHAR_SIZE];
+ Extbyte szDir[PATH_MAX_EXTERNAL];
struct param_data *pd = (struct param_data *) lpData;
switch (msg)
＠＠ -365,7 +365,7 ＠＠ CALLBACK handle_directory_proc (HWND hwn
if (pd->validate)
return TRUE;
else
- pd->unknown_fname = xetcsdup ((Extbyte *) lParam);
+ pd->unknown_fname = qxetcsdup ((Extbyte *) lParam);
break;
default:
＠＠ -430,7 +430,7 ＠＠ handle_directory_dialog_box (struct fram
pidl = qxeSHBrowseForFolder (&bi);
if (pidl)
{
- Extbyte *szDir = alloca_extbytes (MAX_PATH * MAX_XETCHAR_SIZE);
+ Extbyte *szDir = alloca_extbytes (PATH_MAX_EXTERNAL);
if (qxeSHGetPathFromIDList (pidl, szDir))
ret = tstr_to_local_file_format (szDir);
＠＠ -466,7 +466,7 ＠＠ handle_file_dialog_box (struct frame *f,
ofn.hwndOwner = FRAME_MSWINDOWS_HANDLE (f);
ofn.lpstrFile = (XELPTSTR) fnbuf;
ofn.nMaxFile = sizeof (fnbuf) / XETCHAR_SIZE;
- xetcscpy (fnbuf, XETEXT (""));
+ qxetcscpy (fnbuf, XETEXT (""));
LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil),
ofn.lpstrInitialDir);
＠＠ -480,7 +480,7 ＠＠ handle_file_dialog_box (struct frame *f,
CHECK_STRING (value);
LOCAL_FILE_FORMAT_TO_TSTR (value, fnout);
- xetcscpy (fnbuf, fnout);
+ qxetcscpy (fnbuf, fnout);
}
else if (EQ (key, Q_title))
{
Index: src/dired-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dired-msw.c,v
retrieving revision 1.17
diff -u -p -r1.17 dired-msw.c
--- src/dired-msw.c 2004/11/04 23:06:21 1.17
+++ src/dired-msw.c 2004/12/05 22:10:01
＠＠ -212,8 +212,8 ＠＠ mswindows_get_files (Lisp_Object dirfile
{
Charcount len = eicharlen (win32pattern) - 1;
if (!IS_DIRECTORY_SEP (eigetch_char (win32pattern, len)))
- eicat_c (win32pattern, "\\");
- eicat_c (win32pattern, "*");
+ eicat_ascii (win32pattern, "\\");
+ eicat_ascii (win32pattern, "*");
}
eito_external (win32pattern, Qmswindows_tstr);
＠＠ -312,17 +312,17 ＠＠ mswindows_format_file (Win32_file *file,
file_size =
file->nFileSizeHigh * (double)UINT_MAX + file->nFileSizeLow;
#if INDENT_LISTING
- eicat_c (puta, " ");
+ eicat_ascii (puta, " ");
#endif
if (display_size)
{
sprintf (buf, "%6d ", (int)((file_size + 1023.) / 1024.));
- eicat_c (puta, buf);
+ eicat_ascii (puta, buf);
}
if (file->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
- eicat_c (puta, "d");
+ eicat_ascii (puta, "d");
else
- eicat_c (puta, "-");
+ eicat_ascii (puta, "-");
buf[0] = buf[3] = buf[6] = 'r';
if (file->dwFileAttributes & FILE_ATTRIBUTE_READONLY)
buf[1] = buf[4] = buf[7] = '-';
＠＠ -355,11 +355,11 ＠＠ mswindows_format_file (Win32_file *file,
buf[2] = buf[5] = buf[8] = '-';
}
buf[9] = '\0';
- eicat_c (puta, buf);
+ eicat_ascii (puta, buf);
if (file->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
- eicat_c (puta, " 2 ");
+ eicat_ascii (puta, " 2 ");
else
- eicat_c (puta, " 1 ");
+ eicat_ascii (puta, " 1 ");
luser = Fuser_login_name (Qnil);
if (!STRINGP (luser))
sprintf (buf, "%-9d", 0);
＠＠ -427,10 +427,10 ＠＠ mswindows_format_file (Win32_file *file,
}
}
- eicat_c (puta, buf);
+ eicat_ascii (puta, buf);
eicat_raw (puta, file->cFileName, qxestrlen (file->cFileName));
if (add_newline)
- eicat_c (puta, "\n");
+ eicat_ascii (puta, "\n");
return eimake_string (puta);
}
Index: src/dumper.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dumper.c,v
retrieving revision 1.20
diff -u -p -r1.20 dumper.c
--- src/dumper.c 2004/11/04 23:06:22 1.20
+++ src/dumper.c 2004/12/05 22:10:01
＠＠ -1873,15 +1873,32 ＠＠ pdump_file_try (Wexttext *exe_path)
int
pdump_load (const Wexttext *argv0)
{
- Wexttext exe_path[PATH_MAX];
#ifdef WIN32_NATIVE
- qxeGetModuleFileName (NULL, (Extbyte *) exe_path, PATH_MAX);
+ Wexttext *exe_path = NULL;
+ int bufsize = 4096;
+ int cchpathsize;
+
+ /* Copied from mswindows_get_module_file_name (). Not clear if it's
+ kosher to malloc() yet. */
+ while (1)
+ {
+ exe_path = alloca_array (Wexttext, bufsize);
+ cchpathsize = qxeGetModuleFileName (NULL, (Extbyte *) exe_path,
+ bufsize);
+ if (!cchpathsize)
+ goto fail;
+ if (cchpathsize + 1 <= bufsize)
+ break;
+ bufsize *= 2;
+ }
+
if (!XEUNICODE_P)
{
Wexttext *wexe = MULTIBYTE_TO_WEXTTEXT ((Extbyte *) exe_path);
wext_strcpy (exe_path, wexe);
}
#else /* !WIN32_NATIVE */
+ Wexttext *exe_path;
Wexttext *w;
const Wexttext *dir, *p;
＠＠ -1914,6 +1931,7 ＠＠ pdump_load (const Wexttext *argv0)
{
/* invocation-name includes a directory component -- presumably it
is relative to cwd, not $PATH */
+ exe_path = alloca_array (Wexttext, 1 + wext_strlen (dir));
wext_strcpy (exe_path, dir);
}
else
＠＠ -1921,6 +1939,9 ＠＠ pdump_load (const Wexttext *argv0)
const Wexttext *path = wext_getenv ("PATH"); /* not egetenv --
not yet init. */
const Wexttext *name = p;
+ exe_path = alloca_array (Wexttext,
+ 10 + max (wext_strlen (name),
+ wext_strlen (path)));
for (;;)
{
p = path;
＠＠ -1954,7 +1975,7 ＠＠ pdump_load (const Wexttext *argv0)
wext_sprintf (exe_path, "./%s", name);
break;
}
- path = p+1;
+ path = p + 1;
}
}
#endif /* WIN32_NATIVE */
＠＠ -1977,6 +1998,8 ＠＠ pdump_load (const Wexttext *argv0)
}
pdump_free ();
}
+
+fail:
#endif
in_pdump = 0;
Index: src/editfns.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/editfns.c,v
retrieving revision 1.50
diff -u -p -r1.50 editfns.c
--- src/editfns.c 2004/11/04 23:06:23 1.50
+++ src/editfns.c 2004/12/05 22:10:02
＠＠ -607,7 +607,7 ＠＠ On Unix it is obtained from TMPDIR, with
DECLARE_EISTRING (eipath);
Ibyte *path;
- eicpy_c (eipath, "/tmp/");
+ eicpy_ascii (eipath, "/tmp/");
eicat_rawz (eipath, login_name);
path = eidata (eipath);
if (qxe_lstat (path, &st) < 0 && errno == ENOENT)
＠＠ -618,7 +618,7 ＠＠ On Unix it is obtained from TMPDIR, with
else
{
eicpy_rawz (eipath, egetenv ("HOME"));
- eicat_c (eipath, "/tmp/");
+ eicat_ascii (eipath, "/tmp/");
path = eidata (eipath);
if (qxe_stat (path, &st) < 0 && errno == ENOENT)
{
＠＠ -627,7 +627,7 ＠＠ On Unix it is obtained from TMPDIR, with
qxe_mkdir (path, 0700); /* ignore retvals */
eicpy_ei (eiwarnpath, eipath);
- eicat_c (eiwarnpath, ".created_by_xemacs");
+ eicat_ascii (eiwarnpath, ".created_by_xemacs");
if ((fd = qxe_open (eidata (eiwarnpath),
O_WRONLY | O_CREAT, 0644)) > 0)
{
Index: src/elhash.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/elhash.c,v
retrieving revision 1.37
diff -u -p -r1.37 elhash.c
--- src/elhash.c 2004/11/04 23:06:23 1.37
+++ src/elhash.c 2004/12/05 22:10:02
＠＠ -1,6 +1,6 ＠＠
/* Implementation of the hash table lisp object type.
Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
- Copyright (C) 1995, 1996, 2002 Ben Wing.
+ Copyright (C) 1995, 1996, 2002, 2004 Ben Wing.
Copyright (C) 1997 Free Software Foundation, Inc.
This file is part of XEmacs.
＠＠ -402,9 +402,7 ＠＠ print_hash_table (Lisp_Object obj, Lisp_
if (print_readably)
write_c_string (printcharfun, ")");
else
- {
- write_fmt_string (printcharfun, " 0x%x>", ht->header.uid);
- }
+ write_fmt_string (printcharfun, " 0x%x>", ht->header.uid);
}
static void
＠＠ -790,12 +788,8 ＠＠ hash_table_instantiate (Lisp_Object plis
Lisp_Object weakness = Qnil;
Lisp_Object data = Qnil;
- while (!NILP (plist))
+ PROPERTY_LIST_LOOP_3 (key, value, plist)
{
- Lisp_Object key, value;
- key = XCAR (plist); plist = XCDR (plist);
- value = XCAR (plist); plist = XCDR (plist);
-
if (EQ (key, Qtest)) test = value;
else if (EQ (key, Qsize)) size = value;
else if (EQ (key, Qrehash_size)) rehash_size = value;
＠＠ -1063,6 +1057,35 ＠＠ find_htentry (Lisp_Object key, const Lis
break;
return probe;
+}
+
+/* A version of Fputhash() that increments the value by the specified
+ amount and dispenses will all error checks. Assumes that tables does
+ comparison using EQ. Used by the profiling routines to avoid
+ overhead -- profiling overhead was being recorded at up to 15% of the
+ total time. */
+
+void
+inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset)
+{
+ Lisp_Hash_Table *ht = XHASH_TABLE (table);
+ htentry *entries = ht->hentries;
+ htentry *probe = entries + HASHCODE (key, ht);
+
+ LINEAR_PROBING_LOOP (probe, entries, ht->size)
+ if (EQ (probe->key, key))
+ break;
+
+ if (!HTENTRY_CLEAR_P (probe))
+ probe->value = make_int (XINT (probe->value) + offset);
+ else
+ {
+ probe->key = key;
+ probe->value = make_int (offset);
+
+ if (++ht->count >= ht->rehash_count)
+ enlarge_hash_table (ht);
+ }
}
DEFUN ("gethash", Fgethash, 2, 3, 0, /*
Index: src/elhash.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/elhash.h,v
retrieving revision 1.13
diff -u -p -r1.13 elhash.h
--- src/elhash.h 2003/01/12 11:08:12 1.13
+++ src/elhash.h 2004/12/05 22:10:02
＠＠ -97,4 +97,6 ＠＠ void prune_weak_hash_tables (void);
void pdump_reorganize_hash_table (Lisp_Object);
+void inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset);
+
#endif /* INCLUDED_elhash_h_ */
Index: src/eval.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/eval.c,v
retrieving revision 1.83
diff -u -p -r1.83 eval.c
--- src/eval.c 2004/11/04 23:06:25 1.83
+++ src/eval.c 2004/12/05 22:10:04
＠＠ -1,7 +1,7 ＠＠
/* Evaluator for XEmacs Lisp interpreter.
Copyright (C) 1985-1987, 1992-1994 Free Software Foundation, Inc.
Copyright (C) 1995 Sun Microsystems, Inc.
- Copyright (C) 2000, 2001, 2002, 2003 Ben Wing.
+ Copyright (C) 2000, 2001, 2002, 2003, 2004 Ben Wing.
This file is part of XEmacs.
＠＠ -1154,25 +1154,24 ＠＠ The return value of the `setq' form is t
(args))
{
/* This function can GC */
- Lisp_Object symbol, tail, val = Qnil;
int nargs;
- struct gcpro gcpro1;
+ Lisp_Object retval = Qnil;
GET_LIST_LENGTH (args, nargs);
if (nargs & 1) /* Odd number of arguments? */
Fsignal (Qwrong_number_of_arguments, list2 (Qsetq, make_int (nargs)));
-
- GCPRO1 (val);
- PROPERTY_LIST_LOOP (tail, symbol, val, args)
+ GC_PROPERTY_LIST_LOOP_3 (symbol, val, args)
{
val = Feval (val);
Fset (symbol, val);
+ retval = val;
}
- UNGCPRO;
- return val;
+ END_GC_PROPERTY_LIST_LOOP (symbol);
+
+ return retval;
}
DEFUN ("quote", Fquote, 1, UNEVALLED, 0, /*
＠＠ -4825,7 +4824,8 ＠＠ flagged_a_squirmer (Lisp_Object error_co
(struct call_trapping_problems *) get_opaque_ptr (opaque);
if (!(inhibit_flags & INHIBIT_WARNING_ISSUE)
- && !warning_will_be_discarded (current_warning_level ()))
+ && !warning_will_be_discarded (current_warning_level ())
+ && !EQ (error_conditions, Qquit))
{
struct gcpro gcpro1;
Lisp_Object lstream = Qnil;
＠＠ -4898,7 +4898,7 ＠＠ issue_call_trapping_problems_warning (Li
p->thrown_tag, p->thrown_value);
warn_when_safe_lispobj (Qerror, current_warning_level (), errstr);
}
- else if (p->caught_error)
+ else if (p->caught_error && !EQ (p->error_conditions, Qquit))
{
Lisp_Object errstr;
/* #### This should call
Index: src/event-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-msw.c,v
retrieving revision 1.100
diff -u -p -r1.100 event-msw.c
--- src/event-msw.c 2004/11/04 23:06:26 1.100
+++ src/event-msw.c 2004/12/05 22:10:06
＠＠ -3207,7 +3207,7 ＠＠ mswindows_wnd_proc (HWND hwnd, UINT mess
may be copying an ANSI string into it. Easiest to just
zero the whole thing. */
xzero (*tttextw->szText);
- xetcsncpy ((Extbyte *) tttextw->szText, btextext, 79);
+ qxetcsncpy ((Extbyte *) tttextw->szText, btextext, 79);
}
else
tttextw->lpszText = NULL;
＠＠ -3782,7 +3782,7 ＠＠ mswindows_wnd_proc (HWND hwnd, UINT mess
Extbyte *fname_unicode;
WIN32_FIND_DATAW wfd;
LPWSTR resolved =
- alloca_array (WCHAR, PATH_MAX + 1);
+ alloca_array (WCHAR, PATH_MAX_EXTERNAL + 1);
TO_EXTERNAL_FORMAT (DATA, (fname, fnamelen),
C_STRING_ALLOCA,
＠＠ -3806,10 +3806,10 ＠＠ mswindows_wnd_proc (HWND hwnd, UINT mess
/* Another Cygwin prototype error,
fixed in v2.2 of w32api */
XECOMCALL4 (psl, GetPath, (LPSTR) resolved,
- PATH_MAX, &wfd, 0)
+ PATH_MAX_EXTERNAL, &wfd, 0)
#else
XECOMCALL4 (psl, GetPath, resolved,
- PATH_MAX, &wfd, 0)
+ PATH_MAX_EXTERNAL, &wfd, 0)
#endif
== S_OK)
TO_INTERNAL_FORMAT (C_STRING, resolved,
＠＠ -3842,7 +3842,7 ＠＠ mswindows_wnd_proc (HWND hwnd, UINT mess
Extbyte *fname_unicode;
WIN32_FIND_DATAA wfd;
LPSTR resolved =
- alloca_array (CHAR, PATH_MAX + 1);
+ alloca_array (CHAR, PATH_MAX_EXTERNAL + 1);
/* Always Unicode. Not obvious from the
IPersistFile documentation, but look under
＠＠ -3856,7 +3856,7 ＠＠ mswindows_wnd_proc (HWND hwnd, UINT mess
(LPWSTR) fname_unicode,
STGM_READ) == S_OK
&& XECOMCALL4 (psl, GetPath, resolved,
- PATH_MAX, &wfd, 0) == S_OK)
+ PATH_MAX_EXTERNAL, &wfd, 0) == S_OK)
TO_INTERNAL_FORMAT (C_STRING, resolved,
ALLOCA, (fname, fnamelen),
Qmswindows_tstr);
Index: src/events.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/events.c,v
retrieving revision 1.62
diff -u -p -r1.62 events.c
--- src/events.c 2004/11/04 23:06:27 1.62
+++ src/events.c 2004/12/05 22:10:06
＠＠ -1542,20 +1542,20 ＠＠ format_event_object (Eistring *buf, Lisp
UNGCPRO;
return;
}
- case magic_eval_event: eicat_c (buf, "magic-eval"); return;
- case pointer_motion_event: eicat_c (buf, "motion"); return;
- case misc_user_event: eicat_c (buf, "misc-user"); return;
- case eval_event: eicat_c (buf, "eval"); return;
- case process_event: eicat_c (buf, "process"); return;
- case timeout_event: eicat_c (buf, "timeout"); return;
- case empty_event: eicat_c (buf, "empty"); return;
- case dead_event: eicat_c (buf, "DEAD-EVENT"); return;
+ case magic_eval_event: eicat_ascii (buf, "magic-eval"); return;
+ case pointer_motion_event: eicat_ascii (buf, "motion"); return;
+ case misc_user_event: eicat_ascii (buf, "misc-user"); return;
+ case eval_event: eicat_ascii (buf, "eval"); return;
+ case process_event: eicat_ascii (buf, "process"); return;
+ case timeout_event: eicat_ascii (buf, "timeout"); return;
+ case empty_event: eicat_ascii (buf, "empty"); return;
+ case dead_event: eicat_ascii (buf, "DEAD-EVENT"); return;
default:
abort ();
return;
}
#define modprint(x,y) \
- do { if (brief) eicat_c (buf, (y)); else eicat_c (buf, (x)); } while (0)
+ do { if (brief) eicat_ascii (buf, (y)); else eicat_ascii (buf, (x)); } while (0)
if (mod & XEMACS_MOD_CONTROL) modprint ("control-", "C-");
if (mod & XEMACS_MOD_META) modprint ("meta-", "M-");
if (mod & XEMACS_MOD_SUPER) modprint ("super-", "S-");
＠＠ -1564,7 +1564,7 ＠＠ format_event_object (Eistring *buf, Lisp
if (mod & XEMACS_MOD_SHIFT) modprint ("shift-", "Sh-");
if (mouse_p)
{
- eicat_c (buf, "button");
+ eicat_ascii (buf, "button");
--mouse_p;
}
＠＠ -1586,14 +1586,14 ＠＠ format_event_object (Eistring *buf, Lisp
else if (EQ (key, QKbackspace)) str = "BS";
}
if (str)
- eicat_c (buf, str);
+ eicat_ascii (buf, str);
else
eicat_lstr (buf, XSYMBOL (key)->name);
}
else
abort ();
if (mouse_p)
- eicat_c (buf, "up");
+ eicat_ascii (buf, "up");
}
void
Index: src/fileio.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/fileio.c,v
retrieving revision 1.101
diff -u -p -r1.101 fileio.c
--- src/fileio.c 2004/11/04 23:06:29 1.101
+++ src/fileio.c 2004/12/05 22:10:08
＠＠ -1341,7 +1341,7 ＠＠ No component of the resulting pathname w
}
{
- Ibyte resolved_path[PATH_MAX];
+ Ibyte resolved_path[PATH_MAX_INTERNAL];
Bytecount elen = XSTRING_LENGTH (expanded_name);
Ibyte *path;
Ibyte *p;
Index: src/glyphs-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-gtk.c,v
retrieving revision 1.27
diff -u -p -r1.27 glyphs-gtk.c
--- src/glyphs-gtk.c 2004/11/04 23:06:33 1.27
+++ src/glyphs-gtk.c 2004/12/05 22:10:08
＠＠ -1701,7 +1701,7 ＠＠ font_instantiate (Lisp_Object image_inst
Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
GdkColor fg, bg;
GdkFont *source, *mask;
- char source_name[PATH_MAX], mask_name[PATH_MAX], dummy;
+ char source_name[PATH_MAX_INTERNAL], mask_name[PATH_MAX_INTERNAL], dummy;
int source_char, mask_char;
int count;
Lisp_Object foreground, background;
Index: src/glyphs-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-msw.c,v
retrieving revision 1.53
diff -u -p -r1.53 glyphs-msw.c
--- src/glyphs-msw.c 2004/11/04 23:06:33 1.53
+++ src/glyphs-msw.c 2004/12/05 22:10:09
＠＠ -2486,7 +2486,7 ＠＠ static HTREEITEM add_tree_item (Lisp_Obj
else
LISP_STRING_TO_TSTR (item, tvitem.item.pszText);
- tvitem.item.cchTextMax = xetcslen ((Extbyte *) tvitem.item.pszText);
+ tvitem.item.cchTextMax = qxetcslen ((Extbyte *) tvitem.item.pszText);
if ((ret = (HTREEITEM) qxeSendMessage (wnd, TVM_INSERTITEM,
0, (LPARAM) &tvitem)) == 0)
＠＠ -2605,7 +2605,7 ＠＠ add_tab_item (Lisp_Object image_instance
LISP_STRING_TO_TSTR (item, tcitem.pszText);
}
- tcitem.cchTextMax = xetcslen ((Extbyte *) tcitem.pszText);
+ tcitem.cchTextMax = qxetcslen ((Extbyte *) tcitem.pszText);
if ((ret = qxeSendMessage (wnd, TCM_INSERTITEM, i, (LPARAM) &tcitem)) < 0)
gui_error ("error adding tab entry", item);
Index: src/glyphs-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-x.c,v
retrieving revision 1.80
diff -u -p -r1.80 glyphs-x.c
--- src/glyphs-x.c 2004/11/04 23:06:34 1.80
+++ src/glyphs-x.c 2004/12/05 22:10:10
＠＠ -1838,7 +1838,7 ＠＠ font_instantiate (Lisp_Object image_inst
Display *dpy;
XColor fg, bg;
Font source, mask;
- Ibyte source_name[PATH_MAX], mask_name[PATH_MAX], dummy;
+ Ibyte source_name[PATH_MAX_INTERNAL], mask_name[PATH_MAX_INTERNAL], dummy;
int source_char, mask_char;
int count;
Lisp_Object foreground, background;
Index: src/keymap.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/keymap.c,v
retrieving revision 1.52
diff -u -p -r1.52 keymap.c
--- src/keymap.c 2004/11/04 23:06:38 1.52
+++ src/keymap.c 2004/12/05 22:10:12
＠＠ -3335,26 +3335,26 ＠＠ of a key read from the user rather than
LIST_LOOP (rest, key)
{
Lisp_Object keysym = XCAR (rest);
- if (EQ (keysym, Qcontrol)) eicat_c (bufp, "C-");
- else if (EQ (keysym, Qctrl)) eicat_c (bufp, "C-");
- else if (EQ (keysym, Qmeta)) eicat_c (bufp, "M-");
- else if (EQ (keysym, Qsuper)) eicat_c (bufp, "S-");
- else if (EQ (keysym, Qhyper)) eicat_c (bufp, "H-");
- else if (EQ (keysym, Qalt)) eicat_c (bufp, "A-");
- else if (EQ (keysym, Qshift)) eicat_c (bufp, "Sh-");
+ if (EQ (keysym, Qcontrol)) eicat_ascii (bufp, "C-");
+ else if (EQ (keysym, Qctrl)) eicat_ascii (bufp, "C-");
+ else if (EQ (keysym, Qmeta)) eicat_ascii (bufp, "M-");
+ else if (EQ (keysym, Qsuper)) eicat_ascii (bufp, "S-");
+ else if (EQ (keysym, Qhyper)) eicat_ascii (bufp, "H-");
+ else if (EQ (keysym, Qalt)) eicat_ascii (bufp, "A-");
+ else if (EQ (keysym, Qshift)) eicat_ascii (bufp, "Sh-");
else if (CHAR_OR_CHAR_INTP (keysym))
eicat_ch (bufp, XCHAR_OR_CHAR_INT (keysym));
else
{
CHECK_SYMBOL (keysym);
#if 0 /* This is bogus */
- if (EQ (keysym, QKlinefeed)) eicat_c (bufp, "LFD");
- else if (EQ (keysym, QKtab)) eicat_c (bufp, "TAB");
- else if (EQ (keysym, QKreturn)) eicat_c (bufp, "RET");
- else if (EQ (keysym, QKescape)) eicat_c (bufp, "ESC");
- else if (EQ (keysym, QKdelete)) eicat_c (bufp, "DEL");
- else if (EQ (keysym, QKspace)) eicat_c (bufp, "SPC");
- else if (EQ (keysym, QKbackspace)) eicat_c (bufp, "BS");
+ if (EQ (keysym, QKlinefeed)) eicat_ascii (bufp, "LFD");
+ else if (EQ (keysym, QKtab)) eicat_ascii (bufp, "TAB");
+ else if (EQ (keysym, QKreturn)) eicat_ascii (bufp, "RET");
+ else if (EQ (keysym, QKescape)) eicat_ascii (bufp, "ESC");
+ else if (EQ (keysym, QKdelete)) eicat_ascii (bufp, "DEL");
+ else if (EQ (keysym, QKspace)) eicat_ascii (bufp, "SPC");
+ else if (EQ (keysym, QKbackspace)) eicat_ascii (bufp, "BS");
else
#endif
eicat_lstr (bufp, XSYMBOL (keysym)->name);
＠＠ -3567,7 +3567,7 ＠＠ format_raw_keys (Lisp_Key_Data *keys, in
XSET_EVENT_KEY_MODIFIERS (event, KEY_DATA_MODIFIERS (&keys[i]));
format_event_object (buf, event, 1);
if (i < count - 1)
- eicat_c (buf, " ");
+ eicat_ascii (buf, " ");
}
Fdeallocate_event (event);
}
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.116
diff -u -p -r1.116 lisp.h
--- src/lisp.h 2004/11/04 23:06:39 1.116
+++ src/lisp.h 2004/12/05 22:10:14
＠＠ -2205,13 +2205,29 ＠＠ EXTERNAL_PROPERTY_LIST_LOOP_7 (key, valu
((void) signal_circular_property_list_error (list)) : \
((void) 0)))))
-#define PROPERTY_LIST_LOOP(tail, key, value, plist) \
- for (tail = plist; \
- NILP (tail) ? 0 : \
- (key = XCAR (tail), tail = XCDR (tail), \
- value = XCAR (tail), tail = XCDR (tail), 1); \
+#define PRIVATE_PROPERTY_LIST_LOOP_4(tail, key, value, plist) \
+ for (tail = plist; \
+ NILP (tail) ? 0 : \
+ (key = XCAR (tail), tail = XCDR (tail), \
+ value = XCAR (tail), tail = XCDR (tail), 1); \
)
+#define PROPERTY_LIST_LOOP_3(key, value, plist) \
+ Lisp_Object key, value, tail_##key; \
+ PRIVATE_PROPERTY_LIST_LOOP_4 (tail_##key, key, value, plist)
+
+#define GC_PROPERTY_LIST_LOOP_3(key, value, plist) \
+do { \
+ XGCDECL3 (key); \
+ Lisp_Object key, value, tail_##key; \
+ XGCPRO3 (key, key, value, tail_##key); \
+ PRIVATE_PROPERTY_LIST_LOOP_4 (tail_##key, key, value, plist)
+
+#define END_GC_PROPERTY_LIST_LOOP(key) \
+ XUNGCPRO (key); \
+} \
+while (0)
+
/* Return 1 if LIST is properly acyclic and nil-terminated, else 0. */
DECLARE_INLINE_HEADER (
int
＠＠ -4595,8 +4611,13 ＠＠ void internal_object_printer (Lisp_Objec
/* Defined in rangetab.c */
EXFUN (Fclear_range_table, 1);
EXFUN (Fget_range_table, 3);
-EXFUN (Fmake_range_table, 0);
+EXFUN (Fmake_range_table, 1);
EXFUN (Fput_range_table, 4);
+
+extern Lisp_Object Qstart_closed_end_open;
+extern Lisp_Object Qstart_open_end_open;
+extern Lisp_Object Qstart_closed_end_closed;
+extern Lisp_Object Qstart_open_end_closed;
void put_range_table (Lisp_Object, EMACS_INT, EMACS_INT, Lisp_Object);
int unified_range_table_bytes_needed (Lisp_Object);
Index: src/nt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/nt.c,v
retrieving revision 1.44
diff -u -p -r1.44 nt.c
--- src/nt.c 2004/11/04 23:06:44 1.44
+++ src/nt.c 2004/12/05 22:10:15
＠＠ -1084,12 +1084,12 ＠＠ mswindows_link (const Ibyte *old, const
struct
{
WIN32_STREAM_ID wid;
- WCHAR wbuffer[MAX_PATH]; /* extra space for link name */
+ WCHAR wbuffer[_MAX_PATH]; /* extra space for link name */
} data;
TO_EXTERNAL_FORMAT (C_STRING, new,
ALLOCA, (newuni, wlen), Qmswindows_unicode);
- if (wlen / sizeof (WCHAR) < MAX_PATH)
+ if (wlen / sizeof (WCHAR) < _MAX_PATH)
{
LPVOID context = NULL;
DWORD wbytes = 0;
＠＠ -1998,7 +1998,7 ＠＠ All path elements in FILENAME are conver
*/
(filename))
{
- Extbyte shortname[MAX_PATH * MAX_XETCHAR_SIZE];
+ Extbyte shortname[PATH_MAX_EXTERNAL];
Extbyte *fileext;
Ibyte *shortint;
Index: src/objects-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-msw.c,v
retrieving revision 1.43
diff -u -p -r1.43 objects-msw.c
--- src/objects-msw.c 2004/11/04 23:06:45 1.43
+++ src/objects-msw.c 2004/12/05 22:10:15
＠＠ -1492,7 +1492,7 ＠＠ parse_font_spec (const Ibyte *namestr,
C_STRING_TO_TSTR (fontname, extfontname);
if (logfont)
{
- xetcsncpy ((Extbyte *) logfont->lfFaceName, extfontname,
+ qxetcsncpy ((Extbyte *) logfont->lfFaceName, extfontname,
LF_FACESIZE - 1);
logfont->lfFaceName[LF_FACESIZE - 1] = 0;
}
Index: src/process-nt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process-nt.c,v
retrieving revision 1.35
diff -u -p -r1.35 process-nt.c
--- src/process-nt.c 2004/11/04 23:06:46 1.35
+++ src/process-nt.c 2004/12/05 22:10:16
＠＠ -771,7 +771,7 ＠＠ nt_create_process (Lisp_Process *p,
{
DECLARE_EISTRING (progext);
eicpy_lstr (progext, program);
- eicat_c (progext, ".exe");
+ eicat_ascii (progext, ".exe");
eito_external (progext, Qmswindows_tstr);
image_type = qxeSHGetFileInfo (eiextdata (progext), 0, NULL, 0,
SHGFI_EXETYPE);
＠＠ -950,7 +950,7 ＠＠ nt_create_process (Lisp_Process *p,
while leaving the real app name as argv[0]. */
if (is_dos_app)
{
- cmdname = alloca_ibytes (PATH_MAX);
+ cmdname = alloca_ibytes (PATH_MAX_INTERNAL);
if (egetenv ("CMDPROXY"))
qxestrcpy (cmdname, egetenv ("CMDPROXY"));
else
Index: src/profile.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/profile.c,v
retrieving revision 1.21
diff -u -p -r1.21 profile.c
--- src/profile.c 2004/11/04 23:06:47 1.21
+++ src/profile.c 2004/12/05 22:10:16
＠＠ -128,16 +128,16 ＠＠ create_profile_tables (void)
create_timing_profile_table ();
if (NILP (Vtotal_timing_profile_table))
Vtotal_timing_profile_table =
- make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
+ make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
if (NILP (Vcall_count_profile_table))
Vcall_count_profile_table =
- make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
+ make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
if (NILP (Vgc_usage_profile_table))
Vgc_usage_profile_table =
- make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
+ make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
if (NILP (Vtotal_gc_usage_profile_table))
Vtotal_gc_usage_profile_table =
- make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
+ make_lisp_hash_table (1000, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ);
}
static Lisp_Object
＠＠ -178,13 +178,8 ＠＠ current_profile_function (void)
void
profile_record_consing (EMACS_INT size)
{
- Lisp_Object fun;
- Lisp_Object count;
-
in_profiling++;
- fun = current_profile_function ();
- count = Fgethash (fun, Vgc_usage_profile_table, Qzero);
- Fputhash (fun, make_int (size + XINT (count)), Vgc_usage_profile_table);
+ inchash_eq (current_profile_function (), Vgc_usage_profile_table, size);
in_profiling--;
}
＠＠ -228,11 +223,7 ＠＠ profile_record_about_to_call (struct bac
/* See comments in create_timing_profile_table(). */
pregrow_hash_table_if_necessary (big_profile_table, EXTRA_BREATHING_ROOM);
profiling_lock = 0;
- Fputhash (*bt->function,
- make_int (1 + XINT (Fgethash (*bt->function,
- Vcall_count_profile_table,
- Qzero))),
- Vcall_count_profile_table);
+ inchash_eq (*bt->function, Vcall_count_profile_table, 1);
/* This may be set if the function was in its preamble at the time that
`start-profiling' was called. If so, we shouldn't reset the values
because we may get inconsistent results, since we have already started
Index: src/rangetab.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/rangetab.c,v
retrieving revision 1.17
diff -u -p -r1.17 rangetab.c
--- src/rangetab.c 2004/11/04 23:06:48 1.17
+++ src/rangetab.c 2004/12/05 22:10:16
＠＠ -1,6 +1,6 ＠＠
/* XEmacs routines to deal with range tables.
Copyright (C) 1995 Sun Microsystems, Inc.
- Copyright (C) 1995, 2002 Ben Wing.
+ Copyright (C) 1995, 2002, 2004 Ben Wing.
This file is part of XEmacs.
＠＠ -30,11 +30,55 ＠＠ Boston, MA 02111-1307, USA. */
Lisp_Object Qrange_tablep;
Lisp_Object Qrange_table;
+Lisp_Object Qstart_closed_end_open;
+Lisp_Object Qstart_open_end_open;
+Lisp_Object Qstart_closed_end_closed;
+Lisp_Object Qstart_open_end_closed;
+
/************************************************************************/
/* Range table object */
/************************************************************************/
+static enum range_table_type
+range_table_symbol_to_type (Lisp_Object symbol)
+{
+ if (NILP (symbol))
+ return RANGE_START_CLOSED_END_OPEN;
+
+ CHECK_SYMBOL (symbol);
+ if (EQ (symbol, Qstart_closed_end_open))
+ return RANGE_START_CLOSED_END_OPEN;
+ if (EQ (symbol, Qstart_closed_end_closed))
+ return RANGE_START_CLOSED_END_CLOSED;
+ if (EQ (symbol, Qstart_open_end_open))
+ return RANGE_START_OPEN_END_OPEN;
+ if (EQ (symbol, Qstart_open_end_closed))
+ return RANGE_START_OPEN_END_CLOSED;
+
+ invalid_constant ("Unknown range table type", symbol);
+ RETURN_NOT_REACHED (RANGE_START_CLOSED_END_OPEN);
+}
+
+static Lisp_Object
+range_table_type_to_symbol (enum range_table_type type)
+{
+ switch (type)
+ {
+ case RANGE_START_CLOSED_END_OPEN:
+ return Qstart_closed_end_open;
+ case RANGE_START_CLOSED_END_CLOSED:
+ return Qstart_closed_end_closed;
+ case RANGE_START_OPEN_END_OPEN:
+ return Qstart_open_end_open;
+ case RANGE_START_OPEN_END_CLOSED:
+ return Qstart_open_end_closed;
+ }
+
+ abort ();
+ return Qnil;
+}
+
/* We use a sorted array of ranges.
#### We should be using the gap array stuff from extents.c. This
＠＠ -58,20 +102,37 ＠＠ print_range_table (Lisp_Object obj, Lisp
Lisp_Range_Table *rt = XRANGE_TABLE (obj);
int i;
- write_c_string (printcharfun, "#s(range-table data (");
+ if (print_readably)
+ write_fmt_string_lisp (printcharfun, "#s(range-table type %s data (",
+ 1, range_table_type_to_symbol (rt->type));
+ else
+ write_c_string (printcharfun, "#<range-table ");
for (i = 0; i < Dynarr_length (rt->entries); i++)
{
struct range_table_entry *rte = Dynarr_atp (rt->entries, i);
+ int so, ec;
if (i > 0)
write_c_string (printcharfun, " ");
- if (rte->first == rte->last)
- write_fmt_string (printcharfun, "%ld ", (long) (rte->first));
- else
- write_fmt_string (printcharfun, "(%ld %ld) ", (long) (rte->first),
- (long) (rte->last));
+ switch (rt->type)
+ {
+ case RANGE_START_CLOSED_END_OPEN: so = 0, ec = 0; break;
+ case RANGE_START_CLOSED_END_CLOSED: so = 0, ec = 1; break;
+ case RANGE_START_OPEN_END_OPEN: so = 1, ec = 0; break;
+ case RANGE_START_OPEN_END_CLOSED: so = 1; ec = 1; break;
+ default: abort (); so = 0, ec = 0; break;
+ }
+ write_fmt_string (printcharfun, "%c%ld %ld%c ",
+ print_readably ? '(' : so ? '(' : '[',
+ (long) (rte->first - so),
+ (long) (rte->last - ec),
+ print_readably ? ')' : ec ? ']' : ')'
+ );
print_internal (rte->val, printcharfun, 1);
}
- write_c_string (printcharfun, "))");
+ if (print_readably)
+ write_c_string (printcharfun, "))");
+ else
+ write_fmt_string (printcharfun, " 0x%x>", rt->header.uid);
}
static int
＠＠ -180,7 +241,7 ＠＠ verify_range_table (Lisp_Range_Table *rt
struct range_table_entry *rte = Dynarr_atp (rt->entries, i);
assert (rte->last >= rte->first);
if (i > 0)
- assert (Dynarr_at (rt->entries, i - 1).last < rte->first);
+ assert (Dynarr_at (rt->entries, i - 1).last <= rte->first);
}
}
＠＠ -207,8 +268,8 ＠＠ get_range_table (EMACS_INT pos, int nent
of the list), so NEWPOS must round down. */
int newpos = (left + right) >> 1;
struct range_table_entry *entry = tab + newpos;
- if (pos > entry->last)
- left = newpos+1;
+ if (pos >= entry->last)
+ left = newpos + 1;
else if (pos < entry->first)
right = newpos;
else
＠＠ -226,16 +287,50 ＠＠ Return non-nil if OBJECT is a range tabl
return RANGE_TABLEP (object) ? Qt : Qnil;
}
-DEFUN ("make-range-table", Fmake_range_table, 0, 0, 0, /*
+DEFUN ("range-table-type", Frange_table_type, 1, 1, 0, /*
+Return non-nil if OBJECT is a range table.
+*/
+ (range_table))
+{
+ CHECK_RANGE_TABLE (range_table);
+ return range_table_type_to_symbol (XRANGE_TABLE (range_table)->type);
+}
+
+DEFUN ("make-range-table", Fmake_range_table, 0, 1, 0, /*
Return a new, empty range table.
You can manipulate it using `put-range-table', `get-range-table',
`remove-range-table', and `clear-range-table'.
+Range tables allow you to efficiently set values for ranges of integers.
+
+ TYPE is a symbol indicating how ranges are assumed to function at their
+ ends. It can be one of
+
+ SYMBOL RANGE-START RANGE-END
+ ------ ----------- ---------
+ `start-closed-end-open' (the default) closed open
+ `start-closed-end-closed' closed closed
+ `start-open-end-open' open open
+ `start-open-end-closed' open closed
+
+ A `closed' endpoint of a range means that the number at that end is included
+ in the range. For an `open' endpoint, the number would not be included.
+
+ For example, a closed-open range from 5 to 20 would be indicated as [5,
+ 20) where a bracket indicates a closed end and a parenthesis an open end,
+ and would mean `all the numbers between 5 and 20', including 5 but not 20.
+ This seems a little strange at first but is in fact extremely common in
+ the outside world as well as in computers and makes things work sensibly.
+ For example, if I say "there are seven days between today and next week
+ today", I'm including today but not next week today; if I included both,
+ there would be eight days. Similarly, there are 15 (= 20 - 5) elements in
+ the range [5, 20), but 16 in the range [5, 20].
*/
- ())
+ (type))
{
Lisp_Range_Table *rt = alloc_lcrecord_type (Lisp_Range_Table,
&lrecord_range_table);
rt->entries = Dynarr_new (range_table_entry);
+ rt->type = range_table_symbol_to_type (type);
return wrap_range_table (rt);
}
＠＠ -253,6 +348,7 ＠＠ The values will not themselves be copied
rtnew = alloc_lcrecord_type (Lisp_Range_Table, &lrecord_range_table);
rtnew->entries = Dynarr_new (range_table_entry);
+ rtnew->type = rt->type;
Dynarr_add_many (rtnew->entries, Dynarr_atp (rt->entries, 0),
Dynarr_length (rt->entries));
＠＠ -284,6 +380,24 ＠＠ put_range_table (Lisp_Object table, EMAC
int insert_me_here = -1;
Lisp_Range_Table *rt = XRANGE_TABLE (table);
+ /* Fix up the numbers in accordance with the open/closedness to make
+ them behave like default open/closed. */
+
+ switch (rt->type)
+ {
+ case RANGE_START_CLOSED_END_OPEN: break;
+ case RANGE_START_CLOSED_END_CLOSED: last++; break;
+ case RANGE_START_OPEN_END_OPEN: first++; break;
+ case RANGE_START_OPEN_END_CLOSED: first++, last++; break;
+ }
+
+ if (first == last)
+ return;
+ if (first > last)
+ /* This will happen if originally first == last and both ends are
+ open. #### Should we signal an error? */
+ return;
+
/* Now insert in the proper place. This gets tricky because
we may be overlapping one or more existing ranges and need
to fix them up. */
＠＠ -304,44 +418,55 ＠＠ put_range_table (Lisp_Object table, EMAC
/* completely after the new range. No more possibilities of
finding overlapping ranges. */
break;
+ /* At this point the existing ENTRY overlaps or touches the new one. */
if (entry->first < first && entry->last <= last)
{
/* looks like:
+
+ [ NEW )
+ [ EXISTING )
- [ NEW ]
- [ EXISTING ]
+ or
+ [ NEW )
+ [ EXISTING )
+
*/
/* truncate the end off of it. */
- entry->last = first - 1;
+ entry->last = first;
}
else if (entry->first < first && entry->last > last)
/* looks like:
- [ NEW ]
- [ EXISTING ]
+ [ NEW )
+ [ EXISTING )
*/
/* need to split this one in two. */
{
struct range_table_entry insert_me_too;
- insert_me_too.first = last + 1;
+ insert_me_too.first = last;
insert_me_too.last = entry->last;
insert_me_too.val = entry->val;
- entry->last = first - 1;
+ entry->last = first;
Dynarr_insert_many (rt->entries, &insert_me_too, 1, i + 1);
}
- else if (entry->last > last)
+ else if (entry->last >= last)
{
/* looks like:
+
+ [ NEW )
+ [ EXISTING )
- [ NEW ]
- [ EXISTING ]
+ or
+ [ NEW )
+ [ EXISTING )
+
*/
/* truncate the start off of it. */
- entry->first = last + 1;
+ entry->first = last;
}
else
{
＠＠ -377,7 +502,7 ＠＠ put_range_table (Lisp_Object table, EMAC
{
struct range_table_entry *entry = Dynarr_atp (rt->entries,
insert_me_here - 1);
- if (EQ (val, entry->val) && entry->last == first - 1)
+ if (EQ (val, entry->val) && entry->last == first)
{
entry->last = last;
Dynarr_delete_many (rt->entries, insert_me_here, 1);
＠＠ -392,7 +517,7 ＠＠ put_range_table (Lisp_Object table, EMAC
{
struct range_table_entry *entry = Dynarr_atp (rt->entries,
insert_me_here + 1);
- if (EQ (val, entry->val) && entry->first == last + 1)
+ if (EQ (val, entry->val) && entry->first == last)
{
entry->first = first;
Dynarr_delete_many (rt->entries, insert_me_here, 1);
＠＠ -401,7 +526,7 ＠＠ put_range_table (Lisp_Object table, EMAC
}
DEFUN ("put-range-table", Fput_range_table, 4, 4, 0, /*
-Set the value for range (START, END) to be VALUE in RANGE-TABLE.
+Set the value for range START .. END to be VALUE in RANGE-TABLE.
*/
(start, end, value, range_table))
{
＠＠ -421,7 +546,7 ＠＠ Set the value for range (START, END) to
}
DEFUN ("remove-range-table", Fremove_range_table, 3, 3, 0, /*
-Remove the value for range (START, END) in RANGE-TABLE.
+Remove the value for range START .. END in RANGE-TABLE.
*/
(start, end, range_table))
{
＠＠ -491,6 +616,15 ＠＠ exactly once) if FUNCTION modifies or de
/************************************************************************/
static int
+rangetab_type_validate (Lisp_Object UNUSED (keyword), Lisp_Object value,
+ Error_Behavior UNUSED (errb))
+{
+ /* #### should deal with ERRB */
+ range_table_symbol_to_type (value);
+ return 1;
+}
+
+static int
rangetab_data_validate (Lisp_Object UNUSED (keyword), Lisp_Object value,
Error_Behavior UNUSED (errb))
{
＠＠ -509,27 +643,31 ＠＠ rangetab_data_validate (Lisp_Object UNUS
}
static Lisp_Object
-rangetab_instantiate (Lisp_Object data)
+rangetab_instantiate (Lisp_Object plist)
{
- Lisp_Object rangetab = Fmake_range_table ();
+ Lisp_Object data = Qnil, type = Qnil;
- if (!NILP (data))
+ PROPERTY_LIST_LOOP_3 (key, value, plist)
{
- data = Fcar (Fcdr (data)); /* skip over 'data keyword */
- while (!NILP (data))
- {
- Lisp_Object range = Fcar (data);
- Lisp_Object val = Fcar (Fcdr (data));
-
- data = Fcdr (Fcdr (data));
- if (CONSP (range))
- Fput_range_table (Fcar (range), Fcar (Fcdr (range)), val,
- rangetab);
- else
- Fput_range_table (range, range, val, rangetab);
- }
+ if (EQ (key, Qtype)) type = value;
+ else if (EQ (key, Qdata)) data = value;
+ else
+ abort ();
}
+ Lisp_Object rangetab = Fmake_range_table (type);
+
+ {
+ PROPERTY_LIST_LOOP_3 (range, val, data)
+ {
+ if (CONSP (range))
+ Fput_range_table (Fcar (range), Fcar (Fcdr (range)), val,
+ rangetab);
+ else
+ Fput_range_table (range, range, val, rangetab);
+ }
+ }
+
return rangetab;
}
＠＠ -733,7 +871,13 ＠＠ syms_of_rangetab (void)
DEFSYMBOL_MULTIWORD_PREDICATE (Qrange_tablep);
DEFSYMBOL (Qrange_table);
+ DEFSYMBOL (Qstart_closed_end_open);
+ DEFSYMBOL (Qstart_open_end_open);
+ DEFSYMBOL (Qstart_closed_end_closed);
+ DEFSYMBOL (Qstart_open_end_closed);
+
DEFSUBR (Frange_table_p);
+ DEFSUBR (Frange_table_type);
DEFSUBR (Fmake_range_table);
DEFSUBR (Fcopy_range_table);
DEFSUBR (Fget_range_table);
＠＠ -751,4 +895,5 ＠＠ structure_type_create_rangetab (void)
st = define_structure_type (Qrange_table, 0, rangetab_instantiate);
define_structure_type_keyword (st, Qdata, rangetab_data_validate);
+ define_structure_type_keyword (st, Qtype, rangetab_type_validate);
}
Index: src/rangetab.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/rangetab.h,v
retrieving revision 1.5
diff -u -p -r1.5 rangetab.h
--- src/rangetab.h 2002/03/29 04:48:22 1.5
+++ src/rangetab.h 2004/12/05 22:10:16
＠＠ -1,6 +1,6 ＠＠
/* XEmacs routines to deal with range tables.
Copyright (C) 1995 Sun Microsystems, Inc.
- Copyright (C) 1995 Ben Wing.
+ Copyright (C) 1995, 2004 Ben Wing.
This file is part of XEmacs.
＠＠ -39,10 +39,19 ＠＠ typedef struct
Dynarr_declare (range_table_entry);
} range_table_entry_dynarr;
+enum range_table_type
+{
+ RANGE_START_CLOSED_END_OPEN,
+ RANGE_START_CLOSED_END_CLOSED,
+ RANGE_START_OPEN_END_CLOSED,
+ RANGE_START_OPEN_END_OPEN
+};
+
struct Lisp_Range_Table
{
struct lcrecord_header header;
range_table_entry_dynarr *entries;
+ enum range_table_type type;
};
typedef struct Lisp_Range_Table Lisp_Range_Table;
Index: src/realpath.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/realpath.c,v
retrieving revision 1.19
diff -u -p -r1.19 realpath.c
--- src/realpath.c 2004/11/04 23:06:48 1.19
+++ src/realpath.c 2004/12/05 22:10:16
＠＠ -105,7 +105,7 ＠＠ readlink_and_correct_case (const Ibyte *
errno = ENOENT;
return -1;
}
- else if (qxestrlen (name) >= PATH_MAX)
+ else if (qxestrlen (name) >= PATH_MAX_INTERNAL)
{
errno = ENAMETOOLONG;
return -1;
＠＠ -170,12 +170,12 ＠＠ readlink_and_correct_case (const Ibyte *
Ibyte *
qxe_realpath (const Ibyte *path, Ibyte *resolved_path)
{
- Ibyte copy_path[PATH_MAX];
+ Ibyte copy_path[PATH_MAX_INTERNAL];
Ibyte *new_path = resolved_path;
Ibyte *max_path;
#if defined (HAVE_READLINK) || defined (WIN32_ANY)
int readlinks = 0;
- Ibyte link_path[PATH_MAX];
+ Ibyte link_path[PATH_MAX_INTERNAL];
int n;
int abslen = abs_start (path);
#endif
＠＠ -185,7 +185,7 ＠＠ qxe_realpath (const Ibyte *path, Ibyte *
/* Make a copy of the source path since we may need to modify it. */
qxestrcpy (copy_path, path);
path = copy_path;
- max_path = copy_path + PATH_MAX - 2;
+ max_path = copy_path + PATH_MAX_INTERNAL - 2;
if (0)
;
＠＠ -216,14 +216,14 ＠＠ qxe_realpath (const Ibyte *path, Ibyte *
/* No drive letter, but a beginning slash? Prepend drive letter. */
else if (abslen == 1)
{
- get_initial_directory (new_path, PATH_MAX - 1);
+ get_initial_directory (new_path, PATH_MAX_INTERNAL - 1);
new_path += 3;
path++;
}
/* Just a path name, prepend the current directory */
else
{
- get_initial_directory (new_path, PATH_MAX - 1);
+ get_initial_directory (new_path, PATH_MAX_INTERNAL - 1);
new_path += qxestrlen (new_path);
if (!IS_DIRECTORY_SEP (new_path[-1]))
*new_path++ = DIRECTORY_SEP;
＠＠ -232,7 +232,7 ＠＠ qxe_realpath (const Ibyte *path, Ibyte *
/* If it's a relative pathname use get_initial_directory for starters. */
else if (abslen == 0)
{
- get_initial_directory (new_path, PATH_MAX - 1);
+ get_initial_directory (new_path, PATH_MAX_INTERNAL - 1);
new_path += qxestrlen (new_path);
if (!IS_DIRECTORY_SEP (new_path[-1]))
*new_path++ = DIRECTORY_SEP;
＠＠ -297,7 +297,7 ＠＠ qxe_realpath (const Ibyte *path, Ibyte *
/* See if latest pathname component is a symlink or needs case
correction. */
*new_path = '\0';
- n = readlink_and_correct_case (resolved_path, link_path, PATH_MAX - 1);
+ n = readlink_and_correct_case (resolved_path, link_path, PATH_MAX_INTERNAL - 1);
if (n < 0)
{
＠＠ -337,7 +337,7 ＠＠ qxe_realpath (const Ibyte *path, Ibyte *
assert (new_path > resolved_path);
/* Safe sex check. */
- if (qxestrlen (path) + n >= PATH_MAX)
+ if (qxestrlen (path) + n >= PATH_MAX_INTERNAL)
{
errno = ENAMETOOLONG;
return NULL;
Index: src/regex.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v
retrieving revision 1.53
diff -u -p -r1.53 regex.c
--- src/regex.c 2004/11/04 23:06:50 1.53
+++ src/regex.c 2004/12/05 22:10:18
＠＠ -419,7 +419,7 ＠＠ Lisp_Object Vthe_lisp_rangetab;
void
vars_of_regex (void)
{
- Vthe_lisp_rangetab = Fmake_range_table ();
+ Vthe_lisp_rangetab = Fmake_range_table (Qstart_closed_end_closed);
staticpro (&Vthe_lisp_rangetab);
}
Index: src/search.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/search.c,v
retrieving revision 1.44
diff -u -p -r1.44 search.c
--- src/search.c 2004/11/04 23:06:51 1.44
+++ src/search.c 2004/12/05 22:10:19
＠＠ -3173,6 +3173,6 ＠＠ occur and a back reference to one of the
*/ );
warn_about_possibly_incompatible_back_references = 1;
- Vskip_chars_range_table = Fmake_range_table ();
+ Vskip_chars_range_table = Fmake_range_table (Qstart_closed_end_closed);
staticpro (&Vskip_chars_range_table);
}
Index: src/symbols.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v
retrieving revision 1.46
diff -u -p -r1.46 symbols.c
--- src/symbols.c 2004/11/04 23:06:54 1.46
+++ src/symbols.c 2004/12/05 22:10:20
＠＠ -2100,9 +2100,8 ＠＠ of previous SYMBOLs.
(args))
{
/* This function can GC */
- Lisp_Object symbol, tail, val = Qnil;
int nargs;
- struct gcpro gcpro1;
+ Lisp_Object retval = Qnil;
GET_LIST_LENGTH (args, nargs);
＠＠ -2110,16 +2109,15 ＠＠ of previous SYMBOLs.
Fsignal (Qwrong_number_of_arguments,
list2 (Qsetq_default, make_int (nargs)));
- GCPRO1 (val);
-
- PROPERTY_LIST_LOOP (tail, symbol, val, args)
+ GC_PROPERTY_LIST_LOOP_3 (symbol, val, args)
{
val = Feval (val);
Fset_default (symbol, val);
+ retval = val;
}
- UNGCPRO;
- return val;
+ END_GC_PROPERTY_LIST_LOOP (symbol);
+ return retval;
}
/* Lisp functions for creating and removing buffer-local variables. */
Index: src/sysdep.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysdep.c,v
retrieving revision 1.77
diff -u -p -r1.77 sysdep.c
--- src/sysdep.c 2004/11/04 23:06:55 1.77
+++ src/sysdep.c 2004/12/05 22:10:22
＠＠ -3139,7 +3139,7 ＠＠ qxe_allocating_getcwd (void)
}
}
#else
- Extbyte chingame_limitos_arbitrarios[PATH_MAX];
+ Extbyte chingame_limitos_arbitrarios[PATH_MAX_EXTERNAL];
Ibyte *ret2;
if (!getwd (chingame_limitos_arbitrarios))
Index: src/sysfile.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysfile.h,v
retrieving revision 1.18
diff -u -p -r1.18 sysfile.h
--- src/sysfile.h 2004/11/04 23:06:55 1.18
+++ src/sysfile.h 2004/12/05 22:10:22
＠＠ -1,6 +1,6 ＠＠
/*
Copyright (C) 1995 Free Software Foundation, Inc.
- Copyright (C) 2000, 2001, 2002 Ben Wing.
+ Copyright (C) 2000, 2001, 2002, 2004 Ben Wing.
This file is part of XEmacs.
＠＠ -267,19 +267,42 ＠＠ Boston, MA 02111-1307, USA. */
#define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
#endif
-/* Client .c files should simply use `PATH_MAX'. */
-#ifndef PATH_MAX
-# if defined (_MAX_PATH)
+/* Determining the maximum pathname length.
+
+ NOTE: IN GENERAL, YOU SHOULD NOT USE THIS.
+ If at all possible, avoid using fixed-length buffers of any sort.
+ You cannot guarantee on many systems that pathnames won't exceed
+ these limits for one reason or another.
+
+ Unfortunately, there is no universal agreement over whether these
+ values should include a final null-terminator or not. Even recent
+ versions of Linux (circa 2002) are switching from the not-including-
+ terminator kind to the including-terminator kind. So we assume that
+ the including-terminator kind will be even (usually is), and round
+ up as necessary. */
+
+#define ROUND_UP_TO_EVEN_NUMBER(val) (((val + 1) >> 1) << 1)
+#ifdef PATH_MAX
+# define QXE_PATH_MAX ROUND_UP_TO_EVEN_NUMBER (PATH_MAX)
+#elif defined (_MAX_PATH)
/* MS Win -- and preferable to _POSIX_PATH_MAX, which is also defined */
-# define PATH_MAX _MAX_PATH
-# elif defined (_POSIX_PATH_MAX)
-# define PATH_MAX _POSIX_PATH_MAX
-# elif defined (MAXPATHLEN)
-# define PATH_MAX MAXPATHLEN
-# else
-# define PATH_MAX 1024
-# endif
-#endif
+# define QXE_PATH_MAX ROUND_UP_TO_EVEN_NUMBER (_MAX_PATH)
+#elif defined (_POSIX_PATH_MAX)
+# define QXE_PATH_MAX ROUND_UP_TO_EVEN_NUMBER (_POSIX_PATH_MAX)
+#elif defined (MAXPATHLEN)
+# define QXE_PATH_MAX ROUND_UP_TO_EVEN_NUMBER (MAXPATHLEN)
+#else
+# define QXE_PATH_MAX 1024
+#endif
+
+/* Client .c files should use PATH_MAX_INTERNAL or PATH_MAX_EXTERNAL
+ if they must use either one at all. */
+
+/* Use for internally formatted text, which can potentially have up to
+ four bytes per character */
+#define PATH_MAX_INTERNAL (QXE_PATH_MAX * MAX_ICHAR_LEN)
+/* Use for externally formatted text. */
+#define PATH_MAX_EXTERNAL (QXE_PATH_MAX * MAX_XETCHAR_SIZE)
/* The following definitions are needed under Windows, at least */
#ifndef X_OK
Index: src/syswindows.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syswindows.h,v
retrieving revision 1.23
diff -u -p -r1.23 syswindows.h
--- src/syswindows.h 2004/11/04 23:06:55 1.23
+++ src/syswindows.h 2004/12/05 22:10:22
＠＠ -760,26 +760,26 ＠＠ extern int mswindows_windows9x_p;
#define XETEXT(arg) XETEXT1(arg)
#define XECOPY_TCHAR(ptr, ch) \
(XEUNICODE_P ? (* (LPWSTR) (ptr) = L##ch) : (* (LPSTR) (ptr) = (ch)))
-#define xetcslen(arg) \
+#define qxetcslen(arg) \
(XEUNICODE_P ? wcslen ((wchar_t *) arg) : strlen (arg))
-#define xetcsbytelen(arg) \
+#define qxetcsbytelen(arg) \
(XEUNICODE_P ? wcslen ((wchar_t *) arg) * XETCHAR_SIZE : strlen (arg))
-#define xetcscmp(s1, s2) \
+#define qxetcscmp(s1, s2) \
(XEUNICODE_P ? wcscmp ((wchar_t *) s1, (wchar_t *) s2) \
: strcmp (s1, s2))
-#define xetcscpy(s1, s2) \
+#define qxetcscpy(s1, s2) \
(XEUNICODE_P ? (char *) wcscpy ((wchar_t *) s1, (wchar_t *) s2) \
: strcpy (s1, s2))
-#define xetcsncpy(s1, s2, n) \
+#define qxetcsncpy(s1, s2, n) \
(XEUNICODE_P ? (char *) wcsncpy ((wchar_t *) s1, (wchar_t *) s2, n) \
: strncpy (s1, s2, n))
-#define xetcschr(s, ch) \
+#define qxetcschr(s, ch) \
(XEUNICODE_P ? (char *) wcschr ((wchar_t *) s, (WCHAR) ch) \
: strchr (s, ch))
-#define xetcsrchr(s, ch) \
+#define qxetcsrchr(s, ch) \
(XEUNICODE_P ? (char *) wcsrchr ((wchar_t *) s, (WCHAR) ch) \
: strrchr (s, ch))
-#define xetcsdup(s) \
+#define qxetcsdup(s) \
(XEUNICODE_P ? (char *) wcsdup ((wchar_t *) s) \
: xstrdup (s))
＠＠ -793,7 +793,7 ＠＠ extern int mswindows_windows9x_p;
EXTERNAL_TO_C_STRING_MALLOC (in, out, Qmswindows_tstr)
#define build_tstr_string(in) \
- make_ext_string (in, xetcsbytelen ((Extbyte *) in), Qmswindows_tstr)
+ make_ext_string (in, qxetcsbytelen ((Extbyte *) in), Qmswindows_tstr)
#define MAX_ANSI_CHAR_LEN 1
#define MAX_UNICODE_CHAR_LEN 2
Index: src/text.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/text.c,v
retrieving revision 1.22
diff -u -p -r1.22 text.c
--- src/text.c 2004/11/13 06:32:25 1.22
+++ src/text.c 2004/12/05 22:10:23
＠＠ -2136,7 +2136,7 ＠＠ eito_malloc_1 (Eistring *ei)
int
eicmp_1 (Eistring *ei, Bytecount off, Charcount charoff,
Bytecount len, Charcount charlen, const Ibyte *data,
- const Eistring *ei2, int is_c, int fold_case)
+ const Eistring *ei2, int is_ascii, int fold_case)
{
assert ((off < 0) != (charoff < 0));
if (off < 0)
＠＠ -2153,7 +2153,7 ＠＠ eicmp_1 (Eistring *ei, Bytecount off, Ch
assert (off >= 0 && off <= ei->bytelen_);
assert (len >= 0 && off + len <= ei->bytelen_);
assert ((data == 0) != (ei == 0));
- assert ((is_c != 0) == (data != 0));
+ assert ((is_ascii != 0) == (data != 0));
assert (fold_case >= 0 && fold_case <= 2);
{
＠＠ -2171,7 +2171,7 ＠＠ eicmp_1 (Eistring *ei, Bytecount off, Ch
dstlen = ei2->bytelen_;
}
- if (is_c)
+ if (is_ascii)
ASSERT_ASCTEXT_ASCII_LEN ((Ascbyte *) dst, dstlen);
return (fold_case == 0 ? qxememcmp4 (src, len, dst, dstlen) :
＠＠ -4253,6 +4253,7 ＠＠ dfc_convert_to_internal_format (dfc_conv
places. */
int count;
Ibyte_dynarr *conversion_in_dynarr;
+ Lisp_Object underlying_cs;
PROFILE_DECLARE ();
assert (!inhibit_non_essential_conversion_operations);
＠＠ -4277,18 +4278,37 ＠＠ dfc_convert_to_internal_format (dfc_conv
internal_bind_int (&dfc_convert_to_internal_format_in_use,
dfc_convert_to_internal_format_in_use + 1);
- coding_system = get_coding_system_for_text_file (coding_system, 1);
+ /* The second call does the equivalent of both calls, but we need
+ the result after the first call (which wraps just a to-text
+ converter) as well as the result after the second call (which
+ also wraps an EOL-detection converter). */
+ underlying_cs = get_coding_system_for_text_file (coding_system, 0);
+ coding_system = get_coding_system_for_text_file (underlying_cs, 1);
if (source_type != DFC_TYPE_LISP_LSTREAM &&
sink_type != DFC_TYPE_LISP_LSTREAM &&
- coding_system_is_binary (coding_system))
+ coding_system_is_binary (underlying_cs))
{
#ifdef MULE
- const Ibyte *ptr = (const Ibyte *) source->data.ptr;
+ const Ibyte *ptr;
Bytecount len = source->data.len;
- const Ibyte *end = ptr + len;
+ const Ibyte *end;
+
+ /* Make sure no EOL conversion is needed. With a little work we
+ could handle EOL conversion as well but it may not be needed as an
+ optimization. */
+ if (!EQ (coding_system, underlying_cs))
+ {
+ for (ptr = (const Ibyte *) source->data.ptr, end = ptr + len;
+ ptr < end; ptr++)
+ {
+ if (*ptr == '\r' || *ptr == '\n')
+ goto the_hard_way;
+ }
+ }
- for (; ptr < end; ptr++)
+ for (ptr = (const Ibyte *) source->data.ptr, end = ptr + len;
+ ptr < end; ptr++)
{
Ibyte c = *ptr;
＠＠ -4314,25 +4334,38 ＠＠ dfc_convert_to_internal_format (dfc_conv
involved */
else if (source_type != DFC_TYPE_LISP_LSTREAM &&
sink_type != DFC_TYPE_LISP_LSTREAM &&
- dfc_coding_system_is_unicode (coding_system))
+ dfc_coding_system_is_unicode (underlying_cs))
{
- const Ibyte *ptr = (const Ibyte *) source->data.ptr + 1;
+ const Ibyte *ptr;
Bytecount len = source->data.len;
- const Ibyte *end = ptr + len;
+ const Ibyte *end;
if (len & 1)
goto the_hard_way;
- for (; ptr < end; ptr += 2)
+ /* Make sure only ASCII/Latin-1 is involved */
+ for (ptr = (const Ibyte *) source->data.ptr + 1, end = ptr + len;
+ ptr < end; ptr += 2)
{
if (*ptr)
goto the_hard_way;
}
- ptr = (const Ibyte *) source->data.ptr;
- end = ptr + len;
+ /* Make sure no EOL conversion is needed. With a little work we
+ could handle EOL conversion as well but it may not be needed as an
+ optimization. */
+ if (!EQ (coding_system, underlying_cs))
+ {
+ for (ptr = (const Ibyte *) source->data.ptr, end = ptr + len;
+ ptr < end; ptr += 2)
+ {
+ if (*ptr == '\r' || *ptr == '\n')
+ goto the_hard_way;
+ }
+ }
- for (; ptr < end; ptr += 2)
+ for (ptr = (const Ibyte *) source->data.ptr, end = ptr + len;
+ ptr < end; ptr += 2)
{
Ibyte c = *ptr;
＠＠ -4360,9 +4393,9 ＠＠ dfc_convert_to_internal_format (dfc_conv
Lisp_Object instream, outstream;
Lstream *reader, *writer;
-#ifdef WIN32_ANY
+#if defined (WIN32_ANY) || defined (MULE)
the_hard_way:
-#endif /* WIN32_ANY */
+#endif
delete_count = 0;
if (source_type == DFC_TYPE_LISP_LSTREAM)
instream = source->lisp_object;
Index: src/text.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/text.h,v
retrieving revision 1.25
diff -u -p -r1.25 text.h
--- src/text.h 2004/11/12 15:09:17 1.25
+++ src/text.h 2004/12/05 22:10:26
＠＠ -1420,10 +1420,10 ＠＠ next_string_index (Lisp_Object s, Byteco
... from raw internal-format data in the specified format that is
"null-terminated" (the meaning of this depends on the nature of
the specific format).
- void eicpy_c (Eistring *eistr, const Ascbyte *c_string);
+ void eicpy_ascii (Eistring *eistr, const Ascbyte *ascstr);
... from an ASCII null-terminated string. Non-ASCII characters in
the string are *ILLEGAL* (read abort() with error-checking defined).
- void eicpy_c_len (Eistring *eistr, const Ascbyte *c_string, len);
+ void eicpy_ascii_len (Eistring *eistr, const Ascbyte *ascstr, len);
... from an ASCII string, with length specified. Non-ASCII characters
in the string are *ILLEGAL* (read abort() with error-checking defined).
void eicpy_ext (Eistring *eistr, const Extbyte *extdata,
＠＠ -1563,7 +1563,7 ＠＠ next_string_index (Lisp_Object s, Byteco
void eicat_ei (Eistring *eistr, Eistring *eistr2);
... from another Eistring.
- void eicat_c (Eistring *eistr, Ascbyte *c_string);
+ void eicat_ascii (Eistring *eistr, Ascbyte *ascstr);
... from an ASCII null-terminated string. Non-ASCII characters in
the string are *ILLEGAL* (read abort() with error-checking defined).
void eicat_raw (ei, const Ibyte *data, Bytecount len);
＠＠ -1592,8 +1592,8 ＠＠ next_string_index (Lisp_Object s, Byteco
void eisub_ei (Eistring *eistr, Bytecount off, Charcount charoff,
Bytecount len, Charcount charlen, Eistring *eistr2);
... with another Eistring.
- void eisub_c (Eistring *eistr, Bytecount off, Charcount charoff,
- Bytecount len, Charcount charlen, Ascbyte *c_string);
+ void eisub_ascii (Eistring *eistr, Bytecount off, Charcount charoff,
+ Bytecount len, Charcount charlen, Ascbyte *ascstr);
... with an ASCII null-terminated string. Non-ASCII characters in
the string are *ILLEGAL* (read abort() with error-checking defined).
void eisub_ch (Eistring *eistr, Bytecount off, Charcount charoff,
＠＠ -1660,17 +1660,17 ＠＠ next_string_index (Lisp_Object s, Byteco
Charcount eirstr_ei_off_char (Eistring *eistr, Eistring *eistr2,
Bytecount off, Charcount charoff);
- Bytecount eistr_c (Eistring *eistr, Ascbyte *c_string);
- Charcount eistr_c_char (Eistring *eistr, Ascbyte *c_string);
- Bytecount eistr_c_off (Eistring *eistr, Ascbyte *c_string, Bytecount off,
+ Bytecount eistr_ascii (Eistring *eistr, Ascbyte *ascstr);
+ Charcount eistr_ascii_char (Eistring *eistr, Ascbyte *ascstr);
+ Bytecount eistr_ascii_off (Eistring *eistr, Ascbyte *ascstr, Bytecount off,
Charcount charoff);
- Charcount eistr_c_off_char (Eistring *eistr, Ascbyte *c_string,
+ Charcount eistr_ascii_off_char (Eistring *eistr, Ascbyte *ascstr,
Bytecount off, Charcount charoff);
- Bytecount eirstr_c (Eistring *eistr, Ascbyte *c_string);
- Charcount eirstr_c_char (Eistring *eistr, Ascbyte *c_string);
- Bytecount eirstr_c_off (Eistring *eistr, Ascbyte *c_string,
+ Bytecount eirstr_ascii (Eistring *eistr, Ascbyte *ascstr);
+ Charcount eirstr_ascii_char (Eistring *eistr, Ascbyte *ascstr);
+ Bytecount eirstr_ascii_off (Eistring *eistr, Ascbyte *ascstr,
Bytecount off, Charcount charoff);
- Charcount eirstr_c_off_char (Eistring *eistr, Ascbyte *c_string,
+ Charcount eirstr_ascii_off_char (Eistring *eistr, Ascbyte *ascstr,
Bytecount off, Charcount charoff);
＠＠ -1711,17 +1711,17 ＠＠ next_string_index (Lisp_Object s, Byteco
Charcount charoff, Bytecount len,
Charcount charlen, Eistring *eistr2);
- int eicmp_c (Eistring *eistr, Ascbyte *c_string);
- int eicmp_off_c (Eistring *eistr, Bytecount off, Charcount charoff,
- Bytecount len, Charcount charlen, Ascbyte *c_string);
- int eicasecmp_c (Eistring *eistr, Ascbyte *c_string);
- int eicasecmp_off_c (Eistring *eistr, Bytecount off, Charcount charoff,
+ int eicmp_ascii (Eistring *eistr, Ascbyte *ascstr);
+ int eicmp_off_ascii (Eistring *eistr, Bytecount off, Charcount charoff,
+ Bytecount len, Charcount charlen, Ascbyte *ascstr);
+ int eicasecmp_ascii (Eistring *eistr, Ascbyte *ascstr);
+ int eicasecmp_off_ascii (Eistring *eistr, Bytecount off, Charcount charoff,
Bytecount len, Charcount charlen,
- Ascbyte *c_string);
- int eicasecmp_i18n_c (Eistring *eistr, Ascbyte *c_string);
- int eicasecmp_i18n_off_c (Eistring *eistr, Bytecount off, Charcount charoff,
+ Ascbyte *ascstr);
+ int eicasecmp_i18n_ascii (Eistring *eistr, Ascbyte *ascstr);
+ int eicasecmp_i18n_off_ascii (Eistring *eistr, Bytecount off, Charcount charoff,
Bytecount len, Charcount charlen,
- Ascbyte *c_string);
+ Ascbyte *ascstr);
**********************************************
＠＠ -1982,17 +1982,17 ＠＠ do { \
EI_ALLOC_AND_COPY (ei, ei12p2, ei12p2len, 1); \
} while (0)
-#define eicpy_c(ei, c_string) \
+#define eicpy_ascii(ei, ascstr) \
do { \
- const Ascbyte *ei4 = (c_string); \
+ const Ascbyte *ei4 = (ascstr); \
\
ASSERT_ASCTEXT_ASCII (ei4); \
eicpy_ext (ei, ei4, Qbinary); \
} while (0)
-#define eicpy_c_len(ei, c_string, c_len) \
+#define eicpy_ascii_len(ei, ascstr, c_len) \
do { \
- const Ascbyte *ei6 = (c_string); \
+ const Ascbyte *ei6 = (ascstr); \
int ei6len = (c_len); \
\
ASSERT_ASCTEXT_ASCII_LEN (ei6, ei6len); \
＠＠ -2207,9 +2207,9 ＠＠ do { \
eicat_1 (ei, ei9->data_, ei9->bytelen_, ei9->charlen_); \
} while (0)
-#define eicat_c(ei, c_string) \
+#define eicat_ascii(ei, ascstr) \
do { \
- const Ascbyte *ei15 = (c_string); \
+ const Ascbyte *ei15 = (ascstr); \
int ei15len = strlen (ei15); \
\
ASSERT_ASCTEXT_ASCII_LEN (ei15, ei15len); \
＠＠ -2286,9 +2286,9 ＠＠ do { \
ei19->charlen_); \
} while (0)
-#define eisub_c(ei, off, charoff, len, charlen, c_string) \
+#define eisub_ascii(ei, off, charoff, len, charlen, ascstr) \
do { \
- const Ascbyte *ei20 = (c_string); \
+ const Ascbyte *ei20 = (ascstr); \
int ei20len = strlen (ei20); \
ASSERT_ASCTEXT_ASCII_LEN (ei20, ei20len); \
eisub_1 (ei, off, charoff, len, charlen, ei20, ei20len, -1); \
＠＠ -2369,21 +2369,21 ＠＠ do { \
#define eirstr_ei_off_char(eistr, eistr2, off, charoff) \
NOT YET IMPLEMENTED
-#define eistr_c(eistr, c_string) \
+#define eistr_ascii(eistr, ascstr) \
NOT YET IMPLEMENTED
-#define eistr_c_char(eistr, c_string) \
+#define eistr_ascii_char(eistr, ascstr) \
NOT YET IMPLEMENTED
-#define eistr_c_off(eistr, c_string, off, charoff) \
+#define eistr_ascii_off(eistr, ascstr, off, charoff) \
NOT YET IMPLEMENTED
-#define eistr_c_off_char(eistr, c_string, off, charoff) \
+#define eistr_ascii_off_char(eistr, ascstr, off, charoff) \
NOT YET IMPLEMENTED
-#define eirstr_c(eistr, c_string) \
+#define eirstr_ascii(eistr, ascstr) \
NOT YET IMPLEMENTED
-#define eirstr_c_char(eistr, c_string) \
+#define eirstr_ascii_char(eistr, ascstr) \
NOT YET IMPLEMENTED
-#define eirstr_c_off(eistr, c_string, off, charoff) \
+#define eirstr_ascii_off(eistr, ascstr, off, charoff) \
NOT YET IMPLEMENTED
-#define eirstr_c_off_char(eistr, c_string, off, charoff) \
+#define eirstr_ascii_off_char(eistr, ascstr, off, charoff) \
NOT YET IMPLEMENTED
＠＠ -2406,18 +2406,18 ＠＠ int eicmp_1 (Eistring *ei, Bytecount off
#define eicasecmp_i18n_off_ei(eistr, off, charoff, len, charlen, eistr2) \
eicmp_1 (eistr, off, charoff, len, charlen, 0, eistr2, 0, 2)
-#define eicmp_c(eistr, c_string) \
- eicmp_1 (eistr, 0, -1, -1, -1, c_string, 0, 1, 0)
-#define eicmp_off_c(eistr, off, charoff, len, charlen, c_string) \
- eicmp_1 (eistr, off, charoff, len, charlen, c_string, 0, 1, 0)
-#define eicasecmp_c(eistr, c_string) \
- eicmp_1 (eistr, 0, -1, -1, -1, c_string, 0, 1, 1)
-#define eicasecmp_off_c(eistr, off, charoff, len, charlen, c_string) \
- eicmp_1 (eistr, off, charoff, len, charlen, c_string, 0, 1, 1)
-#define eicasecmp_i18n_c(eistr, c_string) \
- eicmp_1 (eistr, 0, -1, -1, -1, c_string, 0, 1, 2)
-#define eicasecmp_i18n_off_c(eistr, off, charoff, len, charlen, c_string) \
- eicmp_1 (eistr, off, charoff, len, charlen, c_string, 0, 1, 2)
+#define eicmp_ascii(eistr, ascstr) \
+ eicmp_1 (eistr, 0, -1, -1, -1, (const Ibyte *) ascstr, 0, 1, 0)
+#define eicmp_off_ascii(eistr, off, charoff, len, charlen, ascstr) \
+ eicmp_1 (eistr, off, charoff, len, charlen, (const Ibyte *) ascstr, 0, 1, 0)
+#define eicasecmp_ascii(eistr, ascstr) \
+ eicmp_1 (eistr, 0, -1, -1, -1, (const Ibyte *) ascstr, 0, 1, 1)
+#define eicasecmp_off_ascii(eistr, off, charoff, len, charlen, ascstr) \
+ eicmp_1 (eistr, off, charoff, len, charlen, (const Ibyte *) ascstr, 0, 1, 1)
+#define eicasecmp_i18n_ascii(eistr, ascstr) \
+ eicmp_1 (eistr, 0, -1, -1, -1, (const Ibyte *) ascstr, 0, 1, 2)
+#define eicasecmp_i18n_off_ascii(eistr, off, charoff, len, charlen, ascstr) \
+ eicmp_1 (eistr, off, charoff, len, charlen, (const Ibyte *) ascstr, 0, 1, 2)
/* ----- Case-changing the Eistring ----- */
Index: src/unexcw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexcw.c,v
retrieving revision 1.15
diff -u -p -r1.15 unexcw.c
--- src/unexcw.c 2004/09/20 19:20:05 1.15
+++ src/unexcw.c 2004/12/05 22:10:26
＠＠ -102,7 +102,7 ＠＠ unexec (char *out_name, char *in_name, u
{
/* ugly nt hack - should be in lisp */
int a_new, a_out = -1;
- char new_name[PATH_MAX], a_name[PATH_MAX];
+ char new_name[PATH_MAX_EXTERNAL], a_name[PATH_MAX_EXTERNAL];
char *ptr;
/* Make sure that the input and output filenames have the
Index: src/unexnext.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexnext.c,v
retrieving revision 1.2
diff -u -p -r1.2 unexnext.c
--- src/unexnext.c 2002/03/13 08:53:02 1.2
+++ src/unexnext.c 2004/12/05 22:10:26
＠＠ -279,7 +279,7 ＠＠ static void unexec_doit(int infd,int out
void unexec(char *outfile,char *infile)
{
- char tmpfile[PATH_MAX];
+ char tmpfile[PATH_MAX_EXTERNAL];
int infd,outfd;
if ((infd=open(infile, O_RDONLY, 0))<0)
Index: src/unexnt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexnt.c,v
retrieving revision 1.18
diff -u -p -r1.18 unexnt.c
--- src/unexnt.c 2004/11/04 23:06:57 1.18
+++ src/unexnt.c 2004/12/05 22:10:27
＠＠ -133,11 +133,11 ＠＠ _start (void)
won't work.) */
if (heap_state == HEAP_UNLOADED)
{
- Extbyte executable_path[MAX_PATH * MAX_XETCHAR_SIZE];
+ Extbyte executable_path[PATH_MAX_EXTERNAL];
/* Don't use mswindows_get_module_file_name() because it uses
xmalloc() */
- if (qxeGetModuleFileName (NULL, executable_path, MAX_PATH) == 0)
+ if (qxeGetModuleFileName (NULL, executable_path, _MAX_PATH) == 0)
{
exit (1);
}
＠＠ -150,8 +150,8 ＠＠ _start (void)
/* To allow profiling, make sure executable_path names the .exe
file, not the file created by the profiler */
- p = xetcsrchr (executable_path, '\\');
- xetcscpy (p + 1, XETEXT (PATH_PROGNAME ".exe"));
+ p = qxetcsrchr (executable_path, '\\');
+ qxetcscpy (p + 1, XETEXT (PATH_PROGNAME ".exe"));
}
#endif
cvs server: Diffing src/m
cvs server: Diffing src/s
cvs server: Diffing tests
cvs server: Diffing tests/DLL
cvs server: Diffing tests/Dnd
cvs server: Diffing tests/automated
cvs server: Diffing tests/gtk
cvs server: Diffing tests/mule
cvs server: Diffing tests/tooltalk
- 1 participants
- 0 comments
[PATCH] xemacs-21.5: make man/xemacs-faq.texi ready to replace http://www.xemacs.org/FAQ content
19 years, 4 months
Adrian Aichner
Adrian Aichner
Hi All!
I have long wanted to resolve the duplication of FAQ between xemacsweb
and xemacs modules.
Now I got a plan.
Put symlinks in place under xemacsweb/FAQ for backward compatibility.
Maintain the FAQ in the xemacs module only from now on.
Here is the xemacs part of that patch to make this possible.
I intend to commit this shortly.
There shouldn't be much controversy about this, since it fixes
breakage of links image names for HTML output, and nothing else in the
xemacs-faq.texi.
The Makefile change is just an upgrade webmasters or other HTML
generators would care about.
Best regards,
Adrian
xemacs-21.5 ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: man/ChangeLog
Index: man/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.271
diff -u -U0 -r1.271 ChangeLog
--- man/ChangeLog 26 Nov 2004 07:37:48 -0000 1.271
+++ man/ChangeLog 5 Dec 2004 18:17:06 -0000
＠＠ -0,0 +1,24 ＠＠
+2004-12-05 Adrian Aichner <adrian(a)xemacs.org>
+
+ * Makefile (TEXI2HTML): Changed to produce unsplit output.
+ * Makefile (TEXI2HTML_SPLIT): New.
+ * Makefile (CP): New.
+ * Makefile (PHOTODIR): New.
+ * Makefile ($(HTMLDIR)/cl.html): Use TEXI2HTML_SPLIT.
+ * Makefile ($(HTMLDIR)/custom.html): Ditto.
+ * Makefile ($(HTMLDIR)/emodules.html): Ditto.
+ * Makefile ($(HTMLDIR)/external-widget.html): Ditto.
+ * Makefile ($(HTMLDIR)/info.html): Ditto.
+ * Makefile ($(HTMLDIR)/standards.html): Ditto.
+ * Makefile ($(HTMLDIR)/term.html): Ditto.
+ * Makefile ($(HTMLDIR)/termcap.html): Ditto.
+ * Makefile ($(HTMLDIR)/texinfo.html): Ditto.
+ * Makefile ($(HTMLDIR)/widget.html): Ditto.
+ * Makefile ($(HTMLDIR)/xemacs-faq.html): Ditto.
+ Produce unsplit output for website also, copy photos to HTMLDIR.
+ * Makefile ($(HTMLDIR)/xemacs.html): Ditto.
+ * Makefile ($(HTMLDIR)/lispref.html): Ditto.
+ * Makefile ($(HTMLDIR)/internals.html): Ditto.
+ * Makefile ($(HTMLDIR)/new-users-guide.html): Ditto.
+ * xemacs-faq.texi (Q1.3.1): Fix broken image links in HTML output.
+
xemacs-21.5 source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: man/xemacs-faq.texi man/Makefile
Index: man/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/Makefile,v
retrieving revision 1.31
diff -u -w -r1.31 Makefile
--- man/Makefile 10 Oct 2003 12:39:27 -0000 1.31
+++ man/Makefile 5 Dec 2004 18:07:17 -0000
＠＠ -22,9 +22,11 ＠＠
SHELL = /bin/sh
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
-TEXI2HTML = texi2html -verbose -split chapter
+TEXI2HTML = texi2html -verbose -subdir $(HTMLDIR)
+TEXI2HTML_SPLIT = $(TEXI2HTML) -split chapter
RM = rm -f
+CP = cp
.SUFFIXES:
.SUFFIXES: .html .info .texi .dvi .pdf
＠＠ -37,6 +39,7 ＠＠
INFODIR = ../info
HTMLDIR = ../html
+PHOTODIR = ../etc/photos
info_files = \
$(INFODIR)/cl.info \
＠＠ -338,50 +341,59 ＠＠
############################################################################
$(HTMLDIR)/cl.html : cl.texi
- $(TEXI2HTML) -subdir $(HTMLDIR) cl.texi
+ $(TEXI2HTML_SPLIT) cl.texi
$(HTMLDIR)/custom.html : custom.texi
- $(TEXI2HTML) -subdir $(HTMLDIR) custom.texi
+ $(TEXI2HTML_SPLIT) custom.texi
$(HTMLDIR)/emodules.html : emodules.texi
- $(TEXI2HTML) -subdir $(HTMLDIR) emodules.texi
+ $(TEXI2HTML_SPLIT) emodules.texi
$(HTMLDIR)/external-widget.html : external-widget.texi
- $(TEXI2HTML) -subdir $(HTMLDIR) external-widget.texi
+ $(TEXI2HTML_SPLIT) external-widget.texi
$(HTMLDIR)/info.html : info.texi
- $(TEXI2HTML) -subdir $(HTMLDIR) info.texi
+ $(TEXI2HTML_SPLIT) info.texi
$(HTMLDIR)/standards.html : standards.texi
- $(TEXI2HTML) -subdir $(HTMLDIR) standards.texi
+ $(TEXI2HTML_SPLIT) standards.texi
$(HTMLDIR)/term.html : term.texi
- $(TEXI2HTML) -subdir $(HTMLDIR) term.texi
+ $(TEXI2HTML_SPLIT) term.texi
$(HTMLDIR)/termcap.html : termcap.texi
- $(TEXI2HTML) -subdir $(HTMLDIR) termcap.texi
+ $(TEXI2HTML_SPLIT) termcap.texi
$(HTMLDIR)/texinfo.html : texinfo.texi
- $(TEXI2HTML) -subdir $(HTMLDIR) texinfo.texi
+ $(TEXI2HTML_SPLIT) texinfo.texi
$(HTMLDIR)/widget.html : widget.texi
- $(TEXI2HTML) -subdir $(HTMLDIR) widget.texi
+ $(TEXI2HTML_SPLIT) widget.texi
$(HTMLDIR)/xemacs-faq.html : xemacs-faq.texi
- $(TEXI2HTML) -top_file xemacs-faq_1.html -subdir $(HTMLDIR) xemacs-faq.texi
+ $(TEXI2HTML) xemacs-faq.texi
+ $(TEXI2HTML_SPLIT) -top_file xemacs-faq_1.html xemacs-faq.texi
+ $(CP) $(PHOTODIR)/ben.png $(HTMLDIR)
+ $(CP) $(PHOTODIR)/cthomp.png $(HTMLDIR)
+ $(CP) $(PHOTODIR)/hniksic.png $(HTMLDIR)
+ $(CP) $(PHOTODIR)/jwz.png $(HTMLDIR)
+ $(CP) $(PHOTODIR)/martin.png $(HTMLDIR)
+ $(CP) $(PHOTODIR)/mly.png $(HTMLDIR)
+ $(CP) $(PHOTODIR)/piper.png $(HTMLDIR)
+ $(CP) $(PHOTODIR)/slb.png $(HTMLDIR)
# Manuals with their own subdirectory
$(HTMLDIR)/xemacs.html : $(xemacs-srcs)
- $(TEXI2HTML) -subdir $(HTMLDIR) xemacs/xemacs.texi
+ $(TEXI2HTML_SPLIT) xemacs/xemacs.texi
$(HTMLDIR)/lispref.html : $(lispref-srcs)
- $(TEXI2HTML) -subdir $(HTMLDIR) lispref/lispref.texi
+ $(TEXI2HTML_SPLIT) lispref/lispref.texi
$(HTMLDIR)/internals.html : $(internals-srcs)
- $(TEXI2HTML) -subdir $(HTMLDIR) internals/internals.texi
+ $(TEXI2HTML_SPLIT) internals/internals.texi
$(HTMLDIR)/new-users-guide.html : $(new-users-guide-srcs)
- $(TEXI2HTML) -subdir $(HTMLDIR) new-users-guide/new-users-guide.texi
+ $(TEXI2HTML_SPLIT) new-users-guide/new-users-guide.texi
xemacs : $(HTMLDIR)/xemacs.html
lispref : $(HTMLDIR)/lispref.html
Index: man/xemacs-faq.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs-faq.texi,v
retrieving revision 1.79
diff -u -w -r1.79 xemacs-faq.texi
--- man/xemacs-faq.texi 5 Dec 2004 08:48:12 -0000 1.79
+++ man/xemacs-faq.texi 5 Dec 2004 18:07:21 -0000
＠＠ -1545,42 +1545,45 ＠＠
＠itemize ＠bullet
＠item ＠email{andy＠(a)xemacs.org, Andy Piper}
＠html
-<br><img src="wing.gif" alt="Portrait of Ben Wing"><br>
+<br><img src="piper.png" alt="Portrait of Andy Piper"><br>
＠end html
＠item ＠email{ben＠(a)xemacs.org, Ben Wing}
＠html
-<br><img src="wing.gif" alt="Portrait of Ben Wing"><br>
+<br><img src="ben.png" alt="Portrait of Ben Wing"><br>
＠end html
＠item ＠email{cthomp＠(a)xemacs.org, Chuck Thompson}
＠html
-<br><img src="cthomp.jpeg" alt="Portrait of Chuck Thompson"><br>
+<br><img src="cthomp.png" alt="Portrait of Chuck Thompson"><br>
＠end html
＠item ＠email{hniksic＠(a)xemacs.org, Hrvoje Niksic}
＠html
-<br><img src="hniksic.jpeg" alt="Portrait of Hrvoje Niksic"><br>
+<br><img src="hniksic.png" alt="Portrait of Hrvoje Niksic"><br>
＠end html
＠item ＠email{jwz＠(a)jwz.org, Jamie Zawinski}
＠html
-<br><img src="jwz.gif" alt="Portrait of Jamie Zawinski"><br>
+<br><img src="jwz.png" alt="Portrait of Jamie Zawinski"><br>
＠end html
＠item ＠email{martin＠(a)xemacs.org, Martin Buchholz}
＠html
-<br><img src="mrb.jpeg" alt="Portrait of Martin Buchholz"><br>
+<br><img src="martin.png" alt="Portrait of Martin Buchholz"><br>
＠end html
＠item ＠email{mly＠(a)adoc.xerox.com, Richard Mlynarik}
+＠html
+<br><img src="mly.png" alt="Portrait of Richard Mlynarik"><br>
+＠end html
＠item ＠email{stephen＠(a)xemacs.org, Stephen Turnbull}
＠item ＠email{steve＠(a)xemacs.org, Steve Baur}
＠html
-<br><img src="steve.gif" alt="Portrait of Steve Baur"><br>
+<br><img src="slb.png" alt="Portrait of Steve Baur"><br>
＠end html
＠end itemize
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
- 2 participants
- 2 comments
[AC] [PACKAGES (xwem)] Fix small bug in xwem-cl-match-p
19 years, 4 months
Steve Youngs
Steve Youngs
APPROVE COMMIT
NOTE: This patch has been committed.
xwem patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: lisp/xwem-manage.el
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/ChangeLog,v
retrieving revision 1.65
diff -u -U0 -r1.65 ChangeLog
--- ChangeLog 5 Dec 2004 06:56:01 -0000 1.65
+++ ChangeLog 5 Dec 2004 21:49:47 -0000
＠＠ -0,0 +1,6 ＠＠
+2004-12-06 Steve Youngs <steve(a)youngs.au.com>
+
+ From Richard Klinda <ignotus(a)hixsplit.hu>
+ * lisp/xwem-manage.el (xwem-cl-match-p): Guard against buffers
+ that don't have filenames assoctiated with them.
+
Index: lisp/xwem-manage.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/xwem/lisp/xwem-manage.el,v
retrieving revision 1.6
diff -u -u -r1.6 xwem-manage.el
--- lisp/xwem-manage.el 5 Dec 2004 05:52:29 -0000 1.6
+++ lisp/xwem-manage.el 5 Dec 2004 21:49:36 -0000
＠＠ -320,7 +320,8 ＠＠
((eq type 'buffer-name)
(string-match param (buffer-name)))
((eq type 'buffer-filename)
- (string-match param (buffer-file-name))))))))
+ (and (buffer-file-name)
+ (string-match param (buffer-file-name)))))))))
))
(if (or (and (eq gm-type 'and) (null ires))
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| In space, |
| No one can hear you rip a stinky |
|---------------------------------------<steve(a)xwem.org>---|
- 1 participants
- 0 comments
[AC21.4] [PATCH] Working GTK buttons for 21.4.
19 years, 4 months
Vin Shelton
Vin Shelton
Thanks for the patch, Malcolm. It will appear in 21.4.16, to be
released momentarily.
- Vin
Malcolm Purvis <malcolmpurvis(a)optushome.com.au> writes:
> RECOMMEND 21.4
>
> This is a backport of 21.5's GTK button handling code. This fixes Friedrich
> Dominicus's bug report where the customisation buttons did not do anything
> when pressed.
>
> Malcolm
>
>
> lisp/ChangeLog addition:
>
> 2004-11-13 Malcolm Purvis <malcolmp(a)xemacs.org>
>
> * widgets-gtk.el: Pressing a button now runs the callback
> functions. A backport of 21.5's button callback handling code.
>
- 1 participants
- 0 comments
[AC21.4] Re: 21.5.18 call-process-region bug
19 years, 4 months
Vin Shelton
Vin Shelton
APPROVE COMMIT 21.4
Thanks for the patch, Stephen. It (sans the cod-process.el part) will
appear in 21.4.16, to be released momentarily.
- Vin
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
> APPROVE COMMIT 21.5 RECOMMEND 21.4
>
> This is a nasty, data-eating bug and my patch fixes all known symptoms
> as well as passing what is AFAICT a comprehensive test for similar
> bugs, so I'm committing it. Will revert or patch on queries.
>
> The specification is not entirely clear, but I'm assuming that the
> effect desired is
>
> (1) Save off the region contents somewhere.
> (2) Delete the region from the buffer.
> (3) Feed the saved text to the process.
> (4) Insert the result before point.
>
> If everybody agrees that's the right way to do this, I'll fix the docs
> later (also for 21.4, remind me, Vin).
>
> Vin: the code-process.el patch is _not_ appropriate for 21.4 (21.4 is
> not buggy and uses a completely different approach, anyway), but I
> think you want the regression tests.
- 1 participants
- 0 comments
[AC21.4] typo in windows.texi
19 years, 4 months
Vin Shelton
Vin Shelton
APPROVE COMMIT 21.4
Thanks for the patch, Stephen. It will appear in 21.4.16, to be
released momentarily.
- Vin
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
> APPROVE COMMIT 21.5 RECOMMEND 21.4
>
> No rush, Vin.
>
> Index: man/ChangeLog
> ===================================================================
> RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/man/ChangeLog,v
> retrieving revision 1.264
> diff -u -r1.264 ChangeLog
> --- man/ChangeLog 2004/09/22 02:06:18 1.264
> +++ man/ChangeLog 2004/10/28 05:34:43
> ＠＠ -0,0 +1,4 ＠＠
> +2003-07-18 Alexey Mahotkin <alexm(a)hsys.msk.ru>
> +
> + * lispref/windows.texi (Basic Windows): Fix typo.
> +
>
> Index: man/lispref/windows.texi
> ===================================================================
> RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/man/lispref/windows.texi,v
> retrieving revision 1.10
> diff -u -r1.10 windows.texi
> --- man/lispref/windows.texi 2004/09/21 03:00:12 1.10
> +++ man/lispref/windows.texi 2004/10/28 05:33:50
> ＠＠ -48,7 +48,7 ＠＠
>
> In each frame, at any time, one and only one window is designated as
> ＠dfn{selected within the frame}. The frame's cursor appears in that
> -window. At ant time, one frame is the selected frame; and the window
> +window. At any time, one frame is the selected frame; and the window
> selected within that frame is ＠dfn{the selected window}. The selected
> window's buffer is usually the current buffer (except when
> ＠code{set-buffer} has been used). ＠xref{Current Buffer}.
>
> --
> Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
> University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
> Ask not how you can "do" free software business;
> ask what your business can "do for" free software.
- 1 participants
- 0 comments