Commit 1113b624 authored by Paul Eggert's avatar Paul Eggert
Browse files

Add support for large files. Merge glibc 2.1.2.

* configure.in (AC_CHECK_HEADERS): Add stdio_ext.h.
(HAVE_TM_GMTOFF): New symbol.
(AC_CHECK_FUNCS): Add __fpending, ftello, getloadavg, mblen,
mbrlen, strsignal.
(LOCALTIME_CACHE): Don't include stdlib.h, as config.h does this now.
parent c4d9fb07
1999-10-19 Paul Eggert <eggert@twinsun.com>
Add support for large files. Merge glibc 2.1.2.
* configure.in (AC_CHECK_HEADERS): Add stdio_ext.h.
(HAVE_TM_GMTOFF): New symbol.
(AC_CHECK_FUNCS): Add __fpending, ftello, getloadavg, mblen,
mbrlen, strsignal.
(LOCALTIME_CACHE): Don't include stdlib.h, as config.h does this now.
1999-10-09 Stefan Monnier <monnier@cs.yale.edu>
* make-dist (dontcompile): look for the DONTCOMPILE variable rather
......
......@@ -2184,21 +2184,23 @@ fi
done
for ac_hdr in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h termcap.h
for ac_hdr in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
termcap.h stdio_ext.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2192: checking for $ac_hdr" >&5
echo "configure:2194: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2197 "configure"
#line 2199 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2204: \"$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*
......@@ -2225,12 +2227,12 @@ fi
done
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:2229: checking for ANSI C header files" >&5
echo "configure:2231: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2234 "configure"
#line 2236 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
......@@ -2238,7 +2240,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2244: \"$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*
......@@ -2255,7 +2257,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
#line 2259 "configure"
#line 2261 "configure"
#include "confdefs.h"
#include <string.h>
EOF
......@@ -2273,7 +2275,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
#line 2277 "configure"
#line 2279 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
......@@ -2294,7 +2296,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
#line 2298 "configure"
#line 2300 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
......@@ -2305,7 +2307,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
if { (eval echo configure:2309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
......@@ -2329,12 +2331,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
echo "configure:2333: checking whether time.h and sys/time.h may both be included" >&5
echo "configure:2335: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2338 "configure"
#line 2340 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
......@@ -2343,7 +2345,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
if { (eval echo configure:2347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
......@@ -2364,12 +2366,12 @@ EOF
fi
echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
echo "configure:2368: checking for sys_siglist declaration in signal.h or unistd.h" >&5
echo "configure:2370: checking for sys_siglist declaration in signal.h or unistd.h" >&5
if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2373 "configure"
#line 2375 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
......@@ -2381,7 +2383,7 @@ int main() {
char *msg = *(sys_siglist + 1);
; return 0; }
EOF
if { (eval echo configure:2385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_decl_sys_siglist=yes
else
......@@ -2403,12 +2405,12 @@ fi
echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
echo "configure:2407: checking for struct utimbuf" >&5
echo "configure:2409: checking for struct utimbuf" >&5
if eval "test \"`echo '$''{'emacs_cv_struct_utimbuf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2412 "configure"
#line 2414 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
......@@ -2427,7 +2429,7 @@ int main() {
static struct utimbuf x; x.actime = x.modtime;
; return 0; }
EOF
if { (eval echo configure:2431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
emacs_cv_struct_utimbuf=yes
else
......@@ -2448,12 +2450,12 @@ EOF
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
echo "configure:2452: checking return type of signal handlers" >&5
echo "configure:2454: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2457 "configure"
#line 2459 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
......@@ -2470,7 +2472,7 @@ int main() {
int i;
; return 0; }
EOF
if { (eval echo configure:2474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
......@@ -2490,12 +2492,12 @@ EOF
echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
echo "configure:2494: checking for struct timeval" >&5
echo "configure:2496: checking for struct timeval" >&5
if eval "test \"`echo '$''{'emacs_cv_struct_timeval'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2499 "configure"
#line 2501 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
......@@ -2511,7 +2513,7 @@ int main() {
static struct timeval x; x.tv_sec = x.tv_usec;
; return 0; }
EOF
if { (eval echo configure:2515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
emacs_cv_struct_timeval=yes
else
......@@ -2533,12 +2535,12 @@ EOF
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
echo "configure:2537: checking whether struct tm is in sys/time.h or time.h" >&5
echo "configure:2539: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2542 "configure"
#line 2544 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
......@@ -2546,7 +2548,7 @@ int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
if { (eval echo configure:2550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
......@@ -2567,12 +2569,12 @@ EOF
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
echo "configure:2571: checking for tm_zone in struct tm" >&5
echo "configure:2573: checking for tm_zone in struct tm" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2576 "configure"
#line 2578 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
......@@ -2580,7 +2582,7 @@ int main() {
struct tm tm; tm.tm_zone;
; return 0; }
EOF
if { (eval echo configure:2584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
......@@ -2600,12 +2602,12 @@ EOF
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
echo "configure:2604: checking for tzname" >&5
echo "configure:2606: checking for tzname" >&5
if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2609 "configure"
#line 2611 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
......@@ -2615,7 +2617,7 @@ int main() {
atoi(*tzname);
; return 0; }
EOF
if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
......@@ -2636,14 +2638,46 @@ EOF
fi
fi
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
echo "configure:2643: checking for tm_gmtoff in struct tm" >&5
if eval "test \"`echo '$''{'emacs_cv_tm_gmtoff'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2648 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
struct tm t; t.tm_gmtoff = 0
; return 0; }
EOF
if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
emacs_cv_tm_gmtoff=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
emacs_cv_tm_gmtoff=no
fi
rm -f conftest*
fi
echo "$ac_t""$emacs_cv_tm_gmtoff" 1>&6
if test $emacs_cv_tm_gmtoff = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_TM_GMTOFF 1
EOF
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:2642: checking for working const" >&5
echo "configure:2676: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2647 "configure"
#line 2681 "configure"
#include "confdefs.h"
int main() {
......@@ -2692,7 +2726,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
if { (eval echo configure:2696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:2730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
......@@ -2714,7 +2748,7 @@ fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:2718: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:2752: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -2742,7 +2776,7 @@ fi
echo $ac_n "checking for long file names""... $ac_c" 1>&6
echo "configure:2746: checking for long file names" >&5
echo "configure:2780: checking for long file names" >&5
if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
......@@ -2793,7 +2827,7 @@ fi
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
echo "configure:2797: checking for X" >&5
echo "configure:2831: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
......@@ -2855,12 +2889,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
#line 2859 "configure"
#line 2893 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2898: \"$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*
......@@ -2929,14 +2963,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2933 "configure"
#line 2967 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
if { (eval echo configure:2940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
......@@ -3110,7 +3144,7 @@ fi
echo "checking the machine- and system-dependent files to find out
- which libraries the lib-src programs will want, and
- whether the GNU malloc routines are usable" 1>&6
echo "configure:3114: checking the machine- and system-dependent files to find out
echo "configure:3148: checking the machine- and system-dependent files to find out
- which libraries the lib-src programs will want, and
- whether the GNU malloc routines are usable" >&5
......@@ -3240,12 +3274,12 @@ UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
GNU_MALLOC=yes
doug_lea_malloc=yes
echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
echo "configure:3244: checking for malloc_get_state" >&5
echo "configure:3278: checking for malloc_get_state" >&5
if eval "test \"`echo '$''{'ac_cv_func_malloc_get_state'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3249 "configure"
#line 3283 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char malloc_get_state(); below. */
......@@ -3268,7 +3302,7 @@ malloc_get_state();
; return 0; }
EOF
if { (eval echo configure:3272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_malloc_get_state=yes"
else
......@@ -3289,12 +3323,12 @@ doug_lea_malloc=no
fi
echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
echo "configure:3293: checking for malloc_set_state" >&5
echo "configure:3327: checking for malloc_set_state" >&5
if eval "test \"`echo '$''{'ac_cv_func_malloc_set_state'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3298 "configure"
#line 3332 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char malloc_set_state(); below. */
......@@ -3317,7 +3351,7 @@ malloc_set_state();
; return 0; }
EOF
if { (eval echo configure:3321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_malloc_set_state=yes"
else
......@@ -3338,19 +3372,19 @@ doug_lea_malloc=no
fi
echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
echo "configure:3342: checking whether __after_morecore_hook exists" >&5
echo "configure:3376: checking whether __after_morecore_hook exists" >&5
if eval "test \"`echo '$''{'emacs_cv_var___after_morecore_hook'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3347 "configure"
#line 3381 "configure"
#include "confdefs.h"
extern void (* __after_morecore_hook)();
int main() {
__after_morecore_hook = 0
; return 0; }
EOF
if { (eval echo configure:3354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
emacs_cv_var___after_morecore_hook=yes
else
......@@ -3400,7 +3434,7 @@ fi
LIBS="$libsrc_libs $LIBS"
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
echo "configure:3404: checking for dnet_ntoa in -ldnet" >&5
echo "configure:3438: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -3408,7 +3442,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3412 "configure"
#line 3446 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
......@@ -3419,7 +3453,7 @@ int main() {
dnet_ntoa()
; return 0; }
EOF
if { (eval echo configure:3423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
......@@ -3448,7 +3482,7 @@ fi
echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
echo "configure:3452: checking for main in -lXbsd" >&5
echo "configure:3486: checking for main in -lXbsd" >&5
ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -3456,14 +3490,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXbsd $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3460 "configure"
#line 3494 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
if { (eval echo configure:3467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
......@@ -3485,7 +3519,7 @@ fi
echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
echo "configure:3489: checking for cma_open in -lpthreads" >&5
echo "configure:3523: checking for cma_open in -lpthreads" >&5
ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
......@@ -3493,7 +3527,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpthreads $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3497 "configure"
#line 3531 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
......@@ -3504,7 +3538,7 @@ int main() {
cma_open()
; return 0; }
EOF
if { (eval echo configure:3508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
......@@ -3533,7 +3567,7 @@ fi
echo $ac_n "checking for XFree86 in /usr/X386""... $ac_c" 1>&6
echo "configure:3537: checking for XFree86 in /usr/X386" >&5
echo "configure:3571: checking for XFree86 in /usr/X386" >&5
if test -d /usr/X386/include; then
HAVE_XFREE386=yes
: ${C_SWITCH_X_SITE="-I/usr/X386/include"}
......@@ -3562,16 +3596,16 @@ if test "${HAVE_X11}" = "yes"; then
if test "${opsys}" = "gnu-linux"; then
echo $ac_n "checking whether X on GNU/Linux needs -b to link""... $ac_c" 1>&6
echo "configure:3566: checking whether X on GNU/Linux needs -b to link" >&5
echo "configure:3600: checking whether X on GNU/Linux needs -b to link" >&5
cat > conftest.$ac_ext <<EOF
#line 3568 "configure"
#line 3602 "configure"
#include "confdefs.h"
int main() {
XOpenDisplay ("foo");
; return 0; }
EOF
if { (eval echo configure:3575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xlinux_first_failure=no
else
......@@ -3591,14 +3625,14 @@ rm -f conftest*
CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
LIBS="$LIBS -b i486-linuxaout"
cat > conftest.$ac_ext <<EOF
#line 3595 "configure"
#line 3629 "configure"
#include "confdefs.h"
int main() {
XOpenDisplay ("foo");
; return 0; }
EOF
if { (eval echo configure:3602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xlinux_second_failure=no
else
......@@ -3628,12 +3662,12 @@ rm -f conftest*
XScreenNumberOfScreen XSetWMProtocols
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3632: checking for $ac_func" >&5
echo "configure:3666: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3637 "configure"
#line 3671 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
......@@ -3656,7 +3690,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:3660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3694: \"$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
......@@ -3684,12 +3718,12 @@ fi
if test "${window_system}" = "x11"; then
echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
echo "configure:3688: checking X11 version 6" >&5
echo "configure:3722: checking X11 version 6" >&5
if eval "test \"`echo '$''{'emacs_cv_x11_version_6'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3693 "configure"
#line 3727 "configure"
#include "confdefs.h"
#include <X11/Xlib.h>
int main() {
......@@ -3699,7 +3733,7 @@ fail;
; return 0; }
EOF
if { (eval echo configure:3703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
emacs_cv_x11_version_6=yes