CVS update by vins xemacs/src ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: vins
Date: 05/12/24 01:52:47
Branch: xemacs/etc release-21-4
xemacs/src release-21-4
Modified: xemacs/src ChangeLog console.c database.c
Log:
More patches for 21.4.19.
Revision Changes Path
1.69.2.7 +10 -0 XEmacs/xemacs/etc/NEWS
Index: NEWS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/NEWS,v
retrieving revision 1.69.2.6
retrieving revision 1.69.2.7
diff -u -p -r1.69.2.6 -r1.69.2.7
--- NEWS 2005/12/05 01:46:54 1.69.2.6
+++ NEWS 2005/12/24 00:52:26 1.69.2.7
＠＠ -121,6 +121,7 ＠＠ consulted for a more detailed list of ch
- Python now supported.
- New file extensions recognized: .ss, .pdb, .psw.
-- Fixed ldap libraries configuration.
+ -- Fixed `LDAP_OPT_ON' libraries configuration.
** The delete key now deletes forward by default.
＠＠ -607,6 +608,15 ＠＠ for PSWrap.
It used to fail when `-lldap' requires `-llber'. Introduced in
upstream `configure.in' revision 1.151.2.31 (2005/01/31 02:54:47 +0).
+
+*** Fixed `LDAP_OPT_ON' libraries configuration.
+
+The original fix of local `configure.in' revision 1.19 (2004/12/19
+21:10:02 +0) introduced lossage on another class of systems. In some
+openldap versions `ldap_*' functions may link successfully without
+`-lber', but compiling and linking program with `LDAP_OPT_ON' may
+require `-lber'. When configuring ldap libraries, check for such
+systems, and in a cleaner way than in upstream.
* Lisp and internal changes in XEmacs 21.4
1.290.2.104 +11 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.290.2.103
retrieving revision 1.290.2.104
diff -u -p -r1.290.2.103 -r1.290.2.104
--- ChangeLog 2005/12/08 01:31:12 1.290.2.103
+++ ChangeLog 2005/12/24 00:52:29 1.290.2.104
＠＠ -1,3 +1,14 ＠＠
+2005-12-05 Dr. Volker Zell <Dr.Volker.Zell(a)oracle.com>
+
+ * database.c: Suppress compiler warning under Cygwin.
+ * database.c: Removed __FreeBSD__ check, should be handled by
+ HAVE_U_xxx_T defines.
+
+2005-12-18 Malcolm Purvis <malcolmp(a)xemacs.org>
+
+ * console.c (stuff_buffered_input): Compile body only if
+ HAVE_TTY.
+
2005-05-10 Aidan Kehoe <kehoea(a)parhasard.net>
* callproc.c: #include sysdir.h, so that any appropriate Mule
1.19.2.3 +2 -2 XEmacs/xemacs/src/console.c
Index: console.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console.c,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -p -r1.19.2.2 -r1.19.2.3
--- console.c 2005/01/31 02:55:06 1.19.2.2
+++ console.c 2005/12/24 00:52:34 1.19.2.3
＠＠ -882,7 +882,7 ＠＠ void
stuff_buffered_input (Lisp_Object stuffstring)
{
/* stuff_char works only in BSD, versions 4.2 and up. */
-#if defined (BSD)
+#if defined (BSD) && defined(HAVE_TTY)
if (!CONSOLEP (Vcontrolling_terminal) ||
!CONSOLE_LIVE_P (XCONSOLE (Vcontrolling_terminal)))
return;
＠＠ -908,7 +908,7 ＠＠ stuff_buffered_input (Lisp_Object stuffs
stuff_char (XCONSOLE (Vcontrolling_terminal), *kbd_fetch_ptr++);
}
# endif
-#endif /* BSD */
+#endif /* BSD && HAVE_TTY */
}
DEFUN ("suspend-console", Fsuspend_console, 0, 1, "", /*
1.16.2.6 +2 -2 XEmacs/xemacs/src/database.c
Index: database.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/database.c,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -p -r1.16.2.5 -r1.16.2.6
--- database.c 2005/11/25 02:01:57 1.16.2.5
+++ database.c 2005/12/24 00:52:35 1.16.2.6
＠＠ -43,9 +43,10 ＠＠ Boston, MA 02111-1307, USA. */
/* glibc 2.1 doesn't have this problem with DB 2.x */
#if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
#ifdef HAVE_INTTYPES_H
+#ifndef __BIT_TYPES_DEFINED__
#define __BIT_TYPES_DEFINED__
+#endif
#include <inttypes.h>
-#ifndef __FreeBSD__
#if !HAVE_U_INT8_T
typedef uint8_t u_int8_t;
#endif
＠＠ -60,7 +61,6 ＠＠ typedef uint32_t u_int32_t;
typedef uint64_t u_int64_t;
#endif
#endif /* WE_DONT_NEED_QUADS */
-#endif /* !defined(__FreeBSD__) */
#endif /* HAVE_INTTYPES_H */
#endif /* !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) */
/* Berkeley DB wants __STDC__ to be defined; else if does `#define const' */
- 1 participants
- 0 comments
CVS update by vins xemacs ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: vins
Date: 05/12/24 01:49:16
Branch: xemacs release-21-4
Modified: xemacs ChangeLog configure configure.in
Log:
Ilya's ldap configuration change for 21.4.19.
Revision Changes Path
1.241.2.85 +15 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.241.2.84
retrieving revision 1.241.2.85
diff -u -p -r1.241.2.84 -r1.241.2.85
--- ChangeLog 2005/12/14 01:09:30 1.241.2.84
+++ ChangeLog 2005/12/24 00:47:36 1.241.2.85
＠＠ -1,3 +1,18 ＠＠
+2005-12-18 Ilya N. Golubev <gin(a)mo.msk.ru>
+
+ Merge from 21.5.
+ * configure.in: Fixed `LDAP_OPT_ON' libraries configuration
+ introduced in local 2005-03-13 change of `configure.in'. However,
+ do not check for internal `-lber' `ber_pvt_opt_on' symbol as done
+ in upstream. This symbol is not part of any published interface,
+ it may exist or not exist, depending on openldap version. Cryptic
+ comment before using it in upstream 21.5 source did not state
+ precisely under which circumstances checking for it was useful,
+ which sort of user code tried to link the symbol. So in local
+ 21.5 dismissed both the code and the comment without writing a
+ cleaner equivalent.
+ * etc/NEWS: Document.
+
2005-12-13 Vin Shelton <acs(a)xemacs.org>
* etc/package-index.LATEST.gpg: Updated with latest package data.
1.147.2.37 +542 -446 XEmacs/xemacs/configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.147.2.36
retrieving revision 1.147.2.37
diff -u -p -r1.147.2.36 -r1.147.2.37
--- configure 2005/11/30 23:58:07 1.147.2.36
+++ configure 2005/12/24 00:47:36 1.147.2.37
＠＠ -8039,6 +8039,102 ＠＠ fi
fi
+ if test yes = "$with_ldap" -a yes != "$ldap_needs_lber";then
+ echo $ac_n "checking for LDAP_OPT_ON definition""... $ac_c" 1>&6
+echo "configure:8045: checking for LDAP_OPT_ON definition" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8048 "configure"
+#include "confdefs.h"
+#include <lber.h>
+#include <ldap.h>
+#ifdef LDAP_OPT_ON
+/* Relying on const defined by ac_c_const (upper case). */
+const void *const v = LDAP_OPT_ON;
+#else /* !defined (LDAP_OPT_ON) */
+choke me
+#endif /* !defined (LDAP_OPT_ON) */
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:8062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ xe_cv_have_LDAP_OPT_ON=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ xe_cv_have_LDAP_OPT_ON=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$xe_cv_have_LDAP_OPT_ON" 1>&6
+ if test yes = "$xe_cv_have_LDAP_OPT_ON";then
+ echo $ac_n "checking LDAP_OPT_ON linking""... $ac_c" 1>&6
+echo "configure:8076: checking LDAP_OPT_ON linking" >&5
+
+xe_save_LIBS="$LIBS"
+ LIBS="-lldap $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 8081 "configure"
+#include "confdefs.h"
+#include <lber.h>
+#include <ldap.h>
+const void *const v = LDAP_OPT_ON;
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:8090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ xe_cv_LDAP_OPT_ON_links=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ xe_cv_LDAP_OPT_ON_links=no
+fi
+rm -f conftest*
+ LIBS="$xe_save_LIBS"
+
+echo "$ac_t""$xe_cv_LDAP_OPT_ON_links" 1>&6
+ if test yes != "$xe_cv_LDAP_OPT_ON_links";then
+ ldap_needs_lber=yes ldap_other_libs=-llber
+ echo $ac_n "checking LDAP_OPT_ON linking with -llber""... $ac_c" 1>&6
+echo "configure:8106: checking LDAP_OPT_ON linking with -llber" >&5
+
+xe_save_LIBS="$LIBS"
+ LIBS="-lldap $ldap_other_libs $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 8111 "configure"
+#include "confdefs.h"
+#include <lber.h>
+#include <ldap.h>
+const void *const v = LDAP_OPT_ON;
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:8120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ xe_cv_LDAP_OPT_ON_links_w_lber=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ xe_cv_LDAP_OPT_ON_links_w_lber=no
+fi
+rm -f conftest*
+ LIBS="$xe_save_LIBS"
+
+echo "$ac_t""$xe_cv_LDAP_OPT_ON_links_w_lber" 1>&6
+ if test yes != "$xe_cv_LDAP_OPT_ON_links_w_lber";then
+ with_ldap=no
+ fi
+ fi
+ fi
+ fi
if test yes = "$with_ldap";then
if test yes = "$ldap_needs_des";then
ldap_libs="-ldes $ldap_libs" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ldes\" to \$ldap_libs"; fi
＠＠ -8056,10 +8152,10 ＠＠ fi
else
save_LIBS="$LIBS" LIBS="$ldap_libs $LIBS"
echo $ac_n "checking for ldap_open""... $ac_c" 1>&6
-echo "configure:8060: checking for ldap_open" >&5
+echo "configure:8156: checking for ldap_open" >&5
cat > conftest.$ac_ext <<EOF
-#line 8063 "configure"
+#line 8159 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char ldap_open(); below. */
＠＠ -8082,7 +8178,7 ＠＠ ldap_open();
; return 0; }
EOF
-if { (eval echo configure:8086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_ldap_open=yes"
else
＠＠ -8122,10 +8218,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:8126: checking for $ac_func" >&5
+echo "configure:8222: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 8129 "configure"
+#line 8225 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -8148,7 +8244,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:8152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8248: \"$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
＠＠ -8179,20 +8275,20 ＠＠ fi
if test "$with_postgresql" != "no"; then
echo "checking for PostgreSQL" 1>&6
-echo "configure:8183: checking for PostgreSQL" >&5
+echo "configure:8279: 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:8188: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:8284: checking for ${header_dir}libpq-fe.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8191 "configure"
+#line 8287 "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:8196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8292: \"$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*
＠＠ -8216,12 +8312,12 ＠＠ fi
test -n "$libpq_fe_h_file" && {
echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:8220: checking for PQconnectdb in -lpq" >&5
+echo "configure:8316: 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 8225 "configure"
+#line 8321 "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
＠＠ -8232,7 +8328,7 ＠＠ int main() {
PQconnectdb()
; return 0; }
EOF
-if { (eval echo configure:8236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8332: \"$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
＠＠ -8265,12 +8361,12 ＠＠ EOF
echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:8269: checking for PQconnectStart in -lpq" >&5
+echo "configure:8365: 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 8274 "configure"
+#line 8370 "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
＠＠ -8281,7 +8377,7 ＠＠ int main() {
PQconnectStart()
; return 0; }
EOF
-if { (eval echo configure:8285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8381: \"$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
＠＠ -8329,7 +8425,7 ＠＠ fi
if test "$window_system" != "none"; then
echo "checking for graphics libraries" 1>&6
-echo "configure:8333: checking for graphics libraries" >&5
+echo "configure:8429: checking for graphics libraries" >&5
libpath_xpm=
incpath_xpm=
＠＠ -8355,10 +8451,10 ＠＠ echo "configure:8333: 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:8359: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8455: checking for Xpm - no older than 3.4f" >&5
xe_check_libs=-lXpm
cat > conftest.$ac_ext <<EOF
-#line 8362 "configure"
+#line 8458 "configure"
#include "confdefs.h"
#define XPM_NUMBERS
#include <X11/xpm.h>
＠＠ -8367,7 +8463,7 ＠＠ echo "configure:8359: checking for Xpm -
XpmIncludeVersion != XpmLibraryVersion() ? 1 :
XpmIncludeVersion < 30406 ? 2 : 0 ;}
EOF
-if { (eval echo configure:8371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8467: \"$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
＠＠ -8411,17 +8507,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:8415: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8511: checking for \"FOR_MSW\" xpm" >&5
xe_check_libs=-lXpm
cat > conftest.$ac_ext <<EOF
-#line 8418 "configure"
+#line 8514 "configure"
#include "confdefs.h"
int main() {
XpmCreatePixmapFromData()
; return 0; }
EOF
-if { (eval echo configure:8425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xpm_for_msw=no
else
＠＠ -8447,15 +8543,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:8451: checking for compface.h" >&5
+echo "configure:8547: checking for compface.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8454 "configure"
+#line 8550 "configure"
#include "confdefs.h"
#include <compface.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8555: \"$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*
＠＠ -8478,12 +8574,12 ＠＠ fi
}
test -z "$with_xface" && {
echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8482: checking for UnGenFace in -lcompface" >&5
+echo "configure:8578: 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 8487 "configure"
+#line 8583 "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
＠＠ -8494,7 +8590,7 ＠＠ int main() {
UnGenFace()
; return 0; }
EOF
-if { (eval echo configure:8498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8594: \"$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
＠＠ -8546,12 +8642,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:8550: checking for inflate in -lc" >&5
+echo "configure:8646: 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 8555 "configure"
+#line 8651 "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
＠＠ -8562,7 +8658,7 ＠＠ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:8566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8662: \"$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
＠＠ -8581,12 +8677,12 ＠＠ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8585: checking for inflate in -lz" >&5
+echo "configure:8681: 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 8590 "configure"
+#line 8686 "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
＠＠ -8597,7 +8693,7 ＠＠ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:8601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8697: \"$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
＠＠ -8616,12 +8712,12 ＠＠ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8620: checking for inflate in -lgz" >&5
+echo "configure:8716: 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 8625 "configure"
+#line 8721 "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
＠＠ -8632,7 +8728,7 ＠＠ int main() {
inflate()
; return 0; }
EOF
-if { (eval echo configure:8636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8732: \"$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
＠＠ -8662,15 +8758,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:8666: checking for jpeglib.h" >&5
+echo "configure:8762: checking for jpeglib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8669 "configure"
+#line 8765 "configure"
#include "confdefs.h"
#include <jpeglib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8770: \"$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*
＠＠ -8693,12 +8789,12 ＠＠ fi
}
test -z "$with_jpeg" && {
echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8697: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8793: 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 8702 "configure"
+#line 8798 "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
＠＠ -8709,7 +8805,7 ＠＠ int main() {
jpeg_destroy_decompress()
; return 0; }
EOF
-if { (eval echo configure:8713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8809: \"$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
＠＠ -8745,10 +8841,10 ＠＠ EOF
png_problem=""
test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8749: checking for pow" >&5
+echo "configure:8845: checking for pow" >&5
cat > conftest.$ac_ext <<EOF
-#line 8752 "configure"
+#line 8848 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pow(); below. */
＠＠ -8771,7 +8867,7 ＠＠ pow();
; return 0; }
EOF
-if { (eval echo configure:8775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8871: \"$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
＠＠ -8792,15 +8888,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:8796: checking for png.h" >&5
+echo "configure:8892: checking for png.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8799 "configure"
+#line 8895 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8900: \"$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*
＠＠ -8823,12 +8919,12 ＠＠ fi
}
test -z "$with_png" && {
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8827: checking for png_read_image in -lpng" >&5
+echo "configure:8923: 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 8832 "configure"
+#line 8928 "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
＠＠ -8839,7 +8935,7 ＠＠ int main() {
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:8843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8939: \"$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
＠＠ -8862,10 +8958,10 ＠＠ fi
}
if test -z "$with_png"; then
echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8866: checking for workable png version information" >&5
+echo "configure:8962: checking for workable png version information" >&5
xe_check_libs="-lpng -lz"
cat > conftest.$ac_ext <<EOF
-#line 8869 "configure"
+#line 8965 "configure"
#include "confdefs.h"
#include <png.h>
int main(int c, char **v) {
＠＠ -8873,7 +8969,7 ＠＠ echo "configure:8866: checking for worka
if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
EOF
-if { (eval echo configure:8877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8973: \"$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
＠＠ -8916,15 +9012,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:8920: checking for tiffio.h" >&5
+echo "configure:9016: checking for tiffio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8923 "configure"
+#line 9019 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9024: \"$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*
＠＠ -8947,12 +9043,12 ＠＠ fi
}
test -z "$with_tiff" && {
echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8951: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:9047: 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 8956 "configure"
+#line 9052 "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
＠＠ -8963,7 +9059,7 ＠＠ int main() {
TIFFClientOpen()
; return 0; }
EOF
-if { (eval echo configure:8967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9063: \"$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
＠＠ -9002,15 +9098,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:9006: checking for compface.h" >&5
+echo "configure:9102: checking for compface.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9009 "configure"
+#line 9105 "configure"
#include "confdefs.h"
#include <compface.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9110: \"$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*
＠＠ -9033,12 +9129,12 ＠＠ fi
}
test -z "$with_xface" && {
echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9037: checking for UnGenFace in -lcompface" >&5
+echo "configure:9133: 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 9042 "configure"
+#line 9138 "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
＠＠ -9049,7 +9145,7 ＠＠ int main() {
UnGenFace()
; return 0; }
EOF
-if { (eval echo configure:9053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9149: \"$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
＠＠ -9088,12 +9184,12 ＠＠ fi
if test "$with_x11" = "yes"; then
echo "checking for X11 graphics libraries" 1>&6
-echo "configure:9092: checking for X11 graphics libraries" >&5
+echo "configure:9188: checking for X11 graphics libraries" >&5
fi
if test "$with_x11" = "yes"; then
echo "checking for the Athena widgets" 1>&6
-echo "configure:9097: checking for the Athena widgets" >&5
+echo "configure:9193: checking for the Athena widgets" >&5
case "$with_athena" in
"xaw" | "") athena_variant=Xaw athena_3d=no ;;
＠＠ -9109,12 +9205,12 ＠＠ echo "configure:9097: checking for the A
if test "$athena_3d" = "no"; then
echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9113: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:9209: 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 9118 "configure"
+#line 9214 "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
＠＠ -9125,7 +9221,7 ＠＠ int main() {
XawScrollbarSetThumb()
; return 0; }
EOF
-if { (eval echo configure:9129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9225: \"$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
＠＠ -9141,12 +9237,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9145: checking for $athena_3d_function in -l$athena_variant" >&5
+echo "configure:9241: checking for $athena_3d_function in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 9150 "configure"
+#line 9246 "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
＠＠ -9157,7 +9253,7 ＠＠ int main() {
$athena_3d_function()
; return 0; }
EOF
-if { (eval echo configure:9161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9257: \"$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
＠＠ -9188,12 +9284,12 ＠＠ fi
else
echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9192: checking for $athena_3d_function in -l$athena_variant" >&5
+echo "configure:9288: checking for $athena_3d_function in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 9197 "configure"
+#line 9293 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9204,7 +9300,7 ＠＠ int main() {
$athena_3d_function()
; return 0; }
EOF
-if { (eval echo configure:9208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9222,12 +9318,12 ＠＠ if eval "test \"`echo '$ac_cv_lib_'$ac_l
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for $athena_3d_function in -lXaw""... $ac_c" 1>&6
-echo "configure:9226: checking for $athena_3d_function in -lXaw" >&5
+echo "configure:9322: checking for $athena_3d_function in -lXaw" >&5
ac_lib_var=`echo Xaw'_'$athena_3d_function | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXaw "
cat > conftest.$ac_ext <<EOF
-#line 9231 "configure"
+#line 9327 "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
＠＠ -9238,7 +9334,7 ＠＠ int main() {
$athena_3d_function()
; return 0; }
EOF
-if { (eval echo configure:9242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9338: \"$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
＠＠ -9269,15 +9365,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:9273: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9369: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9276 "configure"
+#line 9372 "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:9281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9377: \"$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*
＠＠ -9297,15 +9393,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:9301: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:9397: checking for X11/Xaw/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9304 "configure"
+#line 9400 "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:9309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9405: \"$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*
＠＠ -9331,15 +9427,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:9335: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:9431: checking for X11/$athena_variant/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9338 "configure"
+#line 9434 "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:9343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9439: \"$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*
＠＠ -9356,15 +9452,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:9360: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9456: checking for X11/$athena_variant/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9363 "configure"
+#line 9459 "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:9368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9392,15 +9488,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:9396: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9492: checking for $athena_variant/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9399 "configure"
+#line 9495 "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:9404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9500: \"$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*
＠＠ -9417,15 +9513,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:9421: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9517: checking for $athena_variant/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9424 "configure"
+#line 9520 "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:9429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9525: \"$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*
＠＠ -9454,15 +9550,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:9458: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9554: checking for X11/Xaw3d/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9461 "configure"
+#line 9557 "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:9466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9562: \"$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*
＠＠ -9479,15 +9575,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:9483: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9579: checking for X11/Xaw3d/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9486 "configure"
+#line 9582 "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:9491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9587: \"$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*
＠＠ -9519,15 +9615,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:9523: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9619: checking for Xaw3d/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9526 "configure"
+#line 9622 "configure"
#include "confdefs.h"
#include <Xaw3d/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9627: \"$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*
＠＠ -9544,15 +9640,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:9548: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9644: checking for Xaw3d/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9551 "configure"
+#line 9647 "configure"
#include "confdefs.h"
#include <Xaw3d/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9652: \"$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*
＠＠ -9584,15 +9680,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:9588: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9684: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9591 "configure"
+#line 9687 "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:9596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9692: \"$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*
＠＠ -9631,15 +9727,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:9635: checking for Xm/Xm.h" >&5
+echo "configure:9731: checking for Xm/Xm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9638 "configure"
+#line 9734 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9739: \"$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*
＠＠ -9656,12 +9752,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:9660: checking for XmStringFree in -lXm" >&5
+echo "configure:9756: 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 9665 "configure"
+#line 9761 "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
＠＠ -9672,7 +9768,7 ＠＠ int main() {
XmStringFree()
; return 0; }
EOF
-if { (eval echo configure:9676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9772: \"$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
＠＠ -9701,9 +9797,9 ＠＠ fi
if test "$have_motif" = "yes"; then
echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9705: checking for Lesstif" >&5
+echo "configure:9801: checking for Lesstif" >&5
cat > conftest.$ac_ext <<EOF
-#line 9707 "configure"
+#line 9803 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
#ifdef LESSTIF_VERSION
＠＠ -10149,7 +10245,7 ＠＠ fi
if test "$with_mule" = "yes" ; then
echo "checking for Mule-related features" 1>&6
-echo "configure:10153: checking for Mule-related features" >&5
+echo "configure:10249: checking for Mule-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining MULE
EOF
＠＠ -10174,15 +10270,15 ＠＠ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10178: checking for $ac_hdr" >&5
+echo "configure:10274: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 10181 "configure"
+#line 10277 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10213,12 +10309,12 ＠＠ done
echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:10217: checking for strerror in -lintl" >&5
+echo "configure:10313: 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 10222 "configure"
+#line 10318 "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
＠＠ -10229,7 +10325,7 ＠＠ int main() {
strerror()
; return 0; }
EOF
-if { (eval echo configure:10233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10329: \"$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
＠＠ -10262,18 +10358,18 ＠＠ fi
echo "checking for Mule input methods" 1>&6
-echo "configure:10266: checking for Mule input methods" >&5
+echo "configure:10362: checking for Mule input methods" >&5
case "$with_xim" in "" | "yes" )
echo "checking for XIM" 1>&6
-echo "configure:10269: checking for XIM" >&5
+echo "configure:10365: checking for XIM" >&5
echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:10272: checking for XOpenIM in -lX11" >&5
+echo "configure:10368: 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 10277 "configure"
+#line 10373 "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
＠＠ -10284,7 +10380,7 ＠＠ int main() {
XOpenIM()
; return 0; }
EOF
-if { (eval echo configure:10288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10384: \"$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
＠＠ -10308,12 +10404,12 ＠＠ fi
if test "$need_motif $have_lesstif" = "yes no"; then
echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10312: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10408: 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 10317 "configure"
+#line 10413 "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
＠＠ -10324,7 +10420,7 ＠＠ int main() {
XmImMbLookupString()
; return 0; }
EOF
-if { (eval echo configure:10328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10424: \"$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
＠＠ -10347,12 +10443,12 ＠＠ fi
elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then
echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10351: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10447: 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 10356 "configure"
+#line 10452 "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
＠＠ -10363,7 +10459,7 ＠＠ int main() {
XmImMbLookupString()
; return 0; }
EOF
-if { (eval echo configure:10367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10463: \"$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
＠＠ -10428,15 +10524,15 ＠＠ EOF
if test "$with_xfs" = "yes" ; then
echo "checking for XFontSet" 1>&6
-echo "configure:10432: checking for XFontSet" >&5
+echo "configure:10528: checking for XFontSet" >&5
echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10435: checking for XmbDrawString in -lX11" >&5
+echo "configure:10531: 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 10440 "configure"
+#line 10536 "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
＠＠ -10447,7 +10543,7 ＠＠ int main() {
XmbDrawString()
; return 0; }
EOF
-if { (eval echo configure:10451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10547: \"$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
＠＠ -10487,15 +10583,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:10491: checking for wnn/jllib.h" >&5
+echo "configure:10587: checking for wnn/jllib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10494 "configure"
+#line 10590 "configure"
#include "confdefs.h"
#include <wnn/jllib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10595: \"$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*
＠＠ -10518,15 +10614,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:10522: checking for wnn/commonhd.h" >&5
+echo "configure:10618: checking for wnn/commonhd.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10525 "configure"
+#line 10621 "configure"
#include "confdefs.h"
#include <wnn/commonhd.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10626: \"$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*
＠＠ -10551,10 +10647,10 ＠＠ fi
for ac_func in crypt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10555: checking for $ac_func" >&5
+echo "configure:10651: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 10558 "configure"
+#line 10654 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -10577,7 +10673,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:10581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10677: \"$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
＠＠ -10606,12 +10702,12 ＠＠ done
test "$ac_cv_func_crypt" != "yes" && {
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10610: checking for crypt in -lcrypt" >&5
+echo "configure:10706: 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 10615 "configure"
+#line 10711 "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
＠＠ -10622,7 +10718,7 ＠＠ int main() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:10626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10722: \"$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
＠＠ -10657,12 +10753,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:10661: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10757: 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 10666 "configure"
+#line 10762 "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
＠＠ -10673,7 +10769,7 ＠＠ int main() {
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:10677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10773: \"$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
＠＠ -10691,12 +10787,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:10695: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10791: 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 10700 "configure"
+#line 10796 "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
＠＠ -10707,7 +10803,7 ＠＠ int main() {
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:10711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10807: \"$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
＠＠ -10725,12 +10821,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:10729: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10825: 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 10734 "configure"
+#line 10830 "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
＠＠ -10741,7 +10837,7 ＠＠ int main() {
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:10745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10841: \"$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
＠＠ -10759,12 +10855,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:10763: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10859: 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 10768 "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
＠＠ -10775,7 +10871,7 ＠＠ int main() {
dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:10779: \"$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
＠＠ -10823,12 +10919,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:10827: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10923: 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 10832 "configure"
+#line 10928 "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
＠＠ -10839,7 +10935,7 ＠＠ int main() {
jl_fi_dic_list()
; return 0; }
EOF
-if { (eval echo configure:10843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10939: \"$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
＠＠ -10874,15 +10970,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:10878: checking for canna/jrkanji.h" >&5
+echo "configure:10974: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10881 "configure"
+#line 10977 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10982: \"$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*
＠＠ -10909,15 +11005,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:10913: checking for canna/jrkanji.h" >&5
+echo "configure:11009: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10916 "configure"
+#line 11012 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11017: \"$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*
＠＠ -10945,15 +11041,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:10949: checking for canna/RK.h" >&5
+echo "configure:11045: checking for canna/RK.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10952 "configure"
+#line 11048 "configure"
#include "confdefs.h"
#include <canna/RK.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11053: \"$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*
＠＠ -10976,12 +11072,12 ＠＠ fi
}
test -z "$with_canna" && {
echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:10980: checking for RkBgnBun in -lRKC" >&5
+echo "configure:11076: 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 10985 "configure"
+#line 11081 "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
＠＠ -10992,7 +11088,7 ＠＠ int main() {
RkBgnBun()
; return 0; }
EOF
-if { (eval echo configure:10996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11092: \"$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
＠＠ -11015,12 +11111,12 ＠＠ fi
}
test -z "$with_canna" && {
echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:11019: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:11115: 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 11024 "configure"
+#line 11120 "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
＠＠ -11031,7 +11127,7 ＠＠ int main() {
jrKanjiControl()
; return 0; }
EOF
-if { (eval echo configure:11035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11131: \"$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
＠＠ -11080,12 +11176,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:11084: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:11180: 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 11089 "configure"
+#line 11185 "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
＠＠ -11096,7 +11192,7 ＠＠ int main() {
layout_object_getvalue()
; return 0; }
EOF
-if { (eval echo configure:11100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11196: \"$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
＠＠ -11183,10 +11279,10 ＠＠ fi
for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11187: checking for $ac_func" >&5
+echo "configure:11283: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 11190 "configure"
+#line 11286 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -11209,7 +11305,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:11213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11309: \"$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
＠＠ -11250,10 +11346,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:11254: checking for $ac_func" >&5
+echo "configure:11350: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 11257 "configure"
+#line 11353 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -11276,7 +11372,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:11280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11376: \"$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
＠＠ -11305,10 +11401,10 ＠＠ done
echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:11309: checking for openpty" >&5
+echo "configure:11405: checking for openpty" >&5
cat > conftest.$ac_ext <<EOF
-#line 11312 "configure"
+#line 11408 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char openpty(); below. */
＠＠ -11331,7 +11427,7 ＠＠ openpty();
; return 0; }
EOF
-if { (eval echo configure:11335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11431: \"$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
＠＠ -11350,12 +11446,12 ＠＠ else
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:11354: checking for openpty in -lutil" >&5
+echo "configure:11450: 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 11359 "configure"
+#line 11455 "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
＠＠ -11366,7 +11462,7 ＠＠ int main() {
openpty()
; return 0; }
EOF
-if { (eval echo configure:11370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11466: \"$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
＠＠ -11401,15 +11497,15 ＠＠ EOF
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11405: checking for $ac_hdr" >&5
+echo "configure:11501: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11408 "configure"
+#line 11504 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11509: \"$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*
＠＠ -11445,15 +11541,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:11449: checking for $ac_hdr" >&5
+echo "configure:11545: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11452 "configure"
+#line 11548 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11553: \"$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*
＠＠ -11486,10 +11582,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:11490: checking for $ac_func" >&5
+echo "configure:11586: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 11493 "configure"
+#line 11589 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -11512,7 +11608,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:11516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11612: \"$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
＠＠ -11543,15 +11639,15 ＠＠ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11547: checking for $ac_hdr" >&5
+echo "configure:11643: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11550 "configure"
+#line 11646 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11651: \"$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*
＠＠ -11588,10 +11684,10 ＠＠ extra_objs="$extra_objs realpath.o" &&
for ac_func in getloadavg
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11592: checking for $ac_func" >&5
+echo "configure:11688: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 11595 "configure"
+#line 11691 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -11614,7 +11710,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:11618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11714: \"$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
＠＠ -11647,15 +11743,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:11651: checking for $ac_hdr" >&5
+echo "configure:11747: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11654 "configure"
+#line 11750 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11755: \"$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*
＠＠ -11691,12 +11787,12 ＠＠ else
echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11695: checking for kstat_open in -lkstat" >&5
+echo "configure:11791: 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 11700 "configure"
+#line 11796 "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
＠＠ -11707,7 +11803,7 ＠＠ int main() {
kstat_open()
; return 0; }
EOF
-if { (eval echo configure:11711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11807: \"$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
＠＠ -11742,15 +11838,15 ＠＠ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11746: checking for $ac_hdr" >&5
+echo "configure:11842: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11749 "configure"
+#line 11845 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11850: \"$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*
＠＠ -11782,12 +11878,12 ＠＠ done
echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11786: checking for kvm_read in -lkvm" >&5
+echo "configure:11882: 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 11791 "configure"
+#line 11887 "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
＠＠ -11798,7 +11894,7 ＠＠ int main() {
kvm_read()
; return 0; }
EOF
-if { (eval echo configure:11802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11898: \"$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
＠＠ -11832,16 +11928,16 ＠＠ fi
fi
echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11836: checking whether netdb declares h_errno" >&5
+echo "configure:11932: checking whether netdb declares h_errno" >&5
cat > conftest.$ac_ext <<EOF
-#line 11838 "configure"
+#line 11934 "configure"
#include "confdefs.h"
#include <netdb.h>
int main() {
return h_errno;
; return 0; }
EOF
-if { (eval echo configure:11845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11941: \"$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
＠＠ -11861,16 +11957,16 ＠＠ fi
rm -f conftest*
echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11865: checking for sigsetjmp" >&5
+echo "configure:11961: checking for sigsetjmp" >&5
cat > conftest.$ac_ext <<EOF
-#line 11867 "configure"
+#line 11963 "configure"
#include "confdefs.h"
#include <setjmp.h>
int main() {
sigjmp_buf bar; sigsetjmp (bar, 0);
; return 0; }
EOF
-if { (eval echo configure:11874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11970: \"$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
＠＠ -11890,11 +11986,11 ＠＠ fi
rm -f conftest*
echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11894: checking whether localtime caches TZ" >&5
+echo "configure:11990: checking whether localtime caches TZ" >&5
if test "$ac_cv_func_tzset" = "yes"; then
cat > conftest.$ac_ext <<EOF
-#line 11898 "configure"
+#line 11994 "configure"
#include "confdefs.h"
#include <time.h>
#if STDC_HEADERS
＠＠ -11929,7 +12025,7 ＠＠ main()
exit (0);
}
EOF
-if { (eval echo configure:11933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
emacs_cv_localtime_cache=no
else
＠＠ -11959,9 +12055,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:11963: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:12059: checking whether gettimeofday accepts one or two arguments" >&5
cat > conftest.$ac_ext <<EOF
-#line 11965 "configure"
+#line 12061 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
＠＠ -11982,7 +12078,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:11986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12082: \"$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
＠＠ -12004,19 +12100,19 ＠＠ fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:12008: checking for inline" >&5
+echo "configure:12104: checking for inline" >&5
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 12013 "configure"
+#line 12109 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:12020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
＠＠ -12057,17 +12153,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:12061: checking for working alloca.h" >&5
+echo "configure:12157: checking for working alloca.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12064 "configure"
+#line 12160 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:12071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12167: \"$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
＠＠ -12091,10 +12187,10 ＠＠ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:12095: checking for alloca" >&5
+echo "configure:12191: checking for alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 12098 "configure"
+#line 12194 "configure"
#include "confdefs.h"
#ifdef __GNUC__
＠＠ -12122,7 +12218,7 ＠＠ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:12126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12222: \"$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
＠＠ -12161,10 +12257,10 ＠＠ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:12165: checking whether alloca needs Cray hooks" >&5
+echo "configure:12261: checking whether alloca needs Cray hooks" >&5
cat > conftest.$ac_ext <<EOF
-#line 12168 "configure"
+#line 12264 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
＠＠ -12188,10 +12284,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:12192: checking for $ac_func" >&5
+echo "configure:12288: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12195 "configure"
+#line 12291 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12214,7 +12310,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:12218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12314: \"$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
＠＠ -12244,10 +12340,10 ＠＠ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:12248: checking stack direction for C alloca" >&5
+echo "configure:12344: checking stack direction for C alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 12251 "configure"
+#line 12347 "configure"
#include "confdefs.h"
find_stack_direction ()
{
＠＠ -12266,7 +12362,7 ＠＠ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:12270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_c_stack_direction=1
else
＠＠ -12296,15 +12392,15 ＠＠ fi
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:12300: checking for vfork.h" >&5
+echo "configure:12396: checking for vfork.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12303 "configure"
+#line 12399 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12404: \"$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*
＠＠ -12332,10 +12428,10 ＠＠ else
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:12336: checking for working vfork" >&5
+echo "configure:12432: checking for working vfork" >&5
cat > conftest.$ac_ext <<EOF
-#line 12339 "configure"
+#line 12435 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
＠＠ -12430,7 +12526,7 ＠＠ main() {
}
}
EOF
-if { (eval echo configure:12434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_vfork_works=yes
else
＠＠ -12456,10 +12552,10 ＠＠ fi
echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12460: checking for working strcoll" >&5
+echo "configure:12556: checking for working strcoll" >&5
cat > conftest.$ac_ext <<EOF
-#line 12463 "configure"
+#line 12559 "configure"
#include "confdefs.h"
#include <string.h>
main ()
＠＠ -12469,7 +12565,7 ＠＠ main ()
strcoll ("123", "456") >= 0);
}
EOF
-if { (eval echo configure:12473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_strcoll_works=yes
else
＠＠ -12497,10 +12593,10 ＠＠ fi
for ac_func in getpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12501: checking for $ac_func" >&5
+echo "configure:12597: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12504 "configure"
+#line 12600 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12523,7 +12619,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:12527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12623: \"$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
＠＠ -12551,10 +12647,10 ＠＠ fi
done
echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12555: checking whether getpgrp takes no argument" >&5
+echo "configure:12651: checking whether getpgrp takes no argument" >&5
cat > conftest.$ac_ext <<EOF
-#line 12558 "configure"
+#line 12654 "configure"
#include "confdefs.h"
/*
＠＠ -12609,7 +12705,7 ＠＠ main()
}
EOF
-if { (eval echo configure:12613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_getpgrp_void=yes
else
＠＠ -12636,10 +12732,10 ＠＠ fi
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12640: checking for working mmap" >&5
+echo "configure:12736: checking for working mmap" >&5
case "$opsys" in ultrix* ) have_mmap=no ;; *)
cat > conftest.$ac_ext <<EOF
-#line 12643 "configure"
+#line 12739 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <unistd.h>
＠＠ -12672,7 +12768,7 ＠＠ int main (int argc, char *argv[])
return 1;
}
EOF
-if { (eval echo configure:12676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
have_mmap=yes
else
＠＠ -12701,9 +12797,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:12705: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12801: checking for M_MMAP_THRESHOLD" >&5
cat > conftest.$ac_ext <<EOF
-#line 12707 "configure"
+#line 12803 "configure"
#include "confdefs.h"
#include <malloc.h>
int main() {
＠＠ -12715,7 +12811,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:12719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
rel_alloc=no; echo "$ac_t""yes" 1>&6;
else
＠＠ -12740,15 +12836,15 ＠＠ EOF
ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12744: checking for termios.h" >&5
+echo "configure:12840: checking for termios.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12747 "configure"
+#line 12843 "configure"
#include "confdefs.h"
#include <termios.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12848: \"$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*
＠＠ -12791,15 +12887,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:12795: checking for termio.h" >&5
+echo "configure:12891: checking for termio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12798 "configure"
+#line 12894 "configure"
#include "confdefs.h"
#include <termio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12899: \"$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*
＠＠ -12831,10 +12927,10 ＠＠ fi
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12835: checking for socket" >&5
+echo "configure:12931: checking for socket" >&5
cat > conftest.$ac_ext <<EOF
-#line 12838 "configure"
+#line 12934 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
＠＠ -12857,7 +12953,7 ＠＠ socket();
; return 0; }
EOF
-if { (eval echo configure:12861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12957: \"$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
＠＠ -12872,15 +12968,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:12876: checking for netinet/in.h" >&5
+echo "configure:12972: checking for netinet/in.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12879 "configure"
+#line 12975 "configure"
#include "confdefs.h"
#include <netinet/in.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12980: \"$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*
＠＠ -12897,15 +12993,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:12901: checking for arpa/inet.h" >&5
+echo "configure:12997: checking for arpa/inet.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 12904 "configure"
+#line 13000 "configure"
#include "confdefs.h"
#include <arpa/inet.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13005: \"$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*
＠＠ -12930,9 +13026,9 ＠＠ EOF
}
echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:12934: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:13030: checking "for sun_len member in struct sockaddr_un"" >&5
cat > conftest.$ac_ext <<EOF
-#line 12936 "configure"
+#line 13032 "configure"
#include "confdefs.h"
#include <sys/types.h>
＠＠ -12943,7 +13039,7 ＠＠ int main() {
static struct sockaddr_un x; x.sun_len = 1;
; return 0; }
EOF
-if { (eval echo configure:12947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13043: \"$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
＠＠ -12961,9 +13057,9 ＠＠ else
fi
rm -f conftest*
echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:12965: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:13061: checking "for ip_mreq struct in netinet/in.h"" >&5
cat > conftest.$ac_ext <<EOF
-#line 12967 "configure"
+#line 13063 "configure"
#include "confdefs.h"
#include <sys/types.h>
＠＠ -12973,7 +13069,7 ＠＠ int main() {
static struct ip_mreq x;
; 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:13073: \"$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
＠＠ -13004,10 +13100,10 ＠＠ fi
echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:13008: checking for msgget" >&5
+echo "configure:13104: checking for msgget" >&5
cat > conftest.$ac_ext <<EOF
-#line 13011 "configure"
+#line 13107 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char msgget(); below. */
＠＠ -13030,7 +13126,7 ＠＠ msgget();
; return 0; }
EOF
-if { (eval echo configure:13034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13130: \"$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
＠＠ -13045,15 +13141,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:13049: checking for sys/ipc.h" >&5
+echo "configure:13145: checking for sys/ipc.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13052 "configure"
+#line 13148 "configure"
#include "confdefs.h"
#include <sys/ipc.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13153: \"$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*
＠＠ -13070,15 +13166,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:13074: checking for sys/msg.h" >&5
+echo "configure:13170: checking for sys/msg.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13077 "configure"
+#line 13173 "configure"
#include "confdefs.h"
#include <sys/msg.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13178: \"$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*
＠＠ -13116,15 +13212,15 ＠＠ fi
ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:13120: checking for dirent.h" >&5
+echo "configure:13216: checking for dirent.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13123 "configure"
+#line 13219 "configure"
#include "confdefs.h"
#include <dirent.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13224: \"$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*
＠＠ -13151,15 +13247,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:13155: checking for sys/dir.h" >&5
+echo "configure:13251: checking for sys/dir.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13158 "configure"
+#line 13254 "configure"
#include "confdefs.h"
#include <sys/dir.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13259: \"$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*
＠＠ -13192,15 +13288,15 ＠＠ fi
ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:13196: checking for nlist.h" >&5
+echo "configure:13292: checking for nlist.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13199 "configure"
+#line 13295 "configure"
#include "confdefs.h"
#include <nlist.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13300: \"$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*
＠＠ -13230,22 +13326,22 ＠＠ fi
echo "checking "for sound support"" 1>&6
-echo "configure:13234: checking "for sound support"" >&5
+echo "configure:13330: 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:13241: checking for multimedia/audio_device.h" >&5
+echo "configure:13337: checking for multimedia/audio_device.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13244 "configure"
+#line 13340 "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:13249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13345: \"$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*
＠＠ -13301,12 +13397,12 ＠＠ fi
if test -z "$native_sound_lib"; then
echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:13305: checking for ALopenport in -laudio" >&5
+echo "configure:13401: 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 13310 "configure"
+#line 13406 "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
＠＠ -13317,7 +13413,7 ＠＠ int main() {
ALopenport()
; return 0; }
EOF
-if { (eval echo configure:13321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13417: \"$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
＠＠ -13348,12 +13444,12 ＠＠ fi
if test -z "$native_sound_lib"; then
echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:13352: checking for AOpenAudio in -lAlib" >&5
+echo "configure:13448: 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 13357 "configure"
+#line 13453 "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
＠＠ -13364,7 +13460,7 ＠＠ int main() {
AOpenAudio()
; return 0; }
EOF
-if { (eval echo configure:13368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13464: \"$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
＠＠ -13409,15 +13505,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:13413: checking for ${dir}/soundcard.h" >&5
+echo "configure:13509: checking for ${dir}/soundcard.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13416 "configure"
+#line 13512 "configure"
#include "confdefs.h"
#include <${dir}/soundcard.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13517: \"$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*
＠＠ -13471,15 +13567,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:13475: checking for audio/audiolib.h" >&5
+echo "configure:13571: checking for audio/audiolib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13478 "configure"
+#line 13574 "configure"
#include "confdefs.h"
#include <audio/audiolib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13579: \"$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*
＠＠ -13497,12 +13593,12 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13501: checking for AuOpenServer in -laudio" >&5
+echo "configure:13597: 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 13506 "configure"
+#line 13602 "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
＠＠ -13513,7 +13609,7 ＠＠ int main() {
AuOpenServer()
; return 0; }
EOF
-if { (eval echo configure:13517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13613: \"$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
＠＠ -13552,7 +13648,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 13556 "configure"
+#line 13652 "configure"
#include "confdefs.h"
#include <audio/Xtutil.h>
EOF
＠＠ -13583,7 +13679,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:13587: checking for $ac_word" >&5
+echo "configure:13683: 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.
＠＠ -13612,10 +13708,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:13616: checking for esd_play_stream" >&5
+echo "configure:13712: checking for esd_play_stream" >&5
cat > conftest.$ac_ext <<EOF
-#line 13619 "configure"
+#line 13715 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char esd_play_stream(); below. */
＠＠ -13638,7 +13734,7 ＠＠ esd_play_stream();
; return 0; }
EOF
-if { (eval echo configure:13642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13738: \"$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
＠＠ -13689,7 +13785,7 ＠＠ test -z "$with_tty" && with_tty=yes
if test "$with_tty" = "yes" ; then
echo "checking for TTY-related features" 1>&6
-echo "configure:13693: checking for TTY-related features" >&5
+echo "configure:13789: checking for TTY-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_TTY
EOF
＠＠ -13705,12 +13801,12 ＠＠ EOF
if test -z "$with_ncurses"; then
echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13709: checking for tgetent in -lncurses" >&5
+echo "configure:13805: 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 13714 "configure"
+#line 13810 "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
＠＠ -13721,7 +13817,7 ＠＠ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:13725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13821: \"$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
＠＠ -13754,15 +13850,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:13758: checking for ncurses/curses.h" >&5
+echo "configure:13854: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13761 "configure"
+#line 13857 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13862: \"$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*
＠＠ -13784,15 +13880,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:13788: checking for ncurses/term.h" >&5
+echo "configure:13884: checking for ncurses/term.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13791 "configure"
+#line 13887 "configure"
#include "confdefs.h"
#include <ncurses/term.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13892: \"$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*
＠＠ -13822,15 +13918,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:13826: checking for ncurses/curses.h" >&5
+echo "configure:13922: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13829 "configure"
+#line 13925 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13930: \"$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*
＠＠ -13865,12 +13961,12 ＠＠ fi
for lib in curses termlib termcap; do
echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13869: checking for tgetent in -l$lib" >&5
+echo "configure:13965: 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 13874 "configure"
+#line 13970 "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
＠＠ -13881,7 +13977,7 ＠＠ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:13885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13981: \"$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
＠＠ -13906,12 +14002,12 ＠＠ fi
else if test -n "$libs_termcap" -a "$opsys" = "openbsd"; then
echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:13910: checking for tgoto in -ltermcap" >&5
+echo "configure:14006: checking for tgoto in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltermcap "
cat > conftest.$ac_ext <<EOF
-#line 13915 "configure"
+#line 14011 "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
＠＠ -13922,7 +14018,7 ＠＠ int main() {
tgoto()
; return 0; }
EOF
-if { (eval echo configure:13926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14022: \"$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
＠＠ -13967,12 +14063,12 ＠＠ fi
else
echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:13971: checking for tgetent in -lcurses" >&5
+echo "configure:14067: 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 13976 "configure"
+#line 14072 "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
＠＠ -13983,7 +14079,7 ＠＠ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:13987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14083: \"$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
＠＠ -14001,12 +14097,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:14005: checking for tgetent in -ltermcap" >&5
+echo "configure:14101: 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 14010 "configure"
+#line 14106 "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
＠＠ -14017,7 +14113,7 ＠＠ int main() {
tgetent()
; return 0; }
EOF
-if { (eval echo configure:14021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14117: \"$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
＠＠ -14066,15 +14162,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:14070: checking for gpm.h" >&5
+echo "configure:14166: checking for gpm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14073 "configure"
+#line 14169 "configure"
#include "confdefs.h"
#include <gpm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14174: \"$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*
＠＠ -14092,12 +14188,12 ＠＠ if eval "test \"`echo '$ac_cv_header_'$a
echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:14096: checking for Gpm_Open in -lgpm" >&5
+echo "configure:14192: 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 14101 "configure"
+#line 14197 "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
＠＠ -14108,7 +14204,7 ＠＠ int main() {
Gpm_Open()
; return 0; }
EOF
-if { (eval echo configure:14112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14208: \"$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
＠＠ -14167,20 +14263,20 ＠＠ test "$with_x11" = "yes" -o "$with_tty"
test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
!= "no no no" && echo "checking for database support" 1>&6
-echo "configure:14171: checking for database support" >&5
+echo "configure:14267: 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:14176: checking for ndbm.h" >&5
+echo "configure:14272: checking for ndbm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14179 "configure"
+#line 14275 "configure"
#include "confdefs.h"
#include <ndbm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14280: \"$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*
＠＠ -14210,12 +14306,12 ＠＠ fi
if test "$with_database_gdbm" != "no"; then
echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:14214: checking for dbm_open in -lgdbm" >&5
+echo "configure:14310: 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 14219 "configure"
+#line 14315 "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
＠＠ -14226,7 +14322,7 ＠＠ int main() {
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:14230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14326: \"$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
＠＠ -14254,10 +14350,10 ＠＠ fi
if test "$with_database_dbm" != "no"; then
echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:14258: checking for dbm_open" >&5
+echo "configure:14354: checking for dbm_open" >&5
cat > conftest.$ac_ext <<EOF
-#line 14261 "configure"
+#line 14357 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dbm_open(); below. */
＠＠ -14280,7 +14376,7 ＠＠ dbm_open();
; return 0; }
EOF
-if { (eval echo configure:14284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14380: \"$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
＠＠ -14299,12 +14395,12 ＠＠ else
echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:14303: checking for dbm_open in -ldbm" >&5
+echo "configure:14399: 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 14308 "configure"
+#line 14404 "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
＠＠ -14315,7 +14411,7 ＠＠ int main() {
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:14319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14415: \"$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
＠＠ -14355,10 +14451,10 ＠＠ EOF
echo $ac_n "checking for u_int8_t""... $ac_c" 1>&6
-echo "configure:14359: checking for u_int8_t" >&5
+echo "configure:14455: checking for u_int8_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 14362 "configure"
+#line 14458 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -14399,10 +14495,10 ＠＠ EOF
fi
echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6
-echo "configure:14403: checking for u_int16_t" >&5
+echo "configure:14499: checking for u_int16_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 14406 "configure"
+#line 14502 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -14443,10 +14539,10 ＠＠ EOF
fi
echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
-echo "configure:14447: checking for u_int32_t" >&5
+echo "configure:14543: checking for u_int32_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 14450 "configure"
+#line 14546 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -14487,10 +14583,10 ＠＠ EOF
fi
echo $ac_n "checking for u_int64_t""... $ac_c" 1>&6
-echo "configure:14491: checking for u_int64_t" >&5
+echo "configure:14587: checking for u_int64_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 14494 "configure"
+#line 14590 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -14533,12 +14629,12 ＠＠ fi
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:14537: checking for Berkeley db.h" >&5
+echo "configure:14633: checking for Berkeley db.h" >&5
for header in "db/db.h" "db.h"; do
case "$opsys" in
*freebsd*)
cat > conftest.$ac_ext <<EOF
-#line 14542 "configure"
+#line 14638 "configure"
#include "confdefs.h"
#include <stdlib.h>
＠＠ -14554,7 +14650,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:14558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
db_h_file="$header"; break
else
＠＠ -14565,7 +14661,7 ＠＠ rm -f conftest*
;;
*)
cat > conftest.$ac_ext <<EOF
-#line 14569 "configure"
+#line 14665 "configure"
#include "confdefs.h"
#include <stdlib.h>
＠＠ -14595,7 +14691,7 ＠＠ int main() {
; return 0; }
EOF
-if { (eval echo configure:14599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
db_h_file="$header"; break
else
＠＠ -14613,9 +14709,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:14617: checking for Berkeley DB version" >&5
+echo "configure:14713: checking for Berkeley DB version" >&5
cat > conftest.$ac_ext <<EOF
-#line 14619 "configure"
+#line 14715 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 1
＠＠ -14627,7 +14723,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 14631 "configure"
+#line 14727 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 2
＠＠ -14654,10 +14750,10 ＠＠ fi
rm -f conftest*
echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:14658: checking for $dbfunc" >&5
+echo "configure:14754: checking for $dbfunc" >&5
cat > conftest.$ac_ext <<EOF
-#line 14661 "configure"
+#line 14757 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $dbfunc(); below. */
＠＠ -14680,7 +14776,7 ＠＠ $dbfunc();
; return 0; }
EOF
-if { (eval echo configure:14684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14780: \"$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
＠＠ -14699,12 +14795,12 ＠＠ else
echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14703: checking for $dbfunc in -ldb" >&5
+echo "configure:14799: 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 14708 "configure"
+#line 14804 "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
＠＠ -14715,7 +14811,7 ＠＠ int main() {
$dbfunc()
; return 0; }
EOF
-if { (eval echo configure:14719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14815: \"$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
＠＠ -14779,12 +14875,12 ＠＠ fi
if test "$with_socks" = "yes"; then
echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14783: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14879: 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 14788 "configure"
+#line 14884 "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
＠＠ -14795,7 +14891,7 ＠＠ int main() {
SOCKSinit()
; return 0; }
EOF
-if { (eval echo configure:14799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14895: \"$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
＠＠ -14850,7 +14946,7 ＠＠ fi
if test "$with_modules" != "no"; then
echo "checking for module support" 1>&6
-echo "configure:14854: checking for module support" >&5
+echo "configure:14950: checking for module support" >&5
if test "$with_msw" = "yes"; then
have_dl=yes;
＠＠ -14866,15 +14962,15 ＠＠ EOF
;;
*) ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:14870: checking for dlfcn.h" >&5
+echo "configure:14966: checking for dlfcn.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14873 "configure"
+#line 14969 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14974: \"$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*
＠＠ -14891,16 +14987,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:14895: checking for dlopen in -lc" >&5
+echo "configure:14991: checking for dlopen in -lc" >&5
cat > conftest.$ac_ext <<EOF
-#line 14897 "configure"
+#line 14993 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:14904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -14909,18 +15005,18 ＠＠ else
rm -rf conftest*
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14913: checking for dlopen in -ldl" >&5
+echo "configure:15009: checking for dlopen in -ldl" >&5
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14917 "configure"
+#line 15013 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:14924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -14949,12 +15045,12 ＠＠ EOF
else
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14953: checking for shl_load in -ldld" >&5
+echo "configure:15049: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldld "
cat > conftest.$ac_ext <<EOF
-#line 14958 "configure"
+#line 15054 "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
＠＠ -14965,7 +15061,7 ＠＠ int main() {
shl_load()
; return 0; }
EOF
-if { (eval echo configure:14969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15065: \"$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
＠＠ -14992,12 +15088,12 ＠＠ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14996: checking for dld_init in -ldld" >&5
+echo "configure:15092: checking for dld_init in -ldld" >&5
ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldld "
cat > conftest.$ac_ext <<EOF
-#line 15001 "configure"
+#line 15097 "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
＠＠ -15008,7 +15104,7 ＠＠ int main() {
dld_init()
; return 0; }
EOF
-if { (eval echo configure:15012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15108: \"$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
＠＠ -15055,7 +15151,7 ＠＠ xehost=$canonical
xealias=$internal_configuration
echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:15059: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:15155: checking how to build dynamic libraries for ${xehost}" >&5
# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
case "$xehost" in
*-*-linux-gnu*) ;;
＠＠ -15083,9 +15179,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:15087: checking checking whether we are using GNU C" >&5
+echo "configure:15183: checking checking whether we are using GNU C" >&5
cat > conftest.$ac_ext <<EOF
-#line 15089 "configure"
+#line 15185 "configure"
#include "confdefs.h"
#ifdef __GNUC__
＠＠ -15107,7 +15203,7 ＠＠ rm -f conftest*
fi
echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:15111: checking how to produce PIC code" >&5
+echo "configure:15207: checking how to produce PIC code" >&5
wl=
can_build_shared=yes
＠＠ -15208,18 +15304,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:15212: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:15308: checking if PIC flag ${dll_cflags} really works" >&5
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $dll_cflags -DPIC"
cat > conftest.$ac_ext <<EOF
-#line 15216 "configure"
+#line 15312 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:15223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15319: \"$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
＠＠ -15250,7 +15346,7 ＠＠ cc_produces_so=no
xldf=
xcldf=
echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:15254: checking if C compiler can produce shared libraries" >&5
+echo "configure:15350: checking if C compiler can produce shared libraries" >&5
if test "$XEGCC" = yes -o "$__ICC" = yes; then
xcldf="-shared"
xldf="-shared"
＠＠ -15301,14 +15397,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 15305 "configure"
+#line 15401 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:15312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cc_produces_so=yes
else
＠＠ -15333,7 +15429,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:15337: checking for ld used by GCC" >&5
+echo "configure:15433: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
＠＠ -15359,7 +15455,7 ＠＠ echo "configure:15337: checking for ld u
esac
else
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:15363: checking for GNU ld" >&5
+echo "configure:15459: checking for GNU ld" >&5
fi
if test -z "$LTLD"; then
＠＠ -15397,7 +15493,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:15401: checking if the linker is GNU ld" >&5
+echo "configure:15497: 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
＠＠ -15425,7 +15521,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:15429: checking whether the linker supports shared libraries" >&5
+echo "configure:15525: checking whether the linker supports shared libraries" >&5
dll_ld=$CC
dll_ldflags=$LDFLAGS
ld_shlibs=yes
＠＠ -15636,10 +15732,10 ＠＠ EOF
for ac_func in dlerror _dlerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15640: checking for $ac_func" >&5
+echo "configure:15736: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 15643 "configure"
+#line 15739 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -15662,7 +15758,7 ＠＠ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:15666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15762: \"$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
＠＠ -15701,11 +15797,11 ＠＠ done
fi
cat > conftest.$ac_ext <<EOF
-#line 15705 "configure"
+#line 15801 "configure"
#include "confdefs.h"
int main(int c,char *v[]){return 0;}
EOF
-if { (eval echo configure:15709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
1.151.2.36 +50 -0 XEmacs/xemacs/configure.in
Index: configure.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v
retrieving revision 1.151.2.35
retrieving revision 1.151.2.36
diff -u -p -r1.151.2.35 -r1.151.2.36
--- configure.in 2005/11/30 23:58:31 1.151.2.35
+++ configure.in 2005/12/24 00:48:14 1.151.2.36
＠＠ -3215,6 +3215,7 ＠＠ if test no != "$with_ldap";then
echo "Setting ldap_libs to $ldap_libs"],dnl
[AC_CHECK_LIB(ldap, ldap_open,dnl
[with_ldap=yes],dnl
+dnl If logic of setting these vars change, change it the same way below.
[ldap_needs_lber=yes ldap_other_libs=-llber
dnl This requires `AC_CACHE_VAL' (which is called by `AC_CHECK_LIB')
dnl to be redefined to ignore cached (shell variable) value, as it is
＠＠ -3236,6 +3237,55 ＠＠ dnl variable name depends on the macro O
$ldap_other_libs)],dnl
$ldap_other_libs)],dnl
$ldap_other_libs)])
+ if test yes = "$with_ldap" -a yes != "$ldap_needs_lber";then
+dnl Need this check since `LDAP_OPT_ON' is (currently) used only with
+dnl `ldap_set_option', and the latter may not exist at all, for which
+dnl is testing later. So `LDAP_OPT_ON' is not necessarily defined.
+ AC_CACHE_CHECK([for LDAP_OPT_ON definition],xe_cv_have_LDAP_OPT_ON,
+ [AC_TRY_COMPILE(
+[#include <lber.h>
+#include <ldap.h>
+#ifdef LDAP_OPT_ON
+/* Relying on const defined by ac_c_const (upper case). */
+const void *const v = LDAP_OPT_ON;
+#else /* !defined (LDAP_OPT_ON) */
+choke me
+#endif /* !defined (LDAP_OPT_ON) */],[],
+ [xe_cv_have_LDAP_OPT_ON=yes],
+ [xe_cv_have_LDAP_OPT_ON=no])])
+ if test yes = "$xe_cv_have_LDAP_OPT_ON";then
+ AC_CACHE_CHECK([LDAP_OPT_ON linking],
+ xe_cv_LDAP_OPT_ON_links,
+ [xe_save_LIBS="$LIBS"
+ LIBS="-lldap $LIBS"
+AC_TRY_LINK(
+[#include <lber.h>
+#include <ldap.h>
+const void *const v = LDAP_OPT_ON;],[],
+ xe_cv_LDAP_OPT_ON_links=yes,
+ xe_cv_LDAP_OPT_ON_links=no)
+ LIBS="$xe_save_LIBS"])
+dnl In some openldap installations other `ldap_*' functions link with
+dnl `-lldap' alone, but `LDAP_OPT_ON' requires `-llber'.
+ if test yes != "$xe_cv_LDAP_OPT_ON_links";then
+ ldap_needs_lber=yes ldap_other_libs=-llber
+ AC_CACHE_CHECK([LDAP_OPT_ON linking with -llber],
+ xe_cv_LDAP_OPT_ON_links_w_lber,
+ [xe_save_LIBS="$LIBS"
+ LIBS="-lldap $ldap_other_libs $LIBS"
+AC_TRY_LINK(
+[#include <lber.h>
+#include <ldap.h>
+const void *const v = LDAP_OPT_ON;],[],
+ xe_cv_LDAP_OPT_ON_links_w_lber=yes,
+ xe_cv_LDAP_OPT_ON_links_w_lber=no)
+ LIBS="$xe_save_LIBS"])
+ if test yes != "$xe_cv_LDAP_OPT_ON_links_w_lber";then
+ with_ldap=no
+ fi
+ fi
+ fi
+ fi
if test yes = "$with_ldap";then
if test yes = "$ldap_needs_des";then
XE_PREPEND(-ldes, ldap_libs)
- 1 participants
- 0 comments
CVS update by viteno xemacs ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/12/23 23:51:12
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1386 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1385
retrieving revision 1.1386
diff -u -p -r1.1385 -r1.1386
--- version.sh 2005/12/22 22:51:17 1.1385
+++ version.sh 2005/12/23 22:51:11 1.1386
＠＠ -8,5 +8,5 ＠＠ emacs_kit_version=
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20051222)"
+xemacs_extra_name="(+CVS-20051223)"
xemacs_release_date="2005-12-19"
- 1 participants
- 0 comments
CVS update by scop packages/mule-packages/latin-unity ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: scop
Date: 05/12/23 18:32:51
Modified: packages/mule-packages/latin-unity ChangeLog latin-unity.el
Log:
Mimic write-region's kludgy feature <1134818608.13582.92.camel(a)bobcat.mine.nu>
Revision Changes Path
1.42 +5 -0 XEmacs/packages/mule-packages/latin-unity/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- ChangeLog 2005/04/10 13:50:28 1.41
+++ ChangeLog 2005/12/23 17:32:50 1.42
＠＠ -1,3 +1,8 ＠＠
+2005-12-17 Ville Skyttä <scop(a)xemacs.org>
+
+ * latin-unity.el (latin-unity-sanity-check): Mimic `write-region's
+ kludgy feature where the region's start offset is a string.
+
2005-04-10 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.15 released.
1.13 +5 -2 XEmacs/packages/mule-packages/latin-unity/latin-unity.el
Index: latin-unity.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- latin-unity.el 2005/02/15 22:22:48 1.12
+++ latin-unity.el 2005/12/23 17:32:50 1.13
＠＠ -551,11 +551,14 ＠＠ to the Mule detection mechanism. This c
setting `buffer-file-coding-system' to nil or 'no-conversion or 'binary.
This function is intended for use as a `write-region-pre-hook'. It does
-nothing except return nil if `write-region' handlers are inhibited."
+nothing except return nil if `write-region' handlers are inhibited, or if
+BEGIN is a string (to support the corresponding \"kludgy feature\" of
+`write-region')."
;; don't do anything if we're in a `write-region' handler
;; #### is nil the right return value if we are?
- (if (eq inhibit-file-name-operation 'write-region)
+ ;; Bypass also on `write-region's "klugdy feature" where BEGIN is a string
+ (if (or (eq inhibit-file-name-operation 'write-region) (stringp begin))
nil
(prog1
(let ((buffer-default
- 1 participants
- 0 comments
CVS update by stephent xemacs ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/12/23 16:21:25
Modified: xemacs configure
Log:
always forget configure in the main commit ...
Revision Changes Path
1.269 +1 -1 XEmacs/xemacs/configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -p -r1.268 -r1.269
--- configure 2005/12/23 07:24:13 1.268
+++ configure 2005/12/23 15:21:19 1.269
＠＠ -39171,7 +39171,7 ＠＠ if test "$with_x11" = "yes"; then
if test "$with_wmcommand" != no; then
echo " - Handling WM_COMMAND properly."
fi
- if test "$with_xft" = "yes"; then
+ if test "$with_xft_emacs" = "yes"; then
echo " - Compiling in support for Xft antialiased fonts (EXPERIMENTAL)."
fi
fi
- 1 participants
- 0 comments
CVS update by stephent xemacs ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/12/23 16:11:43
Modified: xemacs ChangeLog configure.ac
Log:
Xft configure-ation improvements <87acer26jj.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.486 +5 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -p -r1.485 -r1.486
--- ChangeLog 2005/12/23 11:33:38 1.485
+++ ChangeLog 2005/12/23 15:11:41 1.486
＠＠ -1,3 +1,8 ＠＠
+2005-12-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (Xft): Fix typo preventing report of Xft buffers.
+ Remove now-irrelevant comments.
+
2005-12-22 Stephen J. Turnbull <stephen(a)xemacs.org>
* configure.ac: Three typos fixed.
1.31 +1 -6 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- configure.ac 2005/12/23 11:33:39 1.30
+++ configure.ac 2005/12/23 15:11:42 1.31
＠＠ -4423,9 +4423,7 ＠＠ test "$enable_scrollbars" = "motif" &&
test "$enable_dialogs" = "motif" && AC_DEFINE(LWLIB_DIALOGS_MOTIF)
test "$enable_widgets" = "motif" && AC_DEFINE(LWLIB_WIDGETS_MOTIF)
-dnl this is not in xft reloaded #3
test "$with_xft_menubars" = "yes" && AC_DEFINE(USE_XFT_MENUBARS)
-dnl these are new in sjt-xft
test "$with_xft_tabs" = "yes" && AC_DEFINE(USE_XFT_TABS)
test "$with_xft_gauge" = "yes" && AC_DEFINE(USE_XFT_GAUGE)
＠＠ -5906,7 +5904,7 ＠＠ if test "$with_x11" = "yes"; then
if test "$with_wmcommand" != no; then
echo " - Handling WM_COMMAND properly."
fi
- if test "$with_xft" = "yes"; then
+ if test "$with_xft_emacs" = "yes"; then
echo " - Compiling in support for Xft antialiased fonts (EXPERIMENTAL)."
fi
fi
＠＠ -5934,7 +5932,6 ＠＠ case "$enable_menubars" in
echo " Re-run configure with --enable-menubars='lucid'." ;;
msw ) echo " Using MS-Windows menubars." ;;
esac
-dnl this is not in xft reloaded #3
if test "$with_xft_menubars" = "yes"; then
echo " - Using Xft to render antialiased fonts in menubars."
echo " WARNING: This feature will be replaced with a face."
＠＠ -5964,12 +5961,10 ＠＠ case "$enable_widgets" in
athena ) echo " Using Athena native widgets." ;;
msw ) echo " Using MS-Windows native widgets." ;;
esac
-dnl this is not in xft reloaded #3
if test "$with_xft_tabs" = "yes"; then
echo " - Using Xft to render antialiased fonts in tab controls."
echo " WARNING: This feature will be replaced with a face."
fi
-dnl this is not in xft reloaded #3
if test "$with_xft_gauge" = "yes"; then
echo " - Using Xft to render antialiased fonts in progress bars."
echo " WARNING: This feature will be replaced with a face."
- 1 participants
- 0 comments
CVS update by stephent xemacs/src ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/12/23 16:08:16
Modified: xemacs/src ChangeLog objects-x.c
Log:
more mule-ization of font truenames <87ek4326px.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.911 +4 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.910
retrieving revision 1.911
diff -u -p -r1.910 -r1.911
--- ChangeLog 2005/12/23 12:00:44 1.910
+++ ChangeLog 2005/12/23 15:08:13 1.911
＠＠ -1,5 +1,9 ＠＠
2005-12-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+ * objects-x.c (x_find_charset_font): More mule-ization.
+
+2005-12-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
* objects-x.c (x_font_instance_truename): Mule-ize handling of
font name (Xft names are UTF-8). Fixes crash.
1.33 +1 -1 XEmacs/xemacs/src/objects-x.c
Index: objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- objects-x.c 2005/12/23 12:00:45 1.32
+++ objects-x.c 2005/12/23 15:08:14 1.33
＠＠ -1442,7 +1442,7 ＠＠ x_find_charset_font (Lisp_Object device,
if (x_font_spec_matches_charset (XDEVICE (device), charset,
intname, Qnil, 0, -1, 0))
{
- result = make_string (intname, intlen);
+ result = build_ext_string (intname, Qx_font_name_encoding);
break;
}
}
- 1 participants
- 0 comments
CVS update by stephent xemacs/src ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/12/23 13:00:48
Modified: xemacs/src ChangeLog objects-x.c
Log:
Fix crash getting truename of Xft fonts. <878xuc2fdo.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.910 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.909
retrieving revision 1.910
diff -u -p -r1.909 -r1.910
--- ChangeLog 2005/12/20 22:01:50 1.909
+++ ChangeLog 2005/12/23 12:00:44 1.910
＠＠ -1,3 +1,8 ＠＠
+2005-12-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * objects-x.c (x_font_instance_truename): Mule-ize handling of
+ font name (Xft names are UTF-8). Fixes crash.
+
2005-12-20 Aidan Kehoe <kehoea(a)parhasard.net>
* objects-x.c (x_find_charset_font):
1.32 +2 -1 XEmacs/xemacs/src/objects-x.c
Index: objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- objects-x.c 2005/12/20 22:01:52 1.31
+++ objects-x.c 2005/12/23 12:00:45 1.32
＠＠ -807,7 +807,8 ＠＠ x_font_instance_truename (Lisp_Font_Inst
FcChar8 *res = FcNameUnparse (FONT_INSTANCE_X_XFTFONT (f)->pattern);
if (res)
{
- FONT_INSTANCE_TRUENAME (f) = make_string (res, strlen (res));
+ FONT_INSTANCE_TRUENAME (f) =
+ build_ext_string (res, Qxft_font_name_encoding);
free (res);
return FONT_INSTANCE_TRUENAME (f);
}
- 1 participants
- 0 comments
CVS update by stephent xemacs/lisp/mule ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/12/23 12:42:35
Modified: xemacs/lisp/mule mule-charset.el
Log:
undo spurious commit
Revision Changes Path
1.13 +16 -7 XEmacs/xemacs/lisp/derived.el
Index: derived.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/derived.el,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- derived.el 2005/12/23 11:40:33 1.12
+++ derived.el 2005/12/23 11:42:32 1.13
＠＠ -419,13 +419,22 ＠＠ Where the new table already has an entry
;; (set-char-table-parent new old) here.
;; We use map-char-table, not map-syntax-table, so we can explicitly
;; check for inheritance.
- (map-char-table #'(lambda (range value)
- (when (eq ?＠ (char-syntax-from-code value))
- (map-char-table #'(lambda (rng val)
- (put-char-table rng val new))
- old
- range)))
- new))
+ (map-char-table
+ #'(lambda (key value)
+ (let ((newval (get-range-char-table key new 'multi)))
+ (cond ((eq newval 'multi) ; OK, dive into the class hierarchy
+ (map-char-table
+ #'(lambda (key1 value1)
+ (when (eq ?＠ (char-syntax-from-code
+ (get-range-char-table key new ?＠)))
+ (put-char-table key1 value new))
+ nil)
+ new
+ key))
+ ((eq ?＠ (char-syntax-from-code newval)) ;; class at once
+ (put-char-table key value new))))
+ nil)
+ old))
;; Merge an old abbrev table into a new one.
;; This function requires internal knowledge of how abbrev tables work,
1.18 +0 -69 XEmacs/xemacs/lisp/mule/mule-charset.el
Index: mule-charset.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/mule-charset.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mule-charset.el 2005/12/23 11:40:39 1.17
+++ mule-charset.el 2005/12/23 11:42:35 1.18
＠＠ -62,67 +62,6 ＠＠ BUFFER defaults to the current buffer if
(forward-char))))
list))
-(defun fixed-charsets-in-region (start end &optional buffer)
- "Return a list of the charsets in the region between START and END.
-BUFFER defaults to the current buffer if omitted."
- (let (list)
- (save-excursion
- (if buffer
- (set-buffer buffer))
- (save-restriction
- (narrow-to-region start end)
- (goto-char (point-min))
- (let ((prev-charset nil))
- (while (not (eobp))
- (let* ((charset (char-charset (char-after (point)))))
- (if (not (eq prev-charset charset))
- (progn
- (setq prev-charset charset)
- (or (memq charset list)
- (setq list (cons charset list))))))
- (forward-char)))))
- list))
-
-(defun list-charsets-in-region (start end &optional buffer)
- "Return a list of the charsets in the region between START and END.
-BUFFER defaults to the current buffer if omitted."
- (let (list)
- (save-excursion
- (if buffer
- (set-buffer buffer))
- (save-restriction
- (narrow-to-region start end)
- (goto-char (point-min))
- ;; this could be optimized by maintaining prev-charset and checking
- ;; for equality, but memq is not that slow for a short list.
- (while (not (eobp))
- (let* ((charset (char-charset (char-after (point)))))
- (or (memq charset list)
- (setq list (cons charset list))))
- (forward-char))))
- list))
-
-(defun hash-charsets-in-region (start end &optional buffer)
- "Return a list of the charsets in the region between START and END.
-BUFFER defaults to the current buffer if omitted."
- (let ((ht (make-hash-table :size 10)))
- (save-excursion
- (if buffer
- (set-buffer buffer))
- (save-restriction
- (narrow-to-region start end)
- (goto-char (point-min))
- (while (not (eobp))
- (puthash (char-charset (char-after (point))) t ht)
- (forward-char))))
- (hash-table-key-list ht)))
-
-(defun c-charsets-in-region (start end &optional buffer)
- "Return a list of the charsets in the region between START and END.
-BUFFER defaults to the current buffer if omitted."
- (setq buffer (or buffer (current-buffer)))
- (charsets-in-region-internal buffer start end))
-
(defun charsets-in-string (string)
"Return a list of the charsets in STRING."
(let (list)
＠＠ -134,15 +73,7 ＠＠ BUFFER defaults to the current buffer if
string)
list))
-(defun c-charsets-in-string (string)
- "Return a list of the charsets in STRING."
- (charsets-in-string-internal string nil nil))
-
-(or (fboundp 'charsets-in-string)
- (defalias 'charsets-in-string 'c-charsets-in-string))
(defalias 'find-charset-string 'charsets-in-string)
-(or (fboundp 'charsets-in-region)
- (defalias 'charsets-in-region 'c-charsets-in-region))
(defalias 'find-charset-region 'charsets-in-region)
- 1 participants
- 0 comments
CVS update by stephent xemacs/lisp/mule ...
18 years, 4 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/12/23 12:40:39
Modified: xemacs/lisp/mule mule-charset.el
Log:
Add rename function to buffer mode. <87hd902gcp.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
1.712 +5 -0 XEmacs/xemacs/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.711
retrieving revision 1.712
diff -u -p -r1.711 -r1.712
--- ChangeLog 2005/12/18 19:05:56 1.711
+++ ChangeLog 2005/12/23 11:40:32 1.712
＠＠ -1,3 +1,8 ＠＠
+2005-12-22 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * buff-menu.el (Buffer-menu-rename): New command.
+ (Buffer-menu-mode-map): Bind it to ?r.
+
2005-12-18 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.24 "dandelion" is released.
1.10 +13 -0 XEmacs/xemacs/lisp/buff-menu.el
Index: buff-menu.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/buff-menu.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- buff-menu.el 2002/03/15 07:43:18 1.9
+++ buff-menu.el 2005/12/23 11:40:33 1.10
＠＠ -91,6 +91,7 ＠＠
(define-key Buffer-menu-mode-map "k" 'Buffer-menu-delete)
(define-key Buffer-menu-mode-map "\C-d" 'Buffer-menu-delete-backwards)
(define-key Buffer-menu-mode-map "\C-k" 'Buffer-menu-delete)
+ (define-key Buffer-menu-mode-map "r" 'Buffer-menu-rename)
(define-key Buffer-menu-mode-map "x" 'Buffer-menu-execute)
(define-key Buffer-menu-mode-map " " 'next-line)
(define-key Buffer-menu-mode-map "n" 'next-line)
＠＠ -260,6 +261,18 ＠＠ and then move up one line. Prefix arg m
(Buffer-menu-delete (- (or arg 1)))
(while (looking-at " [-M]")
(forward-line 1)))
+
+(defun Buffer-menu-rename (newname unique)
+ "Rename buffer on this line to NEWNAME, immediately.
+If given a prefix argument, automatically uniquify. See `rename-buffer'."
+ (interactive "sNew name for buffer: \np")
+ (beginning-of-line)
+ (if (looking-at " [-M]") ;header lines
+ (ding)
+ (save-excursion
+ (set-buffer (Buffer-menu-buffer t))
+ (rename-buffer newname unique))
+ (revert-buffer)))
(defun Buffer-menu-save ()
"Mark buffer on this line to be saved by \\<Buffer-menu-mode-map>\\[Buffer-menu-execute] command."
1.12 +7 -16 XEmacs/xemacs/lisp/derived.el
Index: derived.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/derived.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- derived.el 2005/11/13 07:39:27 1.11
+++ derived.el 2005/12/23 11:40:33 1.12
＠＠ -419,22 +419,13 ＠＠ Where the new table already has an entry
;; (set-char-table-parent new old) here.
;; We use map-char-table, not map-syntax-table, so we can explicitly
;; check for inheritance.
- (map-char-table
- #'(lambda (key value)
- (let ((newval (get-range-char-table key new 'multi)))
- (cond ((eq newval 'multi) ; OK, dive into the class hierarchy
- (map-char-table
- #'(lambda (key1 value1)
- (when (eq ?＠ (char-syntax-from-code
- (get-range-char-table key new ?＠)))
- (put-char-table key1 value new))
- nil)
- new
- key))
- ((eq ?＠ (char-syntax-from-code newval)) ;; class at once
- (put-char-table key value new))))
- nil)
- old))
+ (map-char-table #'(lambda (range value)
+ (when (eq ?＠ (char-syntax-from-code value))
+ (map-char-table #'(lambda (rng val)
+ (put-char-table rng val new))
+ old
+ range)))
+ new))
;; Merge an old abbrev table into a new one.
;; This function requires internal knowledge of how abbrev tables work,
1.17 +69 -0 XEmacs/xemacs/lisp/mule/mule-charset.el
Index: mule-charset.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/mule-charset.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mule-charset.el 2004/09/22 02:25:06 1.16
+++ mule-charset.el 2005/12/23 11:40:39 1.17
＠＠ -62,6 +62,67 ＠＠ BUFFER defaults to the current buffer if
(forward-char))))
list))
+(defun fixed-charsets-in-region (start end &optional buffer)
+ "Return a list of the charsets in the region between START and END.
+BUFFER defaults to the current buffer if omitted."
+ (let (list)
+ (save-excursion
+ (if buffer
+ (set-buffer buffer))
+ (save-restriction
+ (narrow-to-region start end)
+ (goto-char (point-min))
+ (let ((prev-charset nil))
+ (while (not (eobp))
+ (let* ((charset (char-charset (char-after (point)))))
+ (if (not (eq prev-charset charset))
+ (progn
+ (setq prev-charset charset)
+ (or (memq charset list)
+ (setq list (cons charset list))))))
+ (forward-char)))))
+ list))
+
+(defun list-charsets-in-region (start end &optional buffer)
+ "Return a list of the charsets in the region between START and END.
+BUFFER defaults to the current buffer if omitted."
+ (let (list)
+ (save-excursion
+ (if buffer
+ (set-buffer buffer))
+ (save-restriction
+ (narrow-to-region start end)
+ (goto-char (point-min))
+ ;; this could be optimized by maintaining prev-charset and checking
+ ;; for equality, but memq is not that slow for a short list.
+ (while (not (eobp))
+ (let* ((charset (char-charset (char-after (point)))))
+ (or (memq charset list)
+ (setq list (cons charset list))))
+ (forward-char))))
+ list))
+
+(defun hash-charsets-in-region (start end &optional buffer)
+ "Return a list of the charsets in the region between START and END.
+BUFFER defaults to the current buffer if omitted."
+ (let ((ht (make-hash-table :size 10)))
+ (save-excursion
+ (if buffer
+ (set-buffer buffer))
+ (save-restriction
+ (narrow-to-region start end)
+ (goto-char (point-min))
+ (while (not (eobp))
+ (puthash (char-charset (char-after (point))) t ht)
+ (forward-char))))
+ (hash-table-key-list ht)))
+
+(defun c-charsets-in-region (start end &optional buffer)
+ "Return a list of the charsets in the region between START and END.
+BUFFER defaults to the current buffer if omitted."
+ (setq buffer (or buffer (current-buffer)))
+ (charsets-in-region-internal buffer start end))
+
(defun charsets-in-string (string)
"Return a list of the charsets in STRING."
(let (list)
＠＠ -73,7 +134,15 ＠＠ BUFFER defaults to the current buffer if
string)
list))
+(defun c-charsets-in-string (string)
+ "Return a list of the charsets in STRING."
+ (charsets-in-string-internal string nil nil))
+
+(or (fboundp 'charsets-in-string)
+ (defalias 'charsets-in-string 'c-charsets-in-string))
(defalias 'find-charset-string 'charsets-in-string)
+(or (fboundp 'charsets-in-region)
+ (defalias 'charsets-in-region 'c-charsets-in-region))
(defalias 'find-charset-region 'charsets-in-region)
- 1 participants
- 0 comments