aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2010-08-10 10:24:32 +0900
committerKenichi Handa2010-08-10 10:24:32 +0900
commitf6b495fad779117cb1bf3a2cf635e695811854cf (patch)
treee9092d053ff467b01ae1327fee935e451ea60133
parent2948599b87eef32145ec30e4ebb688178c494b5a (diff)
parent09d93395c3ceeb0bd23d9fd9c7ef316dc03af08b (diff)
downloademacs-f6b495fad779117cb1bf3a2cf635e695811854cf.tar.gz
emacs-f6b495fad779117cb1bf3a2cf635e695811854cf.zip
merge trunk
Diffstat
-rw-r--r--ChangeLog12
-rw-r--r--admin/CPP-DEFINES2
-rw-r--r--admin/ChangeLog4
-rwxr-xr-xconfigure642
-rw-r--r--configure.in13
-rw-r--r--lisp/ChangeLog17
-rw-r--r--lisp/emacs-lisp/package-x.el7
-rw-r--r--lisp/emacs-lisp/package.el89
-rw-r--r--src/ChangeLog35
-rw-r--r--src/config.in15
-rw-r--r--src/font.c12
-rw-r--r--src/font.h8
-rw-r--r--src/fringe.c2
-rw-r--r--src/lisp.h6
-rw-r--r--src/m/alpha.h4
-rw-r--r--src/m/amdx86-64.h4
-rw-r--r--src/m/arm.h4
-rw-r--r--src/m/hp800.h4
-rw-r--r--src/m/ia64.h4
-rw-r--r--src/m/ibmrs6000.h1
-rw-r--r--src/m/ibms390.h4
-rw-r--r--src/m/intel386.h4
-rw-r--r--src/m/iris4d.h4
-rw-r--r--src/m/m68k.h4
-rw-r--r--src/m/macppc.h4
-rw-r--r--src/m/mips.h6
-rw-r--r--src/m/sh3.h4
-rw-r--r--src/m/sparc.h4
-rw-r--r--src/m/template.h4
-rw-r--r--src/m/vax.h4
-rw-r--r--src/m/xtensa.h6
-rw-r--r--src/md5.c6
-rw-r--r--src/sound.c8
33 files changed, 575 insertions, 372 deletions
diff --git a/ChangeLog b/ChangeLog
index fbee7fb9562..1bc695ef873 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
12010-08-09 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * configure.in (AC_PREREQ): Require autoconf 2.66 to stop version churn.
4
52010-08-09 Andreas Schwab <schwab@linux-m68k.org>
6
7 * configure.in: Add AC_C_BIGENDIAN.
8
92010-08-09 Dan Nicolaescu <dann@ics.uci.edu>
10
11 * configure.in (ORDINARY_LINK): Use on hpux* too.
12
12010-08-06 Jan Djärv <jan.h.d@swipnet.se> 132010-08-06 Jan Djärv <jan.h.d@swipnet.se>
2 14
3 * configure.in: Check for util.h. 15 * configure.in: Check for util.h.
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 6aa2851c0b5..b5f4d555ad4 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -66,7 +66,6 @@ EXPLICIT_SIGN_EXTEND
66LOAD_AVE_CVT 66LOAD_AVE_CVT
67LOAD_AVE_TYPE 67LOAD_AVE_TYPE
68VIRT_ADDR_VARIES 68VIRT_ADDR_VARIES
69WORDS_BIG_ENDIAN
70 69
71** Misc macros 70** Misc macros
72USER_FULL_NAME If defined, overrides the default pw->pw_gecos for getting at the full user name. Only MSDOS overrides the default. 71USER_FULL_NAME If defined, overrides the default pw->pw_gecos for getting at the full user name. Only MSDOS overrides the default.
@@ -266,7 +265,6 @@ USG5
266USG5_4 265USG5_4
267USG_SUBTTY_WORKS 266USG_SUBTTY_WORKS
268VALBITS 267VALBITS
269WORDS_BIG_ENDIAN
270WRETCODE 268WRETCODE
271XINT 269XINT
272XOS_NEEDS_TIME_H 270XOS_NEEDS_TIME_H
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7ce3321dd31..22777674373 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12010-08-09 Andreas Schwab <schwab@linux-m68k.org>
2
3 * CPP-DEFINES (WORDS_BIG_ENDIAN): Remove.
4
12010-08-05 Eli Zaretskii <eliz@gnu.org> 52010-08-05 Eli Zaretskii <eliz@gnu.org>
2 6
3 * MAINTAINERS: Rename src/unexec.c => src/unexcoff.c. 7 * MAINTAINERS: Rename src/unexec.c => src/unexcoff.c.
diff --git a/configure b/configure
index 53c2407f3a9..3eaf150a25e 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,11 @@
1#! /bin/sh 1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles. 2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.65 for emacs 24.0.50. 3# Generated by GNU Autoconf 2.66 for emacs 24.0.50.
4# 4#
5# 5#
6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
8# Inc. 8# Foundation, Inc.
9# 9#
10# 10#
11# This configure script is free software; the Free Software Foundation 11# This configure script is free software; the Free Software Foundation
@@ -316,7 +316,7 @@ $as_echo X"$as_dir" |
316 test -d "$as_dir" && break 316 test -d "$as_dir" && break
317 done 317 done
318 test -z "$as_dirs" || eval "mkdir $as_dirs" 318 test -z "$as_dirs" || eval "mkdir $as_dirs"
319 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 319 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
320 320
321 321
322} # as_fn_mkdir_p 322} # as_fn_mkdir_p
@@ -356,19 +356,19 @@ else
356fi # as_fn_arith 356fi # as_fn_arith
357 357
358 358
359# as_fn_error ERROR [LINENO LOG_FD] 359# as_fn_error STATUS ERROR [LINENO LOG_FD]
360# --------------------------------- 360# ----------------------------------------
361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
362# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 362# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
363# script with status $?, using 1 if that was 0. 363# script with STATUS, using 1 if that was 0.
364as_fn_error () 364as_fn_error ()
365{ 365{
366 as_status=$?; test $as_status -eq 0 && as_status=1 366 as_status=$1; test $as_status -eq 0 && as_status=1
367 if test "$3"; then 367 if test "$4"; then
368 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 368 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
370 fi 370 fi
371 $as_echo "$as_me: error: $1" >&2 371 $as_echo "$as_me: error: $2" >&2
372 as_fn_exit $as_status 372 as_fn_exit $as_status
373} # as_fn_error 373} # as_fn_error
374 374
@@ -530,7 +530,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
530exec 6>&1 530exec 6>&1
531 531
532# Name of the host. 532# Name of the host.
533# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 533# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
534# so uname gets run too. 534# so uname gets run too.
535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` 535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
536 536
@@ -950,7 +950,7 @@ do
950 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` 950 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
951 # Reject names that are not valid shell variable names. 951 # Reject names that are not valid shell variable names.
952 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 952 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
953 as_fn_error "invalid feature name: $ac_useropt" 953 as_fn_error $? "invalid feature name: $ac_useropt"
954 ac_useropt_orig=$ac_useropt 954 ac_useropt_orig=$ac_useropt
955 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 955 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
956 case $ac_user_opts in 956 case $ac_user_opts in
@@ -976,7 +976,7 @@ do
976 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` 976 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
977 # Reject names that are not valid shell variable names. 977 # Reject names that are not valid shell variable names.
978 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 978 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
979 as_fn_error "invalid feature name: $ac_useropt" 979 as_fn_error $? "invalid feature name: $ac_useropt"
980 ac_useropt_orig=$ac_useropt 980 ac_useropt_orig=$ac_useropt
981 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 981 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
982 case $ac_user_opts in 982 case $ac_user_opts in
@@ -1180,7 +1180,7 @@ do
1180 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` 1180 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1181 # Reject names that are not valid shell variable names. 1181 # Reject names that are not valid shell variable names.
1182 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1182 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1183 as_fn_error "invalid package name: $ac_useropt" 1183 as_fn_error $? "invalid package name: $ac_useropt"
1184 ac_useropt_orig=$ac_useropt 1184 ac_useropt_orig=$ac_useropt
1185 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1185 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1186 case $ac_user_opts in 1186 case $ac_user_opts in
@@ -1196,7 +1196,7 @@ do
1196 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` 1196 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1197 # Reject names that are not valid shell variable names. 1197 # Reject names that are not valid shell variable names.
1198 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1198 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1199 as_fn_error "invalid package name: $ac_useropt" 1199 as_fn_error $? "invalid package name: $ac_useropt"
1200 ac_useropt_orig=$ac_useropt 1200 ac_useropt_orig=$ac_useropt
1201 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1201 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1202 case $ac_user_opts in 1202 case $ac_user_opts in
@@ -1226,8 +1226,8 @@ do
1226 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) 1226 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1227 x_libraries=$ac_optarg ;; 1227 x_libraries=$ac_optarg ;;
1228 1228
1229 -*) as_fn_error "unrecognized option: \`$ac_option' 1229 -*) as_fn_error $? "unrecognized option: \`$ac_option'
1230Try \`$0 --help' for more information." 1230Try \`$0 --help' for more information"
1231 ;; 1231 ;;
1232 1232
1233 *=*) 1233 *=*)
@@ -1235,7 +1235,7 @@ Try \`$0 --help' for more information."
1235 # Reject names that are not valid shell variable names. 1235 # Reject names that are not valid shell variable names.
1236 case $ac_envvar in #( 1236 case $ac_envvar in #(
1237 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1237 '' | [0-9]* | *[!_$as_cr_alnum]* )
1238 as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1238 as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
1239 esac 1239 esac
1240 eval $ac_envvar=\$ac_optarg 1240 eval $ac_envvar=\$ac_optarg
1241 export $ac_envvar ;; 1241 export $ac_envvar ;;
@@ -1253,13 +1253,13 @@ done
1253 1253
1254if test -n "$ac_prev"; then 1254if test -n "$ac_prev"; then
1255 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1255 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1256 as_fn_error "missing argument to $ac_option" 1256 as_fn_error $? "missing argument to $ac_option"
1257fi 1257fi
1258 1258
1259if test -n "$ac_unrecognized_opts"; then 1259if test -n "$ac_unrecognized_opts"; then
1260 case $enable_option_checking in 1260 case $enable_option_checking in
1261 no) ;; 1261 no) ;;
1262 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1262 fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
1263 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1263 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1264 esac 1264 esac
1265fi 1265fi
@@ -1282,7 +1282,7 @@ do
1282 [\\/$]* | ?:[\\/]* ) continue;; 1282 [\\/$]* | ?:[\\/]* ) continue;;
1283 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1283 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1284 esac 1284 esac
1285 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 1285 as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
1286done 1286done
1287 1287
1288# There might be people who depend on the old broken behavior: `$host' 1288# There might be people who depend on the old broken behavior: `$host'
@@ -1296,8 +1296,8 @@ target=$target_alias
1296if test "x$host_alias" != x; then 1296if test "x$host_alias" != x; then
1297 if test "x$build_alias" = x; then 1297 if test "x$build_alias" = x; then
1298 cross_compiling=maybe 1298 cross_compiling=maybe
1299 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 1299 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1300 If a cross compiler is detected then cross compile mode will be used." >&2 1300 If a cross compiler is detected then cross compile mode will be used" >&2
1301 elif test "x$build_alias" != "x$host_alias"; then 1301 elif test "x$build_alias" != "x$host_alias"; then
1302 cross_compiling=yes 1302 cross_compiling=yes
1303 fi 1303 fi
@@ -1312,9 +1312,9 @@ test "$silent" = yes && exec 6>/dev/null
1312ac_pwd=`pwd` && test -n "$ac_pwd" && 1312ac_pwd=`pwd` && test -n "$ac_pwd" &&
1313ac_ls_di=`ls -di .` && 1313ac_ls_di=`ls -di .` &&
1314ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1314ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1315 as_fn_error "working directory cannot be determined" 1315 as_fn_error $? "working directory cannot be determined"
1316test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1316test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1317 as_fn_error "pwd does not report name of working directory" 1317 as_fn_error $? "pwd does not report name of working directory"
1318 1318
1319 1319
1320# Find the source files, if location was not specified. 1320# Find the source files, if location was not specified.
@@ -1353,11 +1353,11 @@ else
1353fi 1353fi
1354if test ! -r "$srcdir/$ac_unique_file"; then 1354if test ! -r "$srcdir/$ac_unique_file"; then
1355 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1355 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1356 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1356 as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
1357fi 1357fi
1358ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1358ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1359ac_abs_confdir=`( 1359ac_abs_confdir=`(
1360 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1360 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
1361 pwd)` 1361 pwd)`
1362# When building in place, set srcdir=. 1362# When building in place, set srcdir=.
1363if test "$ac_abs_confdir" = "$ac_pwd"; then 1363if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1397,7 +1397,7 @@ Configuration:
1397 --help=short display options specific to this package 1397 --help=short display options specific to this package
1398 --help=recursive display the short help of all the included packages 1398 --help=recursive display the short help of all the included packages
1399 -V, --version display version information and exit 1399 -V, --version display version information and exit
1400 -q, --quiet, --silent do not print \`checking...' messages 1400 -q, --quiet, --silent do not print \`checking ...' messages
1401 --cache-file=FILE cache test results in FILE [disabled] 1401 --cache-file=FILE cache test results in FILE [disabled]
1402 -C, --config-cache alias for \`--cache-file=config.cache' 1402 -C, --config-cache alias for \`--cache-file=config.cache'
1403 -n, --no-create do not create output files 1403 -n, --no-create do not create output files
@@ -1613,9 +1613,9 @@ test -n "$ac_init_help" && exit $ac_status
1613if $ac_init_version; then 1613if $ac_init_version; then
1614 cat <<\_ACEOF 1614 cat <<\_ACEOF
1615emacs configure 24.0.50 1615emacs configure 24.0.50
1616generated by GNU Autoconf 2.65 1616generated by GNU Autoconf 2.66
1617 1617
1618Copyright (C) 2009 Free Software Foundation, Inc. 1618Copyright (C) 2010 Free Software Foundation, Inc.
1619This configure script is free software; the Free Software Foundation 1619This configure script is free software; the Free Software Foundation
1620gives unlimited permission to copy, distribute and modify it. 1620gives unlimited permission to copy, distribute and modify it.
1621_ACEOF 1621_ACEOF
@@ -1755,10 +1755,10 @@ fi
1755ac_fn_c_check_header_mongrel () 1755ac_fn_c_check_header_mongrel ()
1756{ 1756{
1757 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1757 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1758 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1758 if eval "test \"\${$3+set}\"" = set; then :
1759 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1759 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1760$as_echo_n "checking for $2... " >&6; } 1760$as_echo_n "checking for $2... " >&6; }
1761if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1761if eval "test \"\${$3+set}\"" = set; then :
1762 $as_echo_n "(cached) " >&6 1762 $as_echo_n "(cached) " >&6
1763fi 1763fi
1764eval ac_res=\$$3 1764eval ac_res=\$$3
@@ -1821,7 +1821,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1821esac 1821esac
1822 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1822 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1823$as_echo_n "checking for $2... " >&6; } 1823$as_echo_n "checking for $2... " >&6; }
1824if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1824if eval "test \"\${$3+set}\"" = set; then :
1825 $as_echo_n "(cached) " >&6 1825 $as_echo_n "(cached) " >&6
1826else 1826else
1827 eval "$3=\$ac_header_compiler" 1827 eval "$3=\$ac_header_compiler"
@@ -1885,7 +1885,7 @@ ac_fn_c_check_header_compile ()
1885 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1885 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1886 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1886 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1887$as_echo_n "checking for $2... " >&6; } 1887$as_echo_n "checking for $2... " >&6; }
1888if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1888if eval "test \"\${$3+set}\"" = set; then :
1889 $as_echo_n "(cached) " >&6 1889 $as_echo_n "(cached) " >&6
1890else 1890else
1891 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1891 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1907,15 +1907,18 @@ $as_echo "$ac_res" >&6; }
1907 1907
1908} # ac_fn_c_check_header_compile 1908} # ac_fn_c_check_header_compile
1909 1909
1910# ac_fn_c_check_decl LINENO SYMBOL VAR 1910# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
1911# ------------------------------------ 1911# ---------------------------------------------
1912# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. 1912# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
1913# accordingly.
1913ac_fn_c_check_decl () 1914ac_fn_c_check_decl ()
1914{ 1915{
1915 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1916 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1916 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 1917 as_decl_name=`echo $2|sed 's/ *(.*//'`
1917$as_echo_n "checking whether $2 is declared... " >&6; } 1918 as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
1918if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1919 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
1920$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
1921if eval "test \"\${$3+set}\"" = set; then :
1919 $as_echo_n "(cached) " >&6 1922 $as_echo_n "(cached) " >&6
1920else 1923else
1921 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1924 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1924,8 +1927,12 @@ $4
1924int 1927int
1925main () 1928main ()
1926{ 1929{
1927#ifndef $2 1930#ifndef $as_decl_name
1928 (void) $2; 1931#ifdef __cplusplus
1932 (void) $as_decl_use;
1933#else
1934 (void) $as_decl_name;
1935#endif
1929#endif 1936#endif
1930 1937
1931 ; 1938 ;
@@ -1954,7 +1961,7 @@ ac_fn_c_check_header_preproc ()
1954 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1961 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1955 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1962 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1956$as_echo_n "checking for $2... " >&6; } 1963$as_echo_n "checking for $2... " >&6; }
1957if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1964if eval "test \"\${$3+set}\"" = set; then :
1958 $as_echo_n "(cached) " >&6 1965 $as_echo_n "(cached) " >&6
1959else 1966else
1960 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1967 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1984,7 +1991,7 @@ ac_fn_c_check_member ()
1984 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1991 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1985 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 1992 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
1986$as_echo_n "checking for $2.$3... " >&6; } 1993$as_echo_n "checking for $2.$3... " >&6; }
1987if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : 1994if eval "test \"\${$4+set}\"" = set; then :
1988 $as_echo_n "(cached) " >&6 1995 $as_echo_n "(cached) " >&6
1989else 1996else
1990 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1997 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2040,7 +2047,7 @@ ac_fn_c_check_func ()
2040 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2047 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2041 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2048 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2042$as_echo_n "checking for $2... " >&6; } 2049$as_echo_n "checking for $2... " >&6; }
2043if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2050if eval "test \"\${$3+set}\"" = set; then :
2044 $as_echo_n "(cached) " >&6 2051 $as_echo_n "(cached) " >&6
2045else 2052else
2046 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2053 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2108,7 +2115,7 @@ ac_fn_c_check_type ()
2108 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2115 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2109 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2116 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2110$as_echo_n "checking for $2... " >&6; } 2117$as_echo_n "checking for $2... " >&6; }
2111if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2118if eval "test \"\${$3+set}\"" = set; then :
2112 $as_echo_n "(cached) " >&6 2119 $as_echo_n "(cached) " >&6
2113else 2120else
2114 eval "$3=no" 2121 eval "$3=no"
@@ -2157,7 +2164,7 @@ This file contains any messages produced by compilers while
2157running configure, to aid debugging if configure makes a mistake. 2164running configure, to aid debugging if configure makes a mistake.
2158 2165
2159It was created by emacs $as_me 24.0.50, which was 2166It was created by emacs $as_me 24.0.50, which was
2160generated by GNU Autoconf 2.65. Invocation command line was 2167generated by GNU Autoconf 2.66. Invocation command line was
2161 2168
2162 $ $0 $@ 2169 $ $0 $@
2163 2170
@@ -2267,11 +2274,9 @@ trap 'exit_status=$?
2267 { 2274 {
2268 echo 2275 echo
2269 2276
2270 cat <<\_ASBOX 2277 $as_echo "## ---------------- ##
2271## ---------------- ##
2272## Cache variables. ## 2278## Cache variables. ##
2273## ---------------- ## 2279## ---------------- ##"
2274_ASBOX
2275 echo 2280 echo
2276 # The following way of writing the cache mishandles newlines in values, 2281 # The following way of writing the cache mishandles newlines in values,
2277( 2282(
@@ -2305,11 +2310,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2305) 2310)
2306 echo 2311 echo
2307 2312
2308 cat <<\_ASBOX 2313 $as_echo "## ----------------- ##
2309## ----------------- ##
2310## Output variables. ## 2314## Output variables. ##
2311## ----------------- ## 2315## ----------------- ##"
2312_ASBOX
2313 echo 2316 echo
2314 for ac_var in $ac_subst_vars 2317 for ac_var in $ac_subst_vars
2315 do 2318 do
@@ -2322,11 +2325,9 @@ _ASBOX
2322 echo 2325 echo
2323 2326
2324 if test -n "$ac_subst_files"; then 2327 if test -n "$ac_subst_files"; then
2325 cat <<\_ASBOX 2328 $as_echo "## ------------------- ##
2326## ------------------- ##
2327## File substitutions. ## 2329## File substitutions. ##
2328## ------------------- ## 2330## ------------------- ##"
2329_ASBOX
2330 echo 2331 echo
2331 for ac_var in $ac_subst_files 2332 for ac_var in $ac_subst_files
2332 do 2333 do
@@ -2340,11 +2341,9 @@ _ASBOX
2340 fi 2341 fi
2341 2342
2342 if test -s confdefs.h; then 2343 if test -s confdefs.h; then
2343 cat <<\_ASBOX 2344 $as_echo "## ----------- ##
2344## ----------- ##
2345## confdefs.h. ## 2345## confdefs.h. ##
2346## ----------- ## 2346## ----------- ##"
2347_ASBOX
2348 echo 2347 echo
2349 cat confdefs.h 2348 cat confdefs.h
2350 echo 2349 echo
@@ -2399,7 +2398,12 @@ _ACEOF
2399ac_site_file1=NONE 2398ac_site_file1=NONE
2400ac_site_file2=NONE 2399ac_site_file2=NONE
2401if test -n "$CONFIG_SITE"; then 2400if test -n "$CONFIG_SITE"; then
2402 ac_site_file1=$CONFIG_SITE 2401 # We do not want a PATH search for config.site.
2402 case $CONFIG_SITE in #((
2403 -*) ac_site_file1=./$CONFIG_SITE;;
2404 */*) ac_site_file1=$CONFIG_SITE;;
2405 *) ac_site_file1=./$CONFIG_SITE;;
2406 esac
2403elif test "x$prefix" != xNONE; then 2407elif test "x$prefix" != xNONE; then
2404 ac_site_file1=$prefix/share/config.site 2408 ac_site_file1=$prefix/share/config.site
2405 ac_site_file2=$prefix/etc/config.site 2409 ac_site_file2=$prefix/etc/config.site
@@ -2414,7 +2418,11 @@ do
2414 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 2418 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
2415$as_echo "$as_me: loading site script $ac_site_file" >&6;} 2419$as_echo "$as_me: loading site script $ac_site_file" >&6;}
2416 sed 's/^/| /' "$ac_site_file" >&5 2420 sed 's/^/| /' "$ac_site_file" >&5
2417 . "$ac_site_file" 2421 . "$ac_site_file" \
2422 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2423$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2424as_fn_error $? "failed to load site script $ac_site_file
2425See \`config.log' for more details" "$LINENO" 5; }
2418 fi 2426 fi
2419done 2427done
2420 2428
@@ -2495,7 +2503,7 @@ if $ac_cache_corrupted; then
2495$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2503$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2496 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2504 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
2497$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2505$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
2498 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2506 as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
2499fi 2507fi
2500## -------------------- ## 2508## -------------------- ##
2501## Main body of script. ## 2509## Main body of script. ##
@@ -2669,7 +2677,7 @@ if test "${with_x_toolkit+set}" = set; then :
2669 g | gt | gtk ) val=gtk ;; 2677 g | gt | gtk ) val=gtk ;;
2670 gtk3 ) val=gtk3 ;; 2678 gtk3 ) val=gtk3 ;;
2671 * ) 2679 * )
2672as_fn_error "\`--with-x-toolkit=$withval' is invalid; 2680as_fn_error $? "\`--with-x-toolkit=$withval' is invalid;
2673this option's value should be \`yes', \`no', \`lucid', \`athena', \`motif', \`gtk' or 2681this option's value should be \`yes', \`no', \`lucid', \`athena', \`motif', \`gtk' or
2674\`gtk3'. \`yes' and \`gtk' are synonyms. \`athena' and \`lucid' are synonyms." "$LINENO" 5 2682\`gtk3'. \`yes' and \`gtk' are synonyms. \`athena' and \`lucid' are synonyms." "$LINENO" 5
2675 ;; 2683 ;;
@@ -2948,7 +2956,7 @@ do
2948 stringfreelist) ac_gc_check_string_free_list=1 ;; 2956 stringfreelist) ac_gc_check_string_free_list=1 ;;
2949 xmallocoverrun) ac_xmalloc_overrun=1 ;; 2957 xmallocoverrun) ac_xmalloc_overrun=1 ;;
2950 conslist) ac_gc_check_cons_list=1 ;; 2958 conslist) ac_gc_check_cons_list=1 ;;
2951 *) as_fn_error "unknown check category $check" "$LINENO" 5 ;; 2959 *) as_fn_error $? "unknown check category $check" "$LINENO" 5 ;;
2952 esac 2960 esac
2953done 2961done
2954IFS="$ac_save_IFS" 2962IFS="$ac_save_IFS"
@@ -3066,16 +3074,22 @@ fi
3066 3074
3067ac_aux_dir= 3075ac_aux_dir=
3068for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 3076for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
3069 for ac_t in install-sh install.sh shtool; do 3077 if test -f "$ac_dir/install-sh"; then
3070 if test -f "$ac_dir/$ac_t"; then 3078 ac_aux_dir=$ac_dir
3071 ac_aux_dir=$ac_dir 3079 ac_install_sh="$ac_aux_dir/install-sh -c"
3072 ac_install_sh="$ac_aux_dir/$ac_t -c" 3080 break
3073 break 2 3081 elif test -f "$ac_dir/install.sh"; then
3074 fi 3082 ac_aux_dir=$ac_dir
3075 done 3083 ac_install_sh="$ac_aux_dir/install.sh -c"
3084 break
3085 elif test -f "$ac_dir/shtool"; then
3086 ac_aux_dir=$ac_dir
3087 ac_install_sh="$ac_aux_dir/shtool install -c"
3088 break
3089 fi
3076done 3090done
3077if test -z "$ac_aux_dir"; then 3091if test -z "$ac_aux_dir"; then
3078 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 3092 as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
3079fi 3093fi
3080 3094
3081# These three variables are undocumented and unsupported, 3095# These three variables are undocumented and unsupported,
@@ -3089,7 +3103,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
3089 3103
3090# Make sure we can run config.sub. 3104# Make sure we can run config.sub.
3091$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 3105$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
3092 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 3106 as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
3093 3107
3094{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 3108{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
3095$as_echo_n "checking build system type... " >&6; } 3109$as_echo_n "checking build system type... " >&6; }
@@ -3100,16 +3114,16 @@ else
3100test "x$ac_build_alias" = x && 3114test "x$ac_build_alias" = x &&
3101 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 3115 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
3102test "x$ac_build_alias" = x && 3116test "x$ac_build_alias" = x &&
3103 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 3117 as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
3104ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 3118ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
3105 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 3119 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
3106 3120
3107fi 3121fi
3108{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 3122{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
3109$as_echo "$ac_cv_build" >&6; } 3123$as_echo "$ac_cv_build" >&6; }
3110case $ac_cv_build in 3124case $ac_cv_build in
3111*-*-*) ;; 3125*-*-*) ;;
3112*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; 3126*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
3113esac 3127esac
3114build=$ac_cv_build 3128build=$ac_cv_build
3115ac_save_IFS=$IFS; IFS='-' 3129ac_save_IFS=$IFS; IFS='-'
@@ -3134,7 +3148,7 @@ else
3134 ac_cv_host=$ac_cv_build 3148 ac_cv_host=$ac_cv_build
3135else 3149else
3136 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 3150 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
3137 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 3151 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
3138fi 3152fi
3139 3153
3140fi 3154fi
@@ -3142,7 +3156,7 @@ fi
3142$as_echo "$ac_cv_host" >&6; } 3156$as_echo "$ac_cv_host" >&6; }
3143case $ac_cv_host in 3157case $ac_cv_host in
3144*-*-*) ;; 3158*-*-*) ;;
3145*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; 3159*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
3146esac 3160esac
3147host=$ac_cv_host 3161host=$ac_cv_host
3148ac_save_IFS=$IFS; IFS='-' 3162ac_save_IFS=$IFS; IFS='-'
@@ -3436,7 +3450,7 @@ fi
3436 3450
3437 3451
3438if test $unported = yes; then 3452if test $unported = yes; then
3439 as_fn_error "Emacs hasn't been ported to \`${canonical}' systems. 3453 as_fn_error $? "Emacs hasn't been ported to \`${canonical}' systems.
3440Check \`etc/MACHINES' for recognized configuration names." "$LINENO" 5 3454Check \`etc/MACHINES' for recognized configuration names." "$LINENO" 5
3441fi 3455fi
3442 3456
@@ -3750,8 +3764,8 @@ fi
3750 3764
3751test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3765test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3752$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3766$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3753as_fn_error "no acceptable C compiler found in \$PATH 3767as_fn_error $? "no acceptable C compiler found in \$PATH
3754See \`config.log' for more details." "$LINENO" 5; } 3768See \`config.log' for more details" "$LINENO" 5; }
3755 3769
3756# Provide some information about the compiler. 3770# Provide some information about the compiler.
3757$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 3771$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3865,9 +3879,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
3865 3879
3866{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3880{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3867$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3881$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3868{ as_fn_set_status 77 3882as_fn_error 77 "C compiler cannot create executables
3869as_fn_error "C compiler cannot create executables 3883See \`config.log' for more details" "$LINENO" 5; }
3870See \`config.log' for more details." "$LINENO" 5; }; }
3871else 3884else
3872 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3885 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3873$as_echo "yes" >&6; } 3886$as_echo "yes" >&6; }
@@ -3909,8 +3922,8 @@ done
3909else 3922else
3910 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3923 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3911$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3924$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3912as_fn_error "cannot compute suffix of executables: cannot compile and link 3925as_fn_error $? "cannot compute suffix of executables: cannot compile and link
3913See \`config.log' for more details." "$LINENO" 5; } 3926See \`config.log' for more details" "$LINENO" 5; }
3914fi 3927fi
3915rm -f conftest conftest$ac_cv_exeext 3928rm -f conftest conftest$ac_cv_exeext
3916{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 3929{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3967,9 +3980,9 @@ $as_echo "$ac_try_echo"; } >&5
3967 else 3980 else
3968 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3981 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3969$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3982$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3970as_fn_error "cannot run C compiled programs. 3983as_fn_error $? "cannot run C compiled programs.
3971If you meant to cross compile, use \`--host'. 3984If you meant to cross compile, use \`--host'.
3972See \`config.log' for more details." "$LINENO" 5; } 3985See \`config.log' for more details" "$LINENO" 5; }
3973 fi 3986 fi
3974 fi 3987 fi
3975fi 3988fi
@@ -4020,8 +4033,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
4020 4033
4021{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4034{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4022$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4035$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4023as_fn_error "cannot compute suffix of object files: cannot compile 4036as_fn_error $? "cannot compute suffix of object files: cannot compile
4024See \`config.log' for more details." "$LINENO" 5; } 4037See \`config.log' for more details" "$LINENO" 5; }
4025fi 4038fi
4026rm -f conftest.$ac_cv_objext conftest.$ac_ext 4039rm -f conftest.$ac_cv_objext conftest.$ac_ext
4027fi 4040fi
@@ -4438,8 +4451,8 @@ if $ac_preproc_ok; then :
4438else 4451else
4439 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4452 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4440$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4453$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4441as_fn_error "C preprocessor \"$CPP\" fails sanity check 4454as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
4442See \`config.log' for more details." "$LINENO" 5; } 4455See \`config.log' for more details" "$LINENO" 5; }
4443fi 4456fi
4444 4457
4445ac_ext=c 4458ac_ext=c
@@ -4500,7 +4513,7 @@ esac
4500 done 4513 done
4501IFS=$as_save_IFS 4514IFS=$as_save_IFS
4502 if test -z "$ac_cv_path_GREP"; then 4515 if test -z "$ac_cv_path_GREP"; then
4503 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4516 as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4504 fi 4517 fi
4505else 4518else
4506 ac_cv_path_GREP=$GREP 4519 ac_cv_path_GREP=$GREP
@@ -4566,7 +4579,7 @@ esac
4566 done 4579 done
4567IFS=$as_save_IFS 4580IFS=$as_save_IFS
4568 if test -z "$ac_cv_path_EGREP"; then 4581 if test -z "$ac_cv_path_EGREP"; then
4569 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4582 as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4570 fi 4583 fi
4571else 4584else
4572 ac_cv_path_EGREP=$EGREP 4585 ac_cv_path_EGREP=$EGREP
@@ -4698,8 +4711,7 @@ do :
4698 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 4711 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
4699ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 4712ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
4700" 4713"
4701eval as_val=\$$as_ac_Header 4714if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
4702 if test "x$as_val" = x""yes; then :
4703 cat >>confdefs.h <<_ACEOF 4715 cat >>confdefs.h <<_ACEOF
4704#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 4716#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
4705_ACEOF 4717_ACEOF
@@ -5028,8 +5040,8 @@ if $ac_preproc_ok; then :
5028else 5040else
5029 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 5041 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5030$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 5042$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5031as_fn_error "C preprocessor \"$CPP\" fails sanity check 5043as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
5032See \`config.log' for more details." "$LINENO" 5; } 5044See \`config.log' for more details" "$LINENO" 5; }
5033fi 5045fi
5034 5046
5035ac_ext=c 5047ac_ext=c
@@ -5466,7 +5478,7 @@ if test "$MAKEINFO" = "no"; then
5466 if test "x${with_makeinfo}" = "xno"; then 5478 if test "x${with_makeinfo}" = "xno"; then
5467 MAKEINFO=off 5479 MAKEINFO=off
5468 elif test ! -e $srcdir/info/emacs; then 5480 elif test ! -e $srcdir/info/emacs; then
5469 as_fn_error "You do not seem to have makeinfo >= 4.6, and your 5481 as_fn_error $? "You do not seem to have makeinfo >= 4.6, and your
5470source tree does not seem to have pre-built manuals in the \`info' directory. 5482source tree does not seem to have pre-built manuals in the \`info' directory.
5471Either install a suitable version of makeinfo, or re-run configure 5483Either install a suitable version of makeinfo, or re-run configure
5472with the \`--without-makeinfo' option to build without the manuals. " "$LINENO" 5 5484with the \`--without-makeinfo' option to build without the manuals. " "$LINENO" 5
@@ -5620,7 +5632,7 @@ fi
5620 if test "x$GCC" = "xyes"; then 5632 if test "x$GCC" = "xyes"; then
5621 C_SWITCH_MACHINE="-fno-common" 5633 C_SWITCH_MACHINE="-fno-common"
5622 else 5634 else
5623 as_fn_error "What gives? Fix me if DEC Unix supports ELF now." "$LINENO" 5 5635 as_fn_error $? "What gives? Fix me if DEC Unix supports ELF now." "$LINENO" 5
5624 fi 5636 fi
5625 else 5637 else
5626 UNEXEC_OBJ=unexalpha.o 5638 UNEXEC_OBJ=unexalpha.o
@@ -5898,7 +5910,7 @@ else
5898 ## Some platforms don't use any of these files, so it is not 5910 ## Some platforms don't use any of these files, so it is not
5899 ## appropriate to put this test outside the if block. 5911 ## appropriate to put this test outside the if block.
5900 test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \ 5912 test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
5901 as_fn_error "crt*.o not found in specified location." "$LINENO" 5 5913 as_fn_error $? "crt*.o not found in specified location." "$LINENO" 5
5902 5914
5903fi 5915fi
5904 5916
@@ -5953,8 +5965,7 @@ if test "${with_sound}" != "no"; then
5953do : 5965do :
5954 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 5966 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
5955ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 5967ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
5956eval as_val=\$$as_ac_Header 5968if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
5957 if test "x$as_val" = x""yes; then :
5958 cat >>confdefs.h <<_ACEOF 5969 cat >>confdefs.h <<_ACEOF
5959#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 5970#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
5960_ACEOF 5971_ACEOF
@@ -6145,7 +6156,7 @@ else
6145fi 6156fi
6146rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 6157rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6147 if test "$emacs_alsa_subdir" != yes; then 6158 if test "$emacs_alsa_subdir" != yes; then
6148 as_fn_error "pkg-config found alsa, but it does not compile. See config.log for error messages." "$LINENO" 5 6159 as_fn_error $? "pkg-config found alsa, but it does not compile. See config.log for error messages." "$LINENO" 5
6149 fi 6160 fi
6150 ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE" 6161 ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
6151 fi 6162 fi
@@ -6180,8 +6191,7 @@ for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
6180do : 6191do :
6181 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 6192 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
6182ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 6193ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
6183eval as_val=\$$as_ac_Header 6194if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
6184 if test "x$as_val" = x""yes; then :
6185 cat >>confdefs.h <<_ACEOF 6195 cat >>confdefs.h <<_ACEOF
6186#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 6196#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
6187_ACEOF 6197_ACEOF
@@ -7016,14 +7026,236 @@ else
7016 7026
7017fi 7027fi
7018 7028
7029 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
7030$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
7031if test "${ac_cv_c_bigendian+set}" = set; then :
7032 $as_echo_n "(cached) " >&6
7033else
7034 ac_cv_c_bigendian=unknown
7035 # See if we're dealing with a universal compiler.
7036 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7037/* end confdefs.h. */
7038#ifndef __APPLE_CC__
7039 not a universal capable compiler
7040 #endif
7041 typedef int dummy;
7042
7043_ACEOF
7044if ac_fn_c_try_compile "$LINENO"; then :
7045
7046 # Check for potential -arch flags. It is not universal unless
7047 # there are at least two -arch flags with different values.
7048 ac_arch=
7049 ac_prev=
7050 for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
7051 if test -n "$ac_prev"; then
7052 case $ac_word in
7053 i?86 | x86_64 | ppc | ppc64)
7054 if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
7055 ac_arch=$ac_word
7056 else
7057 ac_cv_c_bigendian=universal
7058 break
7059 fi
7060 ;;
7061 esac
7062 ac_prev=
7063 elif test "x$ac_word" = "x-arch"; then
7064 ac_prev=arch
7065 fi
7066 done
7067fi
7068rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7069 if test $ac_cv_c_bigendian = unknown; then
7070 # See if sys/param.h defines the BYTE_ORDER macro.
7071 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7072/* end confdefs.h. */
7073#include <sys/types.h>
7074 #include <sys/param.h>
7075
7076int
7077main ()
7078{
7079#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
7080 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
7081 && LITTLE_ENDIAN)
7082 bogus endian macros
7083 #endif
7084
7085 ;
7086 return 0;
7087}
7088_ACEOF
7089if ac_fn_c_try_compile "$LINENO"; then :
7090 # It does; now see whether it defined to BIG_ENDIAN or not.
7091 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7092/* end confdefs.h. */
7093#include <sys/types.h>
7094 #include <sys/param.h>
7095
7096int
7097main ()
7098{
7099#if BYTE_ORDER != BIG_ENDIAN
7100 not big endian
7101 #endif
7102
7103 ;
7104 return 0;
7105}
7106_ACEOF
7107if ac_fn_c_try_compile "$LINENO"; then :
7108 ac_cv_c_bigendian=yes
7109else
7110 ac_cv_c_bigendian=no
7111fi
7112rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7113fi
7114rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7115 fi
7116 if test $ac_cv_c_bigendian = unknown; then
7117 # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
7118 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7119/* end confdefs.h. */
7120#include <limits.h>
7121
7122int
7123main ()
7124{
7125#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
7126 bogus endian macros
7127 #endif
7128
7129 ;
7130 return 0;
7131}
7132_ACEOF
7133if ac_fn_c_try_compile "$LINENO"; then :
7134 # It does; now see whether it defined to _BIG_ENDIAN or not.
7135 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7136/* end confdefs.h. */
7137#include <limits.h>
7138
7139int
7140main ()
7141{
7142#ifndef _BIG_ENDIAN
7143 not big endian
7144 #endif
7145
7146 ;
7147 return 0;
7148}
7149_ACEOF
7150if ac_fn_c_try_compile "$LINENO"; then :
7151 ac_cv_c_bigendian=yes
7152else
7153 ac_cv_c_bigendian=no
7154fi
7155rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7156fi
7157rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7158 fi
7159 if test $ac_cv_c_bigendian = unknown; then
7160 # Compile a test program.
7161 if test "$cross_compiling" = yes; then :
7162 # Try to guess by grepping values from an object file.
7163 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7164/* end confdefs.h. */
7165short int ascii_mm[] =
7166 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
7167 short int ascii_ii[] =
7168 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
7169 int use_ascii (int i) {
7170 return ascii_mm[i] + ascii_ii[i];
7171 }
7172 short int ebcdic_ii[] =
7173 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
7174 short int ebcdic_mm[] =
7175 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
7176 int use_ebcdic (int i) {
7177 return ebcdic_mm[i] + ebcdic_ii[i];
7178 }
7179 extern int foo;
7180
7181int
7182main ()
7183{
7184return use_ascii (foo) == use_ebcdic (foo);
7185 ;
7186 return 0;
7187}
7188_ACEOF
7189if ac_fn_c_try_compile "$LINENO"; then :
7190 if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
7191 ac_cv_c_bigendian=yes
7192 fi
7193 if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
7194 if test "$ac_cv_c_bigendian" = unknown; then
7195 ac_cv_c_bigendian=no
7196 else
7197 # finding both strings is unlikely to happen, but who knows?
7198 ac_cv_c_bigendian=unknown
7199 fi
7200 fi
7201fi
7202rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7203else
7204 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7205/* end confdefs.h. */
7206$ac_includes_default
7207int
7208main ()
7209{
7210
7211 /* Are we little or big endian? From Harbison&Steele. */
7212 union
7213 {
7214 long int l;
7215 char c[sizeof (long int)];
7216 } u;
7217 u.l = 1;
7218 return u.c[sizeof (long int) - 1] == 1;
7219
7220 ;
7221 return 0;
7222}
7223_ACEOF
7224if ac_fn_c_try_run "$LINENO"; then :
7225 ac_cv_c_bigendian=no
7226else
7227 ac_cv_c_bigendian=yes
7228fi
7229rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
7230 conftest.$ac_objext conftest.beam conftest.$ac_ext
7231fi
7232
7233 fi
7234fi
7235{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
7236$as_echo "$ac_cv_c_bigendian" >&6; }
7237 case $ac_cv_c_bigendian in #(
7238 yes)
7239 $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
7240;; #(
7241 no)
7242 ;; #(
7243 universal)
7244
7245$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
7019 7246
7247 ;; #(
7248 *)
7249 as_fn_error $? "unknown endianness
7250 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
7251 esac
7020 7252
7021 7253
7022{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 7254{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
7023$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } 7255$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
7024set x ${MAKE-make} 7256set x ${MAKE-make}
7025ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 7257ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
7026if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 7258if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
7027 $as_echo_n "(cached) " >&6 7259 $as_echo_n "(cached) " >&6
7028else 7260else
7029 cat >conftest.make <<\_ACEOF 7261 cat >conftest.make <<\_ACEOF
@@ -7031,7 +7263,7 @@ SHELL = /bin/sh
7031all: 7263all:
7032 @echo '@@@%%%=$(MAKE)=@@@%%%' 7264 @echo '@@@%%%=$(MAKE)=@@@%%%'
7033_ACEOF 7265_ACEOF
7034# GNU make sometimes prints "make[1]: Entering...", which would confuse us. 7266# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
7035case `${MAKE-make} -f conftest.make 2>/dev/null` in 7267case `${MAKE-make} -f conftest.make 2>/dev/null` in
7036 *@@@%%%=?*=@@@%%%*) 7268 *@@@%%%=?*=@@@%%%*)
7037 eval ac_cv_prog_make_${ac_make}_set=yes;; 7269 eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -7167,7 +7399,7 @@ if test "x$with_x" = xno; then
7167 have_x=disabled 7399 have_x=disabled
7168else 7400else
7169 case $x_includes,$x_libraries in #( 7401 case $x_includes,$x_libraries in #(
7170 *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( 7402 *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
7171 *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : 7403 *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
7172 $as_echo_n "(cached) " >&6 7404 $as_echo_n "(cached) " >&6
7173else 7405else
@@ -7185,7 +7417,7 @@ libdir:
7185 @echo libdir='${LIBDIR}' 7417 @echo libdir='${LIBDIR}'
7186_ACEOF 7418_ACEOF
7187 if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then 7419 if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
7188 # GNU make sometimes prints "make[1]: Entering...", which would confuse us. 7420 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
7189 for ac_var in incroot usrlibdir libdir; do 7421 for ac_var in incroot usrlibdir libdir; do
7190 eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" 7422 eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
7191 done 7423 done
@@ -7454,7 +7686,7 @@ if test "${with_ns}" != no; then
7454if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then : 7686if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then :
7455 HAVE_NS=yes 7687 HAVE_NS=yes
7456else 7688else
7457 as_fn_error "\`--with-ns' was specified, but the include 7689 as_fn_error $? "\`--with-ns' was specified, but the include
7458 files are missing or cannot be compiled." "$LINENO" 5 7690 files are missing or cannot be compiled." "$LINENO" 5
7459fi 7691fi
7460 7692
@@ -7570,7 +7802,7 @@ fi
7570 if test "$HAVE_XSERVER" = true || 7802 if test "$HAVE_XSERVER" = true ||
7571 test -n "$DISPLAY" || 7803 test -n "$DISPLAY" ||
7572 test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then 7804 test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then
7573 as_fn_error "You seem to be running X, but no X development libraries 7805 as_fn_error $? "You seem to be running X, but no X development libraries
7574were found. You should install the relevant development files for X 7806were found. You should install the relevant development files for X
7575and for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make 7807and for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make
7576sure you have development files for image handling, i.e. 7808sure you have development files for image handling, i.e.
@@ -7693,8 +7925,7 @@ do :
7693 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 7925 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
7694ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 7926ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
7695" 7927"
7696eval as_val=\$$as_ac_Header 7928if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
7697 if test "x$as_val" = x""yes; then :
7698 cat >>confdefs.h <<_ACEOF 7929 cat >>confdefs.h <<_ACEOF
7699#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 7930#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
7700_ACEOF 7931_ACEOF
@@ -7800,6 +8031,7 @@ int
7800main () 8031main ()
7801{ 8032{
7802 char *data, *data2, *data3; 8033 char *data, *data2, *data3;
8034 const char *cdata2;
7803 int i, pagesize; 8035 int i, pagesize;
7804 int fd, fd2; 8036 int fd, fd2;
7805 8037
@@ -7824,10 +8056,10 @@ main ()
7824 fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); 8056 fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
7825 if (fd2 < 0) 8057 if (fd2 < 0)
7826 return 4; 8058 return 4;
7827 data2 = ""; 8059 cdata2 = "";
7828 if (write (fd2, data2, 1) != 1) 8060 if (write (fd2, cdata2, 1) != 1)
7829 return 5; 8061 return 5;
7830 data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); 8062 data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
7831 if (data2 == MAP_FAILED) 8063 if (data2 == MAP_FAILED)
7832 return 6; 8064 return 6;
7833 for (i = 0; i < pagesize; ++i) 8065 for (i = 0; i < pagesize; ++i)
@@ -8200,8 +8432,7 @@ XScreenNumberOfScreen XSetWMProtocols
8200do : 8432do :
8201 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 8433 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
8202ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 8434ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
8203eval as_val=\$$as_ac_var 8435if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
8204 if test "x$as_val" = x""yes; then :
8205 cat >>confdefs.h <<_ACEOF 8436 cat >>confdefs.h <<_ACEOF
8206#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 8437#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
8207_ACEOF 8438_ACEOF
@@ -8482,7 +8713,7 @@ $as_echo "no" >&6; }
8482 fi 8713 fi
8483 8714
8484 if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then 8715 if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then
8485 as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5 8716 as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5
8486 fi 8717 fi
8487fi 8718fi
8488 8719
@@ -8588,7 +8819,7 @@ $as_echo "no" >&6; }
8588 fi 8819 fi
8589 8820
8590 if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then 8821 if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then
8591 as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5 8822 as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5
8592 fi 8823 fi
8593fi 8824fi
8594fi 8825fi
@@ -8615,7 +8846,7 @@ done
8615 8846
8616 if test "${GTK_COMPILES}" != "yes"; then 8847 if test "${GTK_COMPILES}" != "yes"; then
8617 if test "$USE_X_TOOLKIT" != "maybe"; then 8848 if test "$USE_X_TOOLKIT" != "maybe"; then
8618 as_fn_error "Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" "$LINENO" 5; 8849 as_fn_error $? "Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" "$LINENO" 5;
8619 fi 8850 fi
8620 else 8851 else
8621 HAVE_GTK=yes 8852 HAVE_GTK=yes
@@ -8745,8 +8976,7 @@ $as_echo "#define HAVE_GTK_AND_PTHREAD 1" >>confdefs.h
8745do : 8976do :
8746 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 8977 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
8747ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 8978ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
8748eval as_val=\$$as_ac_var 8979if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
8749 if test "x$as_val" = x""yes; then :
8750 cat >>confdefs.h <<_ACEOF 8980 cat >>confdefs.h <<_ACEOF
8751#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 8981#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
8752_ACEOF 8982_ACEOF
@@ -9111,7 +9341,7 @@ $as_echo "yes; using Lucid toolkit" >&6; }
9111 USE_X_TOOLKIT=LUCID 9341 USE_X_TOOLKIT=LUCID
9112 LUCID_LIBW=-lXaw 9342 LUCID_LIBW=-lXaw
9113 elif test x"${USE_X_TOOLKIT}" = xLUCID; then 9343 elif test x"${USE_X_TOOLKIT}" = xLUCID; then
9114 as_fn_error "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5 9344 as_fn_error $? "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5
9115 else 9345 else
9116 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; do not use toolkit by default" >&5 9346 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; do not use toolkit by default" >&5
9117$as_echo "no; do not use toolkit by default" >&6; } 9347$as_echo "no; do not use toolkit by default" >&6; }
@@ -10288,8 +10518,7 @@ if test "${HAVE_X11}" = "yes"; then
10288do : 10518do :
10289 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 10519 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
10290ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 10520ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
10291eval as_val=\$$as_ac_Header 10521if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
10292 if test "x$as_val" = x""yes; then :
10293 cat >>confdefs.h <<_ACEOF 10522 cat >>confdefs.h <<_ACEOF
10294#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 10523#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
10295_ACEOF 10524_ACEOF
@@ -10541,7 +10770,7 @@ if test "${HAVE_X11}" = "yes"; then
10541 MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no" 10770 MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
10542 10771
10543 if test "X${MISSING}" != X; then 10772 if test "X${MISSING}" != X; then
10544 as_fn_error "The following required libraries were not found: 10773 as_fn_error $? "The following required libraries were not found:
10545 $MISSING 10774 $MISSING
10546Maybe some development libraries/packages are missing? 10775Maybe some development libraries/packages are missing?
10547If you don't want to link with them give 10776If you don't want to link with them give
@@ -10876,8 +11105,7 @@ if test $ac_cv_os_cray = yes; then
10876 for ac_func in _getb67 GETB67 getb67; do 11105 for ac_func in _getb67 GETB67 getb67; do
10877 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 11106 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
10878ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 11107ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
10879eval as_val=\$$as_ac_var 11108if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
10880 if test "x$as_val" = x""yes; then :
10881 11109
10882cat >>confdefs.h <<_ACEOF 11110cat >>confdefs.h <<_ACEOF
10883#define CRAY_STACKSEG_END $ac_func 11111#define CRAY_STACKSEG_END $ac_func
@@ -10941,7 +11169,7 @@ fi
10941 11169
10942 11170
10943if test x"$ac_cv_func_alloca_works" != xyes; then 11171if test x"$ac_cv_func_alloca_works" != xyes; then
10944 as_fn_error "a system implementation of alloca is required " "$LINENO" 5 11172 as_fn_error $? "a system implementation of alloca is required " "$LINENO" 5
10945fi 11173fi
10946 11174
10947# fmod, logb, and frexp are found in -lm on most systems. 11175# fmod, logb, and frexp are found in -lm on most systems.
@@ -11137,7 +11365,7 @@ fi
11137 11365
11138 11366
11139 if test $ac_cv_prog_liblockfile = yes; then 11367 if test $ac_cv_prog_liblockfile = yes; then
11140 as_fn_error "Shared liblockfile found but can't link against it. 11368 as_fn_error $? "Shared liblockfile found but can't link against it.
11141This probably means that movemail could lose mail. 11369This probably means that movemail could lose mail.
11142There may be a \`development' package to install containing liblockfile." "$LINENO" 5 11370There may be a \`development' package to install containing liblockfile." "$LINENO" 5
11143 fi 11371 fi
@@ -11226,8 +11454,7 @@ cfmakeraw cfsetspeed isnan copysign __executable_start
11226do : 11454do :
11227 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 11455 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
11228ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 11456ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
11229eval as_val=\$$as_ac_var 11457if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
11230 if test "x$as_val" = x""yes; then :
11231 cat >>confdefs.h <<_ACEOF 11458 cat >>confdefs.h <<_ACEOF
11232#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 11459#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
11233_ACEOF 11460_ACEOF
@@ -11258,8 +11485,7 @@ done
11258do : 11485do :
11259 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 11486 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
11260ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 11487ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
11261eval as_val=\$$as_ac_var 11488if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
11262 if test "x$as_val" = x""yes; then :
11263 cat >>confdefs.h <<_ACEOF 11489 cat >>confdefs.h <<_ACEOF
11264#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 11490#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
11265_ACEOF 11491_ACEOF
@@ -11311,8 +11537,8 @@ static time_t time_t_max;
11311static time_t time_t_min; 11537static time_t time_t_min;
11312 11538
11313/* Values we'll use to set the TZ environment variable. */ 11539/* Values we'll use to set the TZ environment variable. */
11314static char *tz_strings[] = { 11540static const char *tz_strings[] = {
11315 (char *) 0, "TZ=GMT0", "TZ=JST-9", 11541 (const char *) 0, "TZ=GMT0", "TZ=JST-9",
11316 "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" 11542 "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"
11317}; 11543};
11318#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) 11544#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
@@ -11329,7 +11555,7 @@ spring_forward_gap ()
11329 instead of "TZ=America/Vancouver" in order to detect the bug even 11555 instead of "TZ=America/Vancouver" in order to detect the bug even
11330 on systems that don't support the Olson extension, or don't have the 11556 on systems that don't support the Olson extension, or don't have the
11331 full zoneinfo tables installed. */ 11557 full zoneinfo tables installed. */
11332 putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); 11558 putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
11333 11559
11334 tm.tm_year = 98; 11560 tm.tm_year = 98;
11335 tm.tm_mon = 3; 11561 tm.tm_mon = 3;
@@ -11342,16 +11568,14 @@ spring_forward_gap ()
11342} 11568}
11343 11569
11344static int 11570static int
11345mktime_test1 (now) 11571mktime_test1 (time_t now)
11346 time_t now;
11347{ 11572{
11348 struct tm *lt; 11573 struct tm *lt;
11349 return ! (lt = localtime (&now)) || mktime (lt) == now; 11574 return ! (lt = localtime (&now)) || mktime (lt) == now;
11350} 11575}
11351 11576
11352static int 11577static int
11353mktime_test (now) 11578mktime_test (time_t now)
11354 time_t now;
11355{ 11579{
11356 return (mktime_test1 (now) 11580 return (mktime_test1 (now)
11357 && mktime_test1 ((time_t) (time_t_max - now)) 11581 && mktime_test1 ((time_t) (time_t_max - now))
@@ -11375,8 +11599,7 @@ irix_6_4_bug ()
11375} 11599}
11376 11600
11377static int 11601static int
11378bigtime_test (j) 11602bigtime_test (int j)
11379 int j;
11380{ 11603{
11381 struct tm tm; 11604 struct tm tm;
11382 time_t now; 11605 time_t now;
@@ -11420,7 +11643,7 @@ year_2050_test ()
11420 instead of "TZ=America/Vancouver" in order to detect the bug even 11643 instead of "TZ=America/Vancouver" in order to detect the bug even
11421 on systems that don't support the Olson extension, or don't have the 11644 on systems that don't support the Olson extension, or don't have the
11422 full zoneinfo tables installed. */ 11645 full zoneinfo tables installed. */
11423 putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); 11646 putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
11424 11647
11425 t = mktime (&tm); 11648 t = mktime (&tm);
11426 11649
@@ -11455,7 +11678,7 @@ main ()
11455 for (i = 0; i < N_STRINGS; i++) 11678 for (i = 0; i < N_STRINGS; i++)
11456 { 11679 {
11457 if (tz_strings[i]) 11680 if (tz_strings[i])
11458 putenv (tz_strings[i]); 11681 putenv ((char*) tz_strings[i]);
11459 11682
11460 for (t = 0; t <= time_t_max - delta; t += delta) 11683 for (t = 0; t <= time_t_max - delta; t += delta)
11461 if (! mktime_test (t)) 11684 if (! mktime_test (t))
@@ -11507,7 +11730,7 @@ ac_have_func=no # yes means we've found a way to get the load average.
11507 11730
11508# Make sure getloadavg.c is where it belongs, at configure-time. 11731# Make sure getloadavg.c is where it belongs, at configure-time.
11509test -f "$srcdir/$ac_config_libobj_dir/getloadavg.c" || 11732test -f "$srcdir/$ac_config_libobj_dir/getloadavg.c" ||
11510 as_fn_error "$srcdir/$ac_config_libobj_dir/getloadavg.c is missing" "$LINENO" 5 11733 as_fn_error $? "$srcdir/$ac_config_libobj_dir/getloadavg.c is missing" "$LINENO" 5
11511 11734
11512ac_save_LIBS=$LIBS 11735ac_save_LIBS=$LIBS
11513 11736
@@ -12376,7 +12599,7 @@ else
12376fi 12599fi
12377 12600
12378if test "$have_tputs_et_al" != true; then 12601if test "$have_tputs_et_al" != true; then
12379 as_fn_error "I couldn't find termcap functions (tputs and friends). 12602 as_fn_error $? "I couldn't find termcap functions (tputs and friends).
12380Maybe some development libraries/packages are missing? Try installing 12603Maybe some development libraries/packages are missing? Try installing
12381libncurses-dev(el), libterminfo-dev(el) or similar." "$LINENO" 5 12604libncurses-dev(el), libterminfo-dev(el) or similar." "$LINENO" 5
12382fi 12605fi
@@ -13523,8 +13746,7 @@ for ac_func in fork vfork
13523do : 13746do :
13524 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 13747 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
13525ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 13748ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
13526eval as_val=\$$as_ac_var 13749if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
13527 if test "x$as_val" = x""yes; then :
13528 cat >>confdefs.h <<_ACEOF 13750 cat >>confdefs.h <<_ACEOF
13529#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 13751#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
13530_ACEOF 13752_ACEOF
@@ -13898,14 +14120,14 @@ if test "x$GCC" = xyes \
13898 && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \ 14120 && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \
13899 && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \ 14121 && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \
13900 && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then 14122 && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then
13901 as_fn_error "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5 14123 as_fn_error $? "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5
13902fi 14124fi
13903 14125
13904#### Find out which version of Emacs this is. 14126#### Find out which version of Emacs this is.
13905version=`grep 'const char emacs_version' ${srcdir}/src/emacs.c \ 14127version=`grep 'const char emacs_version' ${srcdir}/src/emacs.c \
13906 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` 14128 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
13907if test x"${version}" = x; then 14129if test x"${version}" = x; then
13908 as_fn_error "can't find current emacs version in \`${srcdir}/src/emacs.c'." "$LINENO" 5 14130 as_fn_error $? "can't find current emacs version in \`${srcdir}/src/emacs.c'." "$LINENO" 5
13909fi 14131fi
13910if test x"${version}" != x"$PACKAGE_VERSION"; then 14132if test x"${version}" != x"$PACKAGE_VERSION"; then
13911 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: version mismatch between \`${srcdir}/configure.in' and \`${srcdir}/src/emacs.c'." >&5 14133 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: version mismatch between \`${srcdir}/configure.in' and \`${srcdir}/src/emacs.c'." >&5
@@ -14187,7 +14409,7 @@ LINKER=
14187ORDINARY_LINK= 14409ORDINARY_LINK=
14188case "$opsys" in 14410case "$opsys" in
14189 ## gnu: GNU needs its own crt0. 14411 ## gnu: GNU needs its own crt0.
14190 aix4-2|cygwin|darwin|gnu|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;; 14412 aix4-2|cygwin|darwin|gnu|hpux*|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;;
14191 14413
14192 ## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the 14414 ## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the
14193 ## library search parth, i.e. it won't search /usr/lib for libc and 14415 ## library search parth, i.e. it won't search /usr/lib for libc and
@@ -14214,7 +14436,7 @@ $as_echo "#define ORDINARY_LINK 1" >>confdefs.h
14214 14436
14215 14437
14216## The system files defining neither ORDINARY_LINK nor LINKER are: 14438## The system files defining neither ORDINARY_LINK nor LINKER are:
14217## (bsd-common), freebsd, gnu-* not on macppc|ibms390x, hpux*. 14439## freebsd, gnu-* not on macppc|ibms390x.
14218elif test "x$GCC" = "xyes" && test "x$LINKER" = "x"; then 14440elif test "x$GCC" = "xyes" && test "x$LINKER" = "x"; then
14219 14441
14220 ## Versions of GCC >= 2.0 put their library, libgcc.a, in obscure 14442 ## Versions of GCC >= 2.0 put their library, libgcc.a, in obscure
@@ -14463,6 +14685,7 @@ DEFS=-DHAVE_CONFIG_H
14463 14685
14464ac_libobjs= 14686ac_libobjs=
14465ac_ltlibobjs= 14687ac_ltlibobjs=
14688U=
14466for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 14689for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
14467 # 1. Remove the extension, and $U if already installed. 14690 # 1. Remove the extension, and $U if already installed.
14468 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' 14691 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -14478,6 +14701,7 @@ LTLIBOBJS=$ac_ltlibobjs
14478 14701
14479 14702
14480 14703
14704
14481: ${CONFIG_STATUS=./config.status} 14705: ${CONFIG_STATUS=./config.status}
14482ac_write_fail=0 14706ac_write_fail=0
14483ac_clean_files_save=$ac_clean_files 14707ac_clean_files_save=$ac_clean_files
@@ -14624,19 +14848,19 @@ export LANGUAGE
14624(unset CDPATH) >/dev/null 2>&1 && unset CDPATH 14848(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
14625 14849
14626 14850
14627# as_fn_error ERROR [LINENO LOG_FD] 14851# as_fn_error STATUS ERROR [LINENO LOG_FD]
14628# --------------------------------- 14852# ----------------------------------------
14629# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 14853# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
14630# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 14854# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
14631# script with status $?, using 1 if that was 0. 14855# script with STATUS, using 1 if that was 0.
14632as_fn_error () 14856as_fn_error ()
14633{ 14857{
14634 as_status=$?; test $as_status -eq 0 && as_status=1 14858 as_status=$1; test $as_status -eq 0 && as_status=1
14635 if test "$3"; then 14859 if test "$4"; then
14636 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 14860 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
14637 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 14861 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
14638 fi 14862 fi
14639 $as_echo "$as_me: error: $1" >&2 14863 $as_echo "$as_me: error: $2" >&2
14640 as_fn_exit $as_status 14864 as_fn_exit $as_status
14641} # as_fn_error 14865} # as_fn_error
14642 14866
@@ -14832,7 +15056,7 @@ $as_echo X"$as_dir" |
14832 test -d "$as_dir" && break 15056 test -d "$as_dir" && break
14833 done 15057 done
14834 test -z "$as_dirs" || eval "mkdir $as_dirs" 15058 test -z "$as_dirs" || eval "mkdir $as_dirs"
14835 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 15059 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
14836 15060
14837 15061
14838} # as_fn_mkdir_p 15062} # as_fn_mkdir_p
@@ -14886,7 +15110,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
14886# values after options handling. 15110# values after options handling.
14887ac_log=" 15111ac_log="
14888This file was extended by emacs $as_me 24.0.50, which was 15112This file was extended by emacs $as_me 24.0.50, which was
14889generated by GNU Autoconf 2.65. Invocation command line was 15113generated by GNU Autoconf 2.66. Invocation command line was
14890 15114
14891 CONFIG_FILES = $CONFIG_FILES 15115 CONFIG_FILES = $CONFIG_FILES
14892 CONFIG_HEADERS = $CONFIG_HEADERS 15116 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -14952,10 +15176,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
14952ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 15176ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14953ac_cs_version="\\ 15177ac_cs_version="\\
14954emacs config.status 24.0.50 15178emacs config.status 24.0.50
14955configured by $0, generated by GNU Autoconf 2.65, 15179configured by $0, generated by GNU Autoconf 2.66,
14956 with options \\"\$ac_cs_config\\" 15180 with options \\"\$ac_cs_config\\"
14957 15181
14958Copyright (C) 2009 Free Software Foundation, Inc. 15182Copyright (C) 2010 Free Software Foundation, Inc.
14959This config.status script is free software; the Free Software Foundation 15183This config.status script is free software; the Free Software Foundation
14960gives unlimited permission to copy, distribute and modify it." 15184gives unlimited permission to copy, distribute and modify it."
14961 15185
@@ -15009,7 +15233,7 @@ do
15009 ac_need_defaults=false;; 15233 ac_need_defaults=false;;
15010 --he | --h) 15234 --he | --h)
15011 # Conflict between --help and --header 15235 # Conflict between --help and --header
15012 as_fn_error "ambiguous option: \`$1' 15236 as_fn_error $? "ambiguous option: \`$1'
15013Try \`$0 --help' for more information.";; 15237Try \`$0 --help' for more information.";;
15014 --help | --hel | -h ) 15238 --help | --hel | -h )
15015 $as_echo "$ac_cs_usage"; exit ;; 15239 $as_echo "$ac_cs_usage"; exit ;;
@@ -15018,7 +15242,7 @@ Try \`$0 --help' for more information.";;
15018 ac_cs_silent=: ;; 15242 ac_cs_silent=: ;;
15019 15243
15020 # This is an error. 15244 # This is an error.
15021 -*) as_fn_error "unrecognized option: \`$1' 15245 -*) as_fn_error $? "unrecognized option: \`$1'
15022Try \`$0 --help' for more information." ;; 15246Try \`$0 --help' for more information." ;;
15023 15247
15024 *) as_fn_append ac_config_targets " $1" 15248 *) as_fn_append ac_config_targets " $1"
@@ -15086,7 +15310,7 @@ do
15086 "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; 15310 "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
15087 "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 15311 "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
15088 15312
15089 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 15313 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
15090 esac 15314 esac
15091done 15315done
15092 15316
@@ -15124,7 +15348,7 @@ $debug ||
15124{ 15348{
15125 tmp=./conf$$-$RANDOM 15349 tmp=./conf$$-$RANDOM
15126 (umask 077 && mkdir "$tmp") 15350 (umask 077 && mkdir "$tmp")
15127} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 15351} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
15128 15352
15129# Set up the scripts for CONFIG_FILES section. 15353# Set up the scripts for CONFIG_FILES section.
15130# No need to generate them if there are no CONFIG_FILES. 15354# No need to generate them if there are no CONFIG_FILES.
@@ -15158,7 +15382,7 @@ if test "x$ac_cr" = x; then
15158fi 15382fi
15159ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 15383ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
15160if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 15384if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
15161 ac_cs_awk_cr='\r' 15385 ac_cs_awk_cr='\\r'
15162else 15386else
15163 ac_cs_awk_cr=$ac_cr 15387 ac_cs_awk_cr=$ac_cr
15164fi 15388fi
@@ -15175,7 +15399,7 @@ _ACEOF
15175 echo "_ACEOF" 15399 echo "_ACEOF"
15176} >conf$$files.sh && 15400} >conf$$files.sh &&
15177. ./conf$$files.sh || 15401. ./conf$$files.sh ||
15178 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 15402 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
15179rm -f conf$$files.sh 15403rm -f conf$$files.sh
15180 15404
15181{ 15405{
@@ -15183,18 +15407,18 @@ rm -f conf$$files.sh
15183 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && 15407 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
15184 echo "_ACEOF" 15408 echo "_ACEOF"
15185} >conf$$subs.sh || 15409} >conf$$subs.sh ||
15186 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 15410 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
15187ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 15411ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
15188ac_delim='%!_!# ' 15412ac_delim='%!_!# '
15189for ac_last_try in false false false false false :; do 15413for ac_last_try in false false false false false :; do
15190 . ./conf$$subs.sh || 15414 . ./conf$$subs.sh ||
15191 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 15415 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
15192 15416
15193 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` 15417 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
15194 if test $ac_delim_n = $ac_delim_num; then 15418 if test $ac_delim_n = $ac_delim_num; then
15195 break 15419 break
15196 elif $ac_last_try; then 15420 elif $ac_last_try; then
15197 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 15421 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
15198 else 15422 else
15199 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 15423 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
15200 fi 15424 fi
@@ -15289,20 +15513,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
15289else 15513else
15290 cat 15514 cat
15291fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 15515fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
15292 || as_fn_error "could not setup config files machinery" "$LINENO" 5 15516 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
15293_ACEOF 15517_ACEOF
15294 15518
15295# VPATH may cause trouble with some makes, so we remove $(srcdir), 15519# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
15296# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 15520# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
15297# trailing colons and then remove the whole line if VPATH becomes empty 15521# trailing colons and then remove the whole line if VPATH becomes empty
15298# (actually we leave an empty line to preserve line numbers). 15522# (actually we leave an empty line to preserve line numbers).
15299if test "x$srcdir" = x.; then 15523if test "x$srcdir" = x.; then
15300 ac_vpsub='/^[ ]*VPATH[ ]*=/{ 15524 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
15301s/:*\$(srcdir):*/:/ 15525h
15302s/:*\${srcdir}:*/:/ 15526s///
15303s/:*@srcdir@:*/:/ 15527s/^/:/
15304s/^\([^=]*=[ ]*\):*/\1/ 15528s/[ ]*$/:/
15529s/:\$(srcdir):/:/g
15530s/:\${srcdir}:/:/g
15531s/:@srcdir@:/:/g
15532s/^:*//
15305s/:*$// 15533s/:*$//
15534x
15535s/\(=[ ]*\).*/\1/
15536G
15537s/\n//
15306s/^[^=]*=[ ]*$// 15538s/^[^=]*=[ ]*$//
15307}' 15539}'
15308fi 15540fi
@@ -15330,7 +15562,7 @@ for ac_last_try in false false :; do
15330 if test -z "$ac_t"; then 15562 if test -z "$ac_t"; then
15331 break 15563 break
15332 elif $ac_last_try; then 15564 elif $ac_last_try; then
15333 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 15565 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
15334 else 15566 else
15335 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 15567 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
15336 fi 15568 fi
@@ -15415,7 +15647,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
15415_ACAWK 15647_ACAWK
15416_ACEOF 15648_ACEOF
15417cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 15649cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
15418 as_fn_error "could not setup config headers machinery" "$LINENO" 5 15650 as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
15419fi # test -n "$CONFIG_HEADERS" 15651fi # test -n "$CONFIG_HEADERS"
15420 15652
15421 15653
@@ -15428,7 +15660,7 @@ do
15428 esac 15660 esac
15429 case $ac_mode$ac_tag in 15661 case $ac_mode$ac_tag in
15430 :[FHL]*:*);; 15662 :[FHL]*:*);;
15431 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 15663 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
15432 :[FH]-) ac_tag=-:-;; 15664 :[FH]-) ac_tag=-:-;;
15433 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 15665 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
15434 esac 15666 esac
@@ -15456,7 +15688,7 @@ do
15456 [\\/$]*) false;; 15688 [\\/$]*) false;;
15457 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 15689 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
15458 esac || 15690 esac ||
15459 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 15691 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
15460 esac 15692 esac
15461 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 15693 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
15462 as_fn_append ac_file_inputs " '$ac_f'" 15694 as_fn_append ac_file_inputs " '$ac_f'"
@@ -15483,7 +15715,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
15483 15715
15484 case $ac_tag in 15716 case $ac_tag in
15485 *:-:* | *:-) cat >"$tmp/stdin" \ 15717 *:-:* | *:-) cat >"$tmp/stdin" \
15486 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 15718 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
15487 esac 15719 esac
15488 ;; 15720 ;;
15489 esac 15721 esac
@@ -15619,22 +15851,22 @@ if $ac_cs_awk_getline; then
15619else 15851else
15620 $AWK -f "$tmp/subs.awk" | $SHELL 15852 $AWK -f "$tmp/subs.awk" | $SHELL
15621fi >$tmp/out \ 15853fi >$tmp/out \
15622 || as_fn_error "could not create $ac_file" "$LINENO" 5 15854 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
15623 15855
15624test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 15856test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
15625 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 15857 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
15626 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 15858 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
15627 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 15859 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
15628which seems to be undefined. Please make sure it is defined." >&5 15860which seems to be undefined. Please make sure it is defined" >&5
15629$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 15861$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
15630which seems to be undefined. Please make sure it is defined." >&2;} 15862which seems to be undefined. Please make sure it is defined" >&2;}
15631 15863
15632 rm -f "$tmp/stdin" 15864 rm -f "$tmp/stdin"
15633 case $ac_file in 15865 case $ac_file in
15634 -) cat "$tmp/out" && rm -f "$tmp/out";; 15866 -) cat "$tmp/out" && rm -f "$tmp/out";;
15635 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 15867 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
15636 esac \ 15868 esac \
15637 || as_fn_error "could not create $ac_file" "$LINENO" 5 15869 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
15638 ;; 15870 ;;
15639 :H) 15871 :H)
15640 # 15872 #
@@ -15645,19 +15877,19 @@ which seems to be undefined. Please make sure it is defined." >&2;}
15645 $as_echo "/* $configure_input */" \ 15877 $as_echo "/* $configure_input */" \
15646 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 15878 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
15647 } >"$tmp/config.h" \ 15879 } >"$tmp/config.h" \
15648 || as_fn_error "could not create $ac_file" "$LINENO" 5 15880 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
15649 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 15881 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
15650 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 15882 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
15651$as_echo "$as_me: $ac_file is unchanged" >&6;} 15883$as_echo "$as_me: $ac_file is unchanged" >&6;}
15652 else 15884 else
15653 rm -f "$ac_file" 15885 rm -f "$ac_file"
15654 mv "$tmp/config.h" "$ac_file" \ 15886 mv "$tmp/config.h" "$ac_file" \
15655 || as_fn_error "could not create $ac_file" "$LINENO" 5 15887 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
15656 fi 15888 fi
15657 else 15889 else
15658 $as_echo "/* $configure_input */" \ 15890 $as_echo "/* $configure_input */" \
15659 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 15891 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
15660 || as_fn_error "could not create -" "$LINENO" 5 15892 || as_fn_error $? "could not create -" "$LINENO" 5
15661 fi 15893 fi
15662 ;; 15894 ;;
15663 15895
@@ -15694,7 +15926,7 @@ _ACEOF
15694ac_clean_files=$ac_clean_files_save 15926ac_clean_files=$ac_clean_files_save
15695 15927
15696test $ac_write_fail = 0 || 15928test $ac_write_fail = 0 ||
15697 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 15929 as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
15698 15930
15699 15931
15700# configure is writing to config.log, and then calls config.status. 15932# configure is writing to config.log, and then calls config.status.
@@ -15715,7 +15947,7 @@ if test "$no_create" != yes; then
15715 exec 5>>config.log 15947 exec 5>>config.log
15716 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 15948 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
15717 # would make configure fail if this is the last instruction. 15949 # would make configure fail if this is the last instruction.
15718 $ac_cs_success || as_fn_exit $? 15950 $ac_cs_success || as_fn_exit 1
15719fi 15951fi
15720if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 15952if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
15721 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 15953 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/configure.in b/configure.in
index fcd2faa7670..c712c0925d6 100644
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,7 @@ dnl
23dnl You should have received a copy of the GNU General Public License 23dnl You should have received a copy of the GNU General Public License
24dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 24dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
25 25
26AC_PREREQ(2.65) 26AC_PREREQ(2.66)
27AC_INIT(emacs, 24.0.50) 27AC_INIT(emacs, 24.0.50)
28AC_CONFIG_HEADER(src/config.h:src/config.in) 28AC_CONFIG_HEADER(src/config.h:src/config.in)
29AC_CONFIG_SRCDIR(src/lisp.h) 29AC_CONFIG_SRCDIR(src/lisp.h)
@@ -1359,11 +1359,8 @@ AH_TEMPLATE(POINTER_TYPE,
1359 [Define as `void' if your compiler accepts `void *'; otherwise 1359 [Define as `void' if your compiler accepts `void *'; otherwise
1360 define as `char'.])dnl 1360 define as `char'.])dnl
1361 1361
1362 1362dnl Check for endianess
1363 1363AC_C_BIGENDIAN
1364dnl This could be used for targets which can have both byte sexes.
1365dnl We could presumably replace the hardwired WORDS_BIG_ENDIAN generally.
1366dnl AC_C_BIGENDIAN
1367 1364
1368dnl check for Make feature 1365dnl check for Make feature
1369AC_PROG_MAKE_SET 1366AC_PROG_MAKE_SET
@@ -3346,7 +3343,7 @@ LINKER=
3346ORDINARY_LINK= 3343ORDINARY_LINK=
3347case "$opsys" in 3344case "$opsys" in
3348 ## gnu: GNU needs its own crt0. 3345 ## gnu: GNU needs its own crt0.
3349 aix4-2|cygwin|darwin|gnu|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;; 3346 aix4-2|cygwin|darwin|gnu|hpux*|irix6-5|sol2*|unixware) ORDINARY_LINK=yes ;;
3350 3347
3351 ## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the 3348 ## On post 1.3 releases of NetBSD, gcc -nostdlib also clears the
3352 ## library search parth, i.e. it won't search /usr/lib for libc and 3349 ## library search parth, i.e. it won't search /usr/lib for libc and
@@ -3371,7 +3368,7 @@ if test "x$ORDINARY_LINK" = "xyes"; then
3371 AC_DEFINE(ORDINARY_LINK, 1, [Define if the C compiler is the linker.]) 3368 AC_DEFINE(ORDINARY_LINK, 1, [Define if the C compiler is the linker.])
3372 3369
3373## The system files defining neither ORDINARY_LINK nor LINKER are: 3370## The system files defining neither ORDINARY_LINK nor LINKER are:
3374## (bsd-common), freebsd, gnu-* not on macppc|ibms390x, hpux*. 3371## freebsd, gnu-* not on macppc|ibms390x.
3375elif test "x$GCC" = "xyes" && test "x$LINKER" = "x"; then 3372elif test "x$GCC" = "xyes" && test "x$LINKER" = "x"; then
3376 3373
3377 ## Versions of GCC >= 2.0 put their library, libgcc.a, in obscure 3374 ## Versions of GCC >= 2.0 put their library, libgcc.a, in obscure
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41492031d82..720b9595569 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,23 @@
3 * language/hebrew.el: Exclude U+05C3 (Hebrew SOF PASUQ) from the 3 * language/hebrew.el: Exclude U+05C3 (Hebrew SOF PASUQ) from the
4 composable pattern. 4 composable pattern.
5 5
62010-08-09 Chong Yidong <cyd@stupidchicken.com>
7
8 * emacs-lisp/package.el (package-version-split)
9 (package--version-first-nonzero, package-version-compare):
10 Functions removed.
11 (package-directory-list, package-load-all-descriptors)
12 (package--built-in, package-activate, define-package)
13 (package-installed-p, package-compute-transaction)
14 (package-read-all-archive-contents)
15 (package--add-to-archive-contents, package-buffer-info)
16 (package-tar-file-info, package-list-packages-internal): Use
17 version-to-list and version-list-*.
18
19 * emacs-lisp/package-x.el (package-upload-buffer-internal): Use
20 version-to-list.
21 (package-upload-buffer-internal): Use version-list-<=.
22
62010-08-09 Kenichi Handa <handa@m17n.org> 232010-08-09 Kenichi Handa <handa@m17n.org>
7 24
8 * language/hebrew.el: Exclude U+05BD (Hebrew MAQAF) from the 25 * language/hebrew.el: Exclude U+05BD (Hebrew MAQAF) from the
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index 2a5d84f339b..b93950049e0 100644
--- a/lisp/emacs-lisp/package-x.el
+++ b/lisp/emacs-lisp/package-x.el
@@ -129,7 +129,7 @@ If nil, the \"gnu\" archive is used."
129 (aref pkg-info 2))) 129 (aref pkg-info 2)))
130 (pkg-version (aref pkg-info 3)) 130 (pkg-version (aref pkg-info 3))
131 (commentary (aref pkg-info 4)) 131 (commentary (aref pkg-info 4))
132 (split-version (package-version-split pkg-version)) 132 (split-version (version-to-list pkg-version))
133 (pkg-buffer (current-buffer)) 133 (pkg-buffer (current-buffer))
134 134
135 ;; Download latest archive-contents. 135 ;; Download latest archive-contents.
@@ -150,9 +150,8 @@ If nil, the \"gnu\" archive is used."
150 (error "Unrecognized archive version %d" (car contents))) 150 (error "Unrecognized archive version %d" (car contents)))
151 (let ((elt (assq pkg-name (cdr contents)))) 151 (let ((elt (assq pkg-name (cdr contents))))
152 (if elt 152 (if elt
153 (if (package-version-compare split-version 153 (if (version-list-<= split-version
154 (package-desc-vers (cdr elt)) 154 (package-desc-vers (cdr elt)))
155 '<=)
156 (error "New package has smaller version: %s" pkg-version) 155 (error "New package has smaller version: %s" pkg-version)
157 (setcdr elt new-desc)) 156 (setcdr elt new-desc))
158 (setq contents (cons (car contents) 157 (setq contents (cons (car contents)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index bcb8349c187..2e8c7dc7d4f 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -272,16 +272,12 @@ contrast, `package-user-dir' contains packages for personal use."
272 :group 'package 272 :group 'package
273 :version "24.1") 273 :version "24.1")
274 274
275(defun package-version-split (string)
276 "Split a package string into a version list."
277 (mapcar 'string-to-int (split-string string "[.]")))
278
279(defconst package--builtins-base 275(defconst package--builtins-base
280 ;; We use package-version split here to make sure to pick up the 276 ;; We use package-version split here to make sure to pick up the
281 ;; minor version. 277 ;; minor version.
282 `((emacs . [,(package-version-split emacs-version) nil 278 `((emacs . [,(version-to-list emacs-version) nil
283 "GNU Emacs"]) 279 "GNU Emacs"])
284 (package . [,(package-version-split package-el-version) 280 (package . [,(version-to-list package-el-version)
285 nil "Simple package system for GNU Emacs"])) 281 nil "Simple package system for GNU Emacs"]))
286 "Packages which are always built-in.") 282 "Packages which are always built-in.")
287 283
@@ -335,29 +331,6 @@ The second subexpression is the version string.")
335 "Turn a list of version numbers into a version string." 331 "Turn a list of version numbers into a version string."
336 (mapconcat 'int-to-string l ".")) 332 (mapconcat 'int-to-string l "."))
337 333
338(defun package--version-first-nonzero (l)
339 (while (and l (= (car l) 0))
340 (setq l (cdr l)))
341 (if l (car l) 0))
342
343(defun package-version-compare (v1 v2 fun)
344 "Compare two version lists according to FUN.
345FUN can be <, <=, =, >, >=, or /=."
346 (while (and v1 v2 (= (car v1) (car v2)))
347 (setq v1 (cdr v1)
348 v2 (cdr v2)))
349 (if v1
350 (if v2
351 ;; Both not null; we know the cars are not =.
352 (funcall fun (car v1) (car v2))
353 ;; V1 not null, V2 null.
354 (funcall fun (package--version-first-nonzero v1) 0))
355 (if v2
356 ;; V1 null, V2 not null.
357 (funcall fun 0 (package--version-first-nonzero v2))
358 ;; Both null.
359 (funcall fun 0 0))))
360
361(defun package-strip-version (dirname) 334(defun package-strip-version (dirname)
362 "Strip the version from a combined package name and version. 335 "Strip the version from a combined package name and version.
363E.g., if given \"quux-23.0\", will return \"quux\"" 336E.g., if given \"quux-23.0\", will return \"quux\""
@@ -401,9 +374,8 @@ updates `package-alist' and `package-obsolete-alist'."
401 ((eq force t) 374 ((eq force t)
402 t) 375 t)
403 ((stringp force) ; held 376 ((stringp force) ; held
404 (package-version-compare (package-version-split version) 377 (version-list-= (version-to-list version)
405 (package-version-split force) 378 (version-to-list force)))
406 '=))
407 (t 379 (t
408 (error "Invalid element in `package-load-list'"))) 380 (error "Invalid element in `package-load-list'")))
409 (package-load-descriptor dir subdir)))))))) 381 (package-load-descriptor dir subdir))))))))
@@ -460,8 +432,7 @@ updates `package-alist' and `package-obsolete-alist'."
460(defun package--built-in (package version) 432(defun package--built-in (package version)
461 "Return true if the package is built-in to Emacs." 433 "Return true if the package is built-in to Emacs."
462 (let ((elt (assq package package--builtins))) 434 (let ((elt (assq package package--builtins)))
463 (and elt 435 (and elt (version-list-= (package-desc-vers (cdr elt)) version))))
464 (package-version-compare (package-desc-vers (cdr elt)) version '=))))
465 436
466;; FIXME: return a reason instead? 437;; FIXME: return a reason instead?
467(defun package-activate (package version) 438(defun package-activate (package version)
@@ -479,7 +450,7 @@ Return nil if the package could not be activated."
479 (req-list (package-desc-reqs (cdr pkg-desc))) 450 (req-list (package-desc-reqs (cdr pkg-desc)))
480 ;; If the package was never activated, do it now. 451 ;; If the package was never activated, do it now.
481 (keep-going (or (not (memq package package-activated-list)) 452 (keep-going (or (not (memq package package-activated-list))
482 (package-version-compare this-version version '>)))) 453 (version-list-< version this-version))))
483 (while (and req-list keep-going) 454 (while (and req-list keep-going)
484 (let* ((req (car req-list)) 455 (let* ((req (car req-list))
485 (req-name (car req)) 456 (req-name (car req))
@@ -493,7 +464,7 @@ Return nil if the package could not be activated."
493 ;; can also get here if the requested package was already 464 ;; can also get here if the requested package was already
494 ;; activated. Return non-nil in the latter case. 465 ;; activated. Return non-nil in the latter case.
495 (and (memq package package-activated-list) 466 (and (memq package package-activated-list)
496 (package-version-compare this-version version '>=)))))) 467 (version-list-<= version this-version))))))
497 468
498(defun package-mark-obsolete (package pkg-vec) 469(defun package-mark-obsolete (package pkg-vec)
499 "Put package on the obsolete list, if not already there." 470 "Put package on the obsolete list, if not already there."
@@ -523,21 +494,20 @@ REQUIREMENTS is a list of requirements on other packages.
523Each requirement is of the form (OTHER-PACKAGE \"VERSION\")." 494Each requirement is of the form (OTHER-PACKAGE \"VERSION\")."
524 (let* ((name (intern name-str)) 495 (let* ((name (intern name-str))
525 (pkg-desc (assq name package-alist)) 496 (pkg-desc (assq name package-alist))
526 (new-version (package-version-split version-string)) 497 (new-version (version-to-list version-string))
527 (new-pkg-desc 498 (new-pkg-desc
528 (cons name 499 (cons name
529 (vector new-version 500 (vector new-version
530 (mapcar 501 (mapcar
531 (lambda (elt) 502 (lambda (elt)
532 (list (car elt) 503 (list (car elt)
533 (package-version-split (car (cdr elt))))) 504 (version-to-list (car (cdr elt)))))
534 requirements) 505 requirements)
535 docstring)))) 506 docstring))))
536 ;; Only redefine a package if the redefinition is newer. 507 ;; Only redefine a package if the redefinition is newer.
537 (if (or (not pkg-desc) 508 (if (or (not pkg-desc)
538 (package-version-compare new-version 509 (version-list-< (package-desc-vers (cdr pkg-desc))
539 (package-desc-vers (cdr pkg-desc)) 510 new-version))
540 '>))
541 (progn 511 (progn
542 (when pkg-desc 512 (when pkg-desc
543 ;; Remove old package and declare it obsolete. 513 ;; Remove old package and declare it obsolete.
@@ -548,9 +518,8 @@ Each requirement is of the form (OTHER-PACKAGE \"VERSION\")."
548 ;; You can have two packages with the same version, for instance 518 ;; You can have two packages with the same version, for instance
549 ;; one in the system package directory and one in your private 519 ;; one in the system package directory and one in your private
550 ;; directory. We just let the first one win. 520 ;; directory. We just let the first one win.
551 (unless (package-version-compare new-version 521 (unless (version-list-= new-version
552 (package-desc-vers (cdr pkg-desc)) 522 (package-desc-vers (cdr pkg-desc)))
553 '=)
554 ;; The package is born obsolete. 523 ;; The package is born obsolete.
555 (package-mark-obsolete (car new-pkg-desc) (cdr new-pkg-desc)))))) 524 (package-mark-obsolete (car new-pkg-desc) (cdr new-pkg-desc))))))
556 525
@@ -700,9 +669,8 @@ It will move point to somewhere in the headers."
700(defun package-installed-p (package &optional min-version) 669(defun package-installed-p (package &optional min-version)
701 (let ((pkg-desc (assq package package-alist))) 670 (let ((pkg-desc (assq package package-alist)))
702 (and pkg-desc 671 (and pkg-desc
703 (package-version-compare min-version 672 (version-list-<= min-version
704 (package-desc-vers (cdr pkg-desc)) 673 (package-desc-vers (cdr pkg-desc))))))
705 '<=))))
706 674
707(defun package-compute-transaction (result requirements) 675(defun package-compute-transaction (result requirements)
708 (dolist (elt requirements) 676 (dolist (elt requirements)
@@ -720,9 +688,7 @@ It will move point to somewhere in the headers."
720 (symbol-name next-pkg))) 688 (symbol-name next-pkg)))
721 ((null (stringp hold)) 689 ((null (stringp hold))
722 (error "Invalid element in `package-load-list'")) 690 (error "Invalid element in `package-load-list'"))
723 ((package-version-compare next-version 691 ((version-list-< (version-to-list hold) next-version)
724 (package-version-split hold)
725 '>)
726 (error "Package '%s' held at version %s, \ 692 (error "Package '%s' held at version %s, \
727but version %s required" 693but version %s required"
728 (symbol-name next-pkg) hold 694 (symbol-name next-pkg) hold
@@ -730,9 +696,8 @@ but version %s required"
730 (unless pkg-desc 696 (unless pkg-desc
731 (error "Package '%s' is not available for installation" 697 (error "Package '%s' is not available for installation"
732 (symbol-name next-pkg))) 698 (symbol-name next-pkg)))
733 (unless (package-version-compare (package-desc-vers (cdr pkg-desc)) 699 (unless (version-list-<= next-version
734 next-version 700 (package-desc-vers (cdr pkg-desc)))
735 '>=)
736 (error 701 (error
737 "Need package '%s' with version %s, but only %s is available" 702 "Need package '%s' with version %s, but only %s is available"
738 (symbol-name next-pkg) (package-version-join next-version) 703 (symbol-name next-pkg) (package-version-join next-version)
@@ -788,11 +753,11 @@ Throw an error if the archive version is too new."
788 ;; Version 1 of 'builtin-packages' is a list where the car is 753 ;; Version 1 of 'builtin-packages' is a list where the car is
789 ;; a split emacs version and the cdr is an alist suitable for 754 ;; a split emacs version and the cdr is an alist suitable for
790 ;; package--builtins. 755 ;; package--builtins.
791 (let ((our-version (package-version-split emacs-version)) 756 (let ((our-version (version-to-list emacs-version))
792 (result package--builtins-base)) 757 (result package--builtins-base))
793 (setq package--builtins 758 (setq package--builtins
794 (dolist (elt builtins result) 759 (dolist (elt builtins result)
795 (if (package-version-compare our-version (car elt) '>=) 760 (if (version-list-<= (car elt) our-version)
796 (setq result (append (cdr elt) result))))))))) 761 (setq result (append (cdr elt) result)))))))))
797 762
798(defun package-read-archive-contents (archive) 763(defun package-read-archive-contents (archive)
@@ -818,8 +783,7 @@ Also, add the originating archive to the end of the package vector."
818 (vconcat (cdr package) (vector archive)))) 783 (vconcat (cdr package) (vector archive))))
819 (existing-package (cdr (assq name package-archive-contents)))) 784 (existing-package (cdr (assq name package-archive-contents))))
820 (when (or (not existing-package) 785 (when (or (not existing-package)
821 (package-version-compare version 786 (version-list-< (aref existing-package 0) version))
822 (aref existing-package 0) '>))
823 (add-to-list 'package-archive-contents entry)))) 787 (add-to-list 'package-archive-contents entry))))
824 788
825(defun package-download-transaction (transaction) 789(defun package-download-transaction (transaction)
@@ -915,7 +879,7 @@ May narrow buffer or move point even on failure."
915 (mapcar 879 (mapcar
916 (lambda (elt) 880 (lambda (elt)
917 (list (car elt) 881 (list (car elt)
918 (package-version-split (car (cdr elt))))) 882 (version-to-list (car (cdr elt)))))
919 requires)) 883 requires))
920 (set-text-properties 0 (length file-name) nil file-name) 884 (set-text-properties 0 (length file-name) nil file-name)
921 (set-text-properties 0 (length pkg-version) nil pkg-version) 885 (set-text-properties 0 (length pkg-version) nil pkg-version)
@@ -964,7 +928,7 @@ The return result is a vector like `package-buffer-info'."
964 (mapcar 928 (mapcar
965 (lambda (elt) 929 (lambda (elt)
966 (list (car elt) 930 (list (car elt)
967 (package-version-split (car (cdr elt))))) 931 (version-to-list (car (cdr elt)))))
968 requires)) 932 requires))
969 (vector pkg-name requires docstring version-string readme)))) 933 (vector pkg-name requires docstring version-string readme))))
970 934
@@ -1471,10 +1435,9 @@ Emacs."
1471 (cond ((stringp (cadr hold)) 1435 (cond ((stringp (cadr hold))
1472 "held") 1436 "held")
1473 ((and (setq builtin (assq name package--builtins)) 1437 ((and (setq builtin (assq name package--builtins))
1474 (package-version-compare 1438 (version-list-=
1475 (package-desc-vers (cdr builtin)) 1439 (package-desc-vers (cdr builtin))
1476 (package-desc-vers desc) 1440 (package-desc-vers desc)))
1477 '=))
1478 "built-in") 1441 "built-in")
1479 (t "installed")) 1442 (t "installed"))
1480 (package-desc-doc desc) 1443 (package-desc-doc desc)
@@ -1486,7 +1449,7 @@ Emacs."
1486 hold (assq name package-load-list)) 1449 hold (assq name package-load-list))
1487 (unless (and hold (stringp (cadr hold)) 1450 (unless (and hold (stringp (cadr hold))
1488 (package-installed-p 1451 (package-installed-p
1489 name (package-version-split (cadr hold)))) 1452 name (version-to-list (cadr hold))))
1490 (setq info-list 1453 (setq info-list
1491 (package-list-maybe-add name 1454 (package-list-maybe-add name
1492 (package-desc-vers desc) 1455 (package-desc-vers desc)
diff --git a/src/ChangeLog b/src/ChangeLog
index 6fd89a6339d..a3e08cf699d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,40 @@
12010-08-09 Dan Nicolaescu <dann@ics.uci.edu> 12010-08-09 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * font.h (font_parse_xlfd, font_parse_fcname, font_unparse_fcname)
4 (font_parse_name): font_open_by_name):
5 * font.c (font_parse_xlfd, font_parse_fcname, font_unparse_fcname)
6 (font_parse_name): font_open_by_name): Remove const.
7
82010-08-09 Andreas Schwab <schwab@linux-m68k.org>
9
10 Use autoconf determined WORDS_BIGENDIAN instead of hardcoded
11 definition.
12
13 * m/alpha.h: Don't define/undef WORDS_BIG_ENDIAN.
14 * m/amdx86-64.h: Likewise.
15 * m/arm.h: Likewise.
16 * m/hp800.h: Likewise.
17 * m/ia64.h: Likewise.
18 * m/ibmrs6000.h: Likewise.
19 * m/ibms390.h: Likewise.
20 * m/intel386.h: Likewise.
21 * m/iris4d.h: Likewise.
22 * m/m68k.h: Likewise.
23 * m/macppc.h: Likewise.
24 * m/mips.h: Likewise.
25 * m/sh3.h: Likewise.
26 * m/sparc.h: Likewise.
27 * m/template.h: Likewise.
28 * m/vax.h: Likewise.
29 * m/xtensa.h: Likewise.
30 * fringe.c (init_fringe_bitmap): Test WORDS_BIGENDIAN instead of
31 WORDS_BIG_ENDIAN.
32 * lisp.h: Likewise.
33 * md5.c: Likewise.
34 * sound.c (le2hl, le2hs, be2hl, be2hs): Likewise.
35
362010-08-09 Dan Nicolaescu <dann@ics.uci.edu>
37
3 Use const char* instead of char*. 38 Use const char* instead of char*.
4 Reduce the number of warnings with -Wwrite-strings. 39 Reduce the number of warnings with -Wwrite-strings.
5 * xrdb.c (get_environ_db, get_system_name): 40 * xrdb.c (get_environ_db, get_system_name):
diff --git a/src/config.in b/src/config.in
index 19ed94376c1..ea17a54d913 100644
--- a/src/config.in
+++ b/src/config.in
@@ -27,6 +27,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
27#define EMACS_CONFIG_H 27#define EMACS_CONFIG_H
28 28
29 29
30/* Define if building universal (internal helper macro) */
31#undef AC_APPLE_UNIVERSAL_BUILD
32
30/* Define to 1 if the mktime function is broken. */ 33/* Define to 1 if the mktime function is broken. */
31#undef BROKEN_MKTIME 34#undef BROKEN_MKTIME
32 35
@@ -976,6 +979,18 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
976/* Define to 1 if using an X toolkit. */ 979/* Define to 1 if using an X toolkit. */
977#undef USE_X_TOOLKIT 980#undef USE_X_TOOLKIT
978 981
982/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
983 significant byte first (like Motorola and SPARC, unlike Intel). */
984#if defined AC_APPLE_UNIVERSAL_BUILD
985# if defined __BIG_ENDIAN__
986# define WORDS_BIGENDIAN 1
987# endif
988#else
989# ifndef WORDS_BIGENDIAN
990# undef WORDS_BIGENDIAN
991# endif
992#endif
993
979/* Define this to check for malloc buffer overrun. */ 994/* Define this to check for malloc buffer overrun. */
980#undef XMALLOC_OVERRUN_CHECK 995#undef XMALLOC_OVERRUN_CHECK
981 996
diff --git a/src/font.c b/src/font.c
index 1ac994d6375..eba75c11b2f 100644
--- a/src/font.c
+++ b/src/font.c
@@ -701,7 +701,7 @@ font_put_extra (Lisp_Object font, Lisp_Object prop, Lisp_Object val)
701 701
702static int parse_matrix (const char *); 702static int parse_matrix (const char *);
703static int font_expand_wildcards (Lisp_Object *, int); 703static int font_expand_wildcards (Lisp_Object *, int);
704static int font_parse_name (const char *, Lisp_Object); 704static int font_parse_name (char *, Lisp_Object);
705 705
706/* An enumerator for each field of an XLFD font name. */ 706/* An enumerator for each field of an XLFD font name. */
707enum xlfd_field_index 707enum xlfd_field_index
@@ -981,7 +981,7 @@ font_expand_wildcards (Lisp_Object *field, int n)
981 a fully specified XLFD. */ 981 a fully specified XLFD. */
982 982
983int 983int
984font_parse_xlfd (const char *name, Lisp_Object font) 984font_parse_xlfd (char *name, Lisp_Object font)
985{ 985{
986 int len = strlen (name); 986 int len = strlen (name);
987 int i, j, n; 987 int i, j, n;
@@ -1306,7 +1306,7 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
1306 This function tries to guess which format it is. */ 1306 This function tries to guess which format it is. */
1307 1307
1308int 1308int
1309font_parse_fcname (const char *name, Lisp_Object font) 1309font_parse_fcname (char *name, Lisp_Object font)
1310{ 1310{
1311 char *p, *q; 1311 char *p, *q;
1312 char *size_beg = NULL, *size_end = NULL; 1312 char *size_beg = NULL, *size_end = NULL;
@@ -1563,7 +1563,7 @@ font_parse_fcname (const char *name, Lisp_Object font)
1563 FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead. */ 1563 FONT_SIZE_INDEX of FONT is 0, use PIXEL_SIZE instead. */
1564 1564
1565int 1565int
1566font_unparse_fcname (Lisp_Object font, int pixel_size, const char *name, int nbytes) 1566font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
1567{ 1567{
1568 Lisp_Object family, foundry; 1568 Lisp_Object family, foundry;
1569 Lisp_Object tail, val; 1569 Lisp_Object tail, val;
@@ -1765,7 +1765,7 @@ font_unparse_gtkname (Lisp_Object font, struct frame *f, char *name, int nbytes)
1765 0. Otherwise return -1. */ 1765 0. Otherwise return -1. */
1766 1766
1767static int 1767static int
1768font_parse_name (const char *name, Lisp_Object font) 1768font_parse_name (char *name, Lisp_Object font)
1769{ 1769{
1770 if (name[0] == '-' || strchr (name, '*') || strchr (name, '?')) 1770 if (name[0] == '-' || strchr (name, '*') || strchr (name, '?'))
1771 return font_parse_xlfd (name, font); 1771 return font_parse_xlfd (name, font);
@@ -3506,7 +3506,7 @@ font_open_by_spec (FRAME_PTR f, Lisp_Object spec)
3506 found, return Qnil. */ 3506 found, return Qnil. */
3507 3507
3508Lisp_Object 3508Lisp_Object
3509font_open_by_name (FRAME_PTR f, const char *name) 3509font_open_by_name (FRAME_PTR f, char *name)
3510{ 3510{
3511 Lisp_Object args[2]; 3511 Lisp_Object args[2];
3512 Lisp_Object spec, ret; 3512 Lisp_Object spec, ret;
diff --git a/src/font.h b/src/font.h
index d37f0c86a23..5f1a442b59e 100644
--- a/src/font.h
+++ b/src/font.h
@@ -783,7 +783,7 @@ extern void font_prepare_for_face (FRAME_PTR f, struct face *face);
783extern void font_done_for_face (FRAME_PTR f, struct face *face); 783extern void font_done_for_face (FRAME_PTR f, struct face *face);
784 784
785extern Lisp_Object font_open_by_spec (FRAME_PTR f, Lisp_Object spec); 785extern Lisp_Object font_open_by_spec (FRAME_PTR f, Lisp_Object spec);
786extern Lisp_Object font_open_by_name (FRAME_PTR f, const char *name); 786extern Lisp_Object font_open_by_name (FRAME_PTR f, char *name);
787extern void font_close_object (FRAME_PTR f, Lisp_Object font_object); 787extern void font_close_object (FRAME_PTR f, Lisp_Object font_object);
788 788
789extern Lisp_Object font_intern_prop (const char *str, int len, int force_symbol); 789extern Lisp_Object font_intern_prop (const char *str, int len, int force_symbol);
@@ -795,12 +795,12 @@ extern void font_parse_family_registry (Lisp_Object family,
795extern Lisp_Object font_spec_from_family_registry (Lisp_Object family, 795extern Lisp_Object font_spec_from_family_registry (Lisp_Object family,
796 Lisp_Object registry); 796 Lisp_Object registry);
797 797
798extern int font_parse_xlfd (const char *name, Lisp_Object font); 798extern int font_parse_xlfd (char *name, Lisp_Object font);
799extern int font_unparse_xlfd (Lisp_Object font, int pixel_size, 799extern int font_unparse_xlfd (Lisp_Object font, int pixel_size,
800 char *name, int bytes); 800 char *name, int bytes);
801extern int font_parse_fcname (const char *name, Lisp_Object font); 801extern int font_parse_fcname (char *name, Lisp_Object font);
802extern int font_unparse_fcname (Lisp_Object font, int pixel_size, 802extern int font_unparse_fcname (Lisp_Object font, int pixel_size,
803 const char *name, int bytes); 803 char *name, int bytes);
804extern int font_unparse_gtkname (Lisp_Object, struct frame *, char *, int); 804extern int font_unparse_gtkname (Lisp_Object, struct frame *, char *, int);
805extern void register_font_driver (struct font_driver *driver, FRAME_PTR f); 805extern void register_font_driver (struct font_driver *driver, FRAME_PTR f);
806extern void free_font_driver_list (FRAME_PTR f); 806extern void free_font_driver_list (FRAME_PTR f);
diff --git a/src/fringe.c b/src/fringe.c
index f24365a1e23..fce100b1463 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1494,7 +1494,7 @@ init_fringe_bitmap (int which, struct fringe_bitmap *fb, int once_p)
1494 | (swap_nibble[(b>>8) & 0xf] << 4) 1494 | (swap_nibble[(b>>8) & 0xf] << 4)
1495 | (swap_nibble[(b>>12) & 0xf])); 1495 | (swap_nibble[(b>>12) & 0xf]));
1496 b >>= (16 - fb->width); 1496 b >>= (16 - fb->width);
1497#ifdef WORDS_BIG_ENDIAN 1497#ifdef WORDS_BIGENDIAN
1498 b = ((b >> 8) | (b << 8)); 1498 b = ((b >> 8) | (b << 8));
1499#endif 1499#endif
1500 *bits++ = b; 1500 *bits++ = b;
diff --git a/src/lisp.h b/src/lisp.h
index 218c6e630fc..89514bf9ecb 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -254,7 +254,7 @@ enum Lisp_Fwd_Type
254 254
255#ifdef USE_LISP_UNION_TYPE 255#ifdef USE_LISP_UNION_TYPE
256 256
257#ifndef WORDS_BIG_ENDIAN 257#ifndef WORDS_BIGENDIAN
258 258
259/* Definition of Lisp_Object for little-endian machines. */ 259/* Definition of Lisp_Object for little-endian machines. */
260 260
@@ -278,7 +278,7 @@ union Lisp_Object
278 } 278 }
279Lisp_Object; 279Lisp_Object;
280 280
281#else /* If WORDS_BIG_ENDIAN */ 281#else /* If WORDS_BIGENDIAN */
282 282
283typedef 283typedef
284union Lisp_Object 284union Lisp_Object
@@ -300,7 +300,7 @@ union Lisp_Object
300 } 300 }
301Lisp_Object; 301Lisp_Object;
302 302
303#endif /* WORDS_BIG_ENDIAN */ 303#endif /* WORDS_BIGENDIAN */
304 304
305#ifdef __GNUC__ 305#ifdef __GNUC__
306static __inline__ Lisp_Object 306static __inline__ Lisp_Object
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 5a0168417cb..3b6d7da92df 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -25,10 +25,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
25#define _LP64 /* This doesn't appear to be necessary on OSF 4/5 -- fx. */ 25#define _LP64 /* This doesn't appear to be necessary on OSF 4/5 -- fx. */
26#endif 26#endif
27 27
28/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
29 is the most significant byte. */
30#undef WORDS_BIG_ENDIAN
31
32/* Now define a symbol for the cpu type, if your compiler 28/* Now define a symbol for the cpu type, if your compiler
33 does not define it automatically. */ 29 does not define it automatically. */
34/* __alpha defined automatically */ 30/* __alpha defined automatically */
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 1910c37bffc..30aa2678717 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -21,10 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
21#define BITS_PER_LONG 64 21#define BITS_PER_LONG 64
22#define BITS_PER_EMACS_INT 64 22#define BITS_PER_EMACS_INT 64
23 23
24/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
25 is the most significant byte. */
26#undef WORDS_BIG_ENDIAN
27
28/* Now define a symbol for the cpu type, if your compiler 24/* Now define a symbol for the cpu type, if your compiler
29 does not define it automatically: 25 does not define it automatically:
30 Ones defined so far include vax, m68000, ns16000, pyramid, 26 Ones defined so far include vax, m68000, ns16000, pyramid,
diff --git a/src/m/arm.h b/src/m/arm.h
index ee5d6c77844..8b659bb5bd0 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -18,9 +18,5 @@ GNU General Public License for more details.
18You should have received a copy of the GNU General Public License 18You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
22 is the most significant byte. */
23#undef WORDS_BIG_ENDIAN
24
25/* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42 21/* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42
26 (do not change this comment) */ 22 (do not change this comment) */
diff --git a/src/m/hp800.h b/src/m/hp800.h
index 3889a1a3e60..9998f701a6b 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -18,10 +18,6 @@ GNU General Public License for more details.
18You should have received a copy of the GNU General Public License 18You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
22 is the most significant byte. */
23#define WORDS_BIG_ENDIAN
24
25/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend 21/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
26 the bit field into an int. In other words, if bit fields 22 the bit field into an int. In other words, if bit fields
27 are always unsigned. 23 are always unsigned.
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 5266c682c78..bbf09ac878b 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -23,10 +23,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
23#define BITS_PER_LONG 64 23#define BITS_PER_LONG 64
24#define BITS_PER_EMACS_INT 64 24#define BITS_PER_EMACS_INT 64
25 25
26/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
27 is the most significant byte. */
28#undef WORDS_BIG_ENDIAN
29
30/* Now define a symbol for the cpu type, if your compiler 26/* Now define a symbol for the cpu type, if your compiler
31 does not define it automatically. */ 27 does not define it automatically. */
32/* __ia64__ defined automatically */ 28/* __ia64__ defined automatically */
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index a44b2c4ec3b..785719e908b 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -23,7 +23,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
23 An address of data cannot be stored correctly in a Lisp object; 23 An address of data cannot be stored correctly in a Lisp object;
24 we always lose the high bits. We must tell XPNTR to add them back. */ 24 we always lose the high bits. We must tell XPNTR to add them back. */
25#define DATA_START 0x20000000 25#define DATA_START 0x20000000
26#define WORDS_BIG_ENDIAN
27#define DATA_SEG_BITS 0x20000000 26#define DATA_SEG_BITS 0x20000000
28 27
29#ifndef NLIST_STRUCT 28#ifndef NLIST_STRUCT
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index 087607b547d..0acc826a1ea 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -19,10 +19,6 @@ You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21 21
22/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
23 is the most significant byte. */
24#define WORDS_BIG_ENDIAN
25
26/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend 22/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
27 the 24-bit bit field into an int. In other words, if bit fields 23 the 24-bit bit field into an int. In other words, if bit fields
28 are always unsigned. 24 are always unsigned.
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 2931e9a2284..15601fae76e 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -19,10 +19,6 @@ You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21 21
22/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
23 is the most significant byte. */
24#undef WORDS_BIG_ENDIAN
25
26#ifdef WINDOWSNT 22#ifdef WINDOWSNT
27#define VIRT_ADDR_VARIES 23#define VIRT_ADDR_VARIES
28#define DATA_START get_data_start () 24#define DATA_START get_data_start ()
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 526d68ee5fc..31f08d05cfc 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -19,10 +19,6 @@ You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21 21
22/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
23 is the most significant byte. */
24#define WORDS_BIG_ENDIAN
25
26/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend 22/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
27 the bit field into an int. In other words, if bit fields 23 the bit field into an int. In other words, if bit fields
28 are always unsigned. 24 are always unsigned.
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 2286cbce5e6..8d53424ccec 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -18,10 +18,6 @@ GNU General Public License for more details.
18You should have received a copy of the GNU General Public License 18You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
22 is the most significant byte. */
23#define WORDS_BIG_ENDIAN
24
25/* Now define a symbol for the cpu type, if your compiler 21/* Now define a symbol for the cpu type, if your compiler
26 does not define it automatically. */ 22 does not define it automatically. */
27#ifndef m68k 23#ifndef m68k
diff --git a/src/m/macppc.h b/src/m/macppc.h
index 2764ae56115..01735790b20 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -18,10 +18,6 @@ GNU General Public License for more details.
18You should have received a copy of the GNU General Public License 18You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
22 is the most significant byte. */
23#define WORDS_BIG_ENDIAN
24
25/* Data type of load average, as read out of kmem. */ 21/* Data type of load average, as read out of kmem. */
26#define LOAD_AVE_TYPE long 22#define LOAD_AVE_TYPE long
27 23
diff --git a/src/m/mips.h b/src/m/mips.h
index 39a948c0cde..b3a754c2b61 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -18,12 +18,6 @@ GNU General Public License for more details.
18You should have received a copy of the GNU General Public License 18You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
22 is the most significant byte. */
23#if ! (defined (__MIPSEL__) || defined (MIPSEL) || defined (_MIPSEL))
24#define WORDS_BIG_ENDIAN
25#endif
26
27/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend 21/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
28 the 24-bit bit field into an int. In other words, if bit fields 22 the 24-bit bit field into an int. In other words, if bit fields
29 are always unsigned. 23 are always unsigned.
diff --git a/src/m/sh3.h b/src/m/sh3.h
index 703513d23f7..ebfdb5b2d64 100644
--- a/src/m/sh3.h
+++ b/src/m/sh3.h
@@ -1,8 +1,4 @@
1/* Machine description file for SuperH. */ 1/* Machine description file for SuperH. */
2 2
3#ifdef __BIG_ENDIAN__
4# define WORDS_BIG_ENDIAN
5#endif
6
7/* arch-tag: 1b01b84f-f044-4afa-aa4b-caa54ec38966 3/* arch-tag: 1b01b84f-f044-4afa-aa4b-caa54ec38966
8 (do not change this comment) */ 4 (do not change this comment) */
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 6c2c71c4045..26ca3caaebe 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -18,10 +18,6 @@ GNU General Public License for more details.
18You should have received a copy of the GNU General Public License 18You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
22 is the most significant byte. */
23#define WORDS_BIG_ENDIAN
24
25/* __sparc__ is defined by the compiler by default. */ 21/* __sparc__ is defined by the compiler by default. */
26 22
27/* XINT must explicitly sign-extend 23/* XINT must explicitly sign-extend
diff --git a/src/m/template.h b/src/m/template.h
index 7e067849813..4efc9158a45 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -18,10 +18,6 @@ GNU General Public License for more details.
18You should have received a copy of the GNU General Public License 18You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
22 is the most significant byte. */
23#define WORDS_BIG_ENDIAN
24
25/* Now define a symbol for the cpu type, if your compiler 21/* Now define a symbol for the cpu type, if your compiler
26 does not define it automatically. 22 does not define it automatically.
27 Ones defined so far include m68k and many others */ 23 Ones defined so far include m68k and many others */
diff --git a/src/m/vax.h b/src/m/vax.h
index 3426a20d55e..16e790a2769 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -19,10 +19,6 @@ You should have received a copy of the GNU General Public License
19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 19along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20 20
21 21
22/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
23 is the most significant byte. */
24#undef WORDS_BIG_ENDIAN
25
26/* #define vax -- appears to be done automatically */ 22/* #define vax -- appears to be done automatically */
27 23
28/* USG systems I know of running on Vaxes do not actually 24/* USG systems I know of running on Vaxes do not actually
diff --git a/src/m/xtensa.h b/src/m/xtensa.h
index 664f18dcb10..8e1da54b25b 100644
--- a/src/m/xtensa.h
+++ b/src/m/xtensa.h
@@ -2,11 +2,5 @@
2 2
3Add a license notice if this grows to > 10 lines of code. */ 3Add a license notice if this grows to > 10 lines of code. */
4 4
5#ifdef __LITTLE_ENDIAN
6#undef WORDS_BIG_ENDIAN
7#else
8#define WORDS_BIG_ENDIAN
9#endif
10
11/* arch-tag: fe5872de-d565-4d81-8fe0-ea19865b3e6a 5/* arch-tag: fe5872de-d565-4d81-8fe0-ea19865b3e6a
12 (do not change this comment) */ 6 (do not change this comment) */
diff --git a/src/md5.c b/src/md5.c
index 1840c2ac92b..6e7f651189e 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -1,7 +1,7 @@
1/* Functions to compute MD5 message digest of files or memory blocks. 1/* Functions to compute MD5 message digest of files or memory blocks.
2 according to the definition of MD5 in RFC 1321 from April 1992. 2 according to the definition of MD5 in RFC 1321 from April 1992.
3 Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 3 Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
4 2005, 2006, 2007 Free Software Foundation, Inc. 4 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
5 5
6 This file is part of the GNU C Library. 6 This file is part of the GNU C Library.
7 7
@@ -40,7 +40,7 @@
40#ifdef _LIBC 40#ifdef _LIBC
41# include <endian.h> 41# include <endian.h>
42# if __BYTE_ORDER == __BIG_ENDIAN 42# if __BYTE_ORDER == __BIG_ENDIAN
43# define WORDS_BIG_ENDIAN 1 43# define WORDS_BIGENDIAN 1
44# endif 44# endif
45/* We need to keep the namespace clean so define the MD5 function 45/* We need to keep the namespace clean so define the MD5 function
46 protected using leading __ . */ 46 protected using leading __ . */
@@ -55,7 +55,7 @@
55 55
56#include "md5.h" 56#include "md5.h"
57 57
58#ifdef WORDS_BIG_ENDIAN 58#ifdef WORDS_BIGENDIAN
59# define SWAP(n) \ 59# define SWAP(n) \
60 (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) 60 (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
61#else 61#else
diff --git a/src/sound.c b/src/sound.c
index 55804c328a8..b93099283da 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -481,7 +481,7 @@ sound_cleanup (Lisp_Object arg)
481static u_int32_t 481static u_int32_t
482le2hl (u_int32_t value) 482le2hl (u_int32_t value)
483{ 483{
484#ifdef WORDS_BIG_ENDIAN 484#ifdef WORDS_BIGENDIAN
485 unsigned char *p = (unsigned char *) &value; 485 unsigned char *p = (unsigned char *) &value;
486 value = p[0] + (p[1] << 8) + (p[2] << 16) + (p[3] << 24); 486 value = p[0] + (p[1] << 8) + (p[2] << 16) + (p[3] << 24);
487#endif 487#endif
@@ -495,7 +495,7 @@ le2hl (u_int32_t value)
495static u_int16_t 495static u_int16_t
496le2hs (u_int16_t value) 496le2hs (u_int16_t value)
497{ 497{
498#ifdef WORDS_BIG_ENDIAN 498#ifdef WORDS_BIGENDIAN
499 unsigned char *p = (unsigned char *) &value; 499 unsigned char *p = (unsigned char *) &value;
500 value = p[0] + (p[1] << 8); 500 value = p[0] + (p[1] << 8);
501#endif 501#endif
@@ -509,7 +509,7 @@ le2hs (u_int16_t value)
509static u_int32_t 509static u_int32_t
510be2hl (u_int32_t value) 510be2hl (u_int32_t value)
511{ 511{
512#ifndef WORDS_BIG_ENDIAN 512#ifndef WORDS_BIGENDIAN
513 unsigned char *p = (unsigned char *) &value; 513 unsigned char *p = (unsigned char *) &value;
514 value = p[3] + (p[2] << 8) + (p[1] << 16) + (p[0] << 24); 514 value = p[3] + (p[2] << 8) + (p[1] << 16) + (p[0] << 24);
515#endif 515#endif
@@ -525,7 +525,7 @@ be2hl (u_int32_t value)
525static u_int16_t 525static u_int16_t
526be2hs (u_int16_t value) 526be2hs (u_int16_t value)
527{ 527{
528#ifndef WORDS_BIG_ENDIAN 528#ifndef WORDS_BIGENDIAN
529 unsigned char *p = (unsigned char *) &value; 529 unsigned char *p = (unsigned char *) &value;
530 value = p[1] + (p[0] << 8); 530 value = p[1] + (p[0] << 8);
531#endif 531#endif
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-19 02:09:07 +0000