[emacs-debian commit] Merge Rob's latest changes;
disable broken ppc64 support (#329459) @ emacs-debian--main--21.4
Jérôme Marant
jerome at marant.org
Thu Sep 29 05:40:39 UTC 2005
===============================================
WARNING: MESSAGE TRUNCATED TO 1000 LINES
===============================================
Revision: emacs-debian--main--21.4--patch-18
Archive: jerome at debian.org--2005
Creator: Jerome Marant <jerome at marant.org>
Date: jeu sep 29 07:39:38 CEST 2005
Standard-date: 2005-09-29 05:39:38 GMT
Modified-files: changelog patches/00list
patches/autofiles.dpatch
patches/multibyte-char-key-modifiers.dpatch rules
New-patches: jerome at debian.org--2005/emacs-debian--main--21.4--patch-18
rlb at defaultvalue.org--debian-emacs-1/emacs-debian--main--21.4--patch-4
rlb at defaultvalue.org--debian-emacs-1/emacs-debian--main--21.4--patch-5
rlb at defaultvalue.org--debian-emacs-1/emacs-debian--main--21.4--patch-6
Summary: Merge Rob's latest changes; disable broken ppc64 support (#329459)
Keywords:
* looking for jerome at debian.org--2005/emacs-debian--main--21.4--patch-17 to compare with
* build pristine tree for jerome at debian.org--2005/emacs-debian--main--21.4--patch-17
* comparing to jerome at debian.org--2005/emacs-debian--main--21.4--patch-17: ......... done.
* modified files
--- orig/changelog
+++ mod/changelog
@@ -1,3 +1,13 @@
+emacs21 (21.4a-3) unstable; urgency=low
+
+ * Disable support for the ppc64 architecture: the patch breaks the
+ powerpc support and does not work on ppc64 any more anyway.
+ (closes: #329459) [Jérôme Marant]
+ - debian/patches/00list: disable arch-ppc64 patch.
+ - debian/patches/autofiles.dpatch: regenerated.
+
+ --
+
emacs21 (21.4a-2) unstable; urgency=low
* Apply patch applying modifiers to multibyte-char keys. Thanks to
@@ -39,7 +49,7 @@
- debian/patches/whitespace-readonly-infloop.dpatch: new file.
- debian/00list: updated.
- --
+ -- Rob Browning <rlb at defaultvalue.org> Sat, 17 Sep 2005 23:39:52 -0700
emacs21 (21.4a-1) unstable; urgency=medium
--- orig/patches/00list
+++ mod/patches/00list
@@ -21,7 +21,7 @@
remote-files-permissions
pcl-cvs-format
arch-amd64
-arch-ppc64
+#arch-ppc64
multibyte-char-key-modifiers
xorg-altgr-fix
whitespace-readonly-infloop
--- orig/patches/autofiles.dpatch
+++ mod/patches/autofiles.dpatch
@@ -24,9 +24,9 @@
exit 0
@DPATCH@
-diff -urNad emacs21-21.4a/aclocal.m4 /tmp/dpep.PpW6qa/emacs21-21.4a/aclocal.m4
---- emacs21-21.4a/aclocal.m4 2005-05-01 14:24:45.000000000 +0200
-+++ /tmp/dpep.PpW6qa/emacs21-21.4a/aclocal.m4 2005-05-01 20:06:34.343049016 +0200
+diff -urNad emacs21-21.4a~/aclocal.m4 emacs21-21.4a/aclocal.m4
+--- emacs21-21.4a~/aclocal.m4 2005-05-01 14:24:45.000000000 +0200
++++ emacs21-21.4a/aclocal.m4 2005-09-29 07:32:02.000000000 +0200
@@ -1,532 +1,831 @@
+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
@@ -1364,9 +1364,9 @@
+])
-) dnl ifelse
-diff -urNad emacs21-21.4a/configure /tmp/dpep.PpW6qa/emacs21-21.4a/configure
---- emacs21-21.4a/configure 2005-05-01 14:24:45.000000000 +0200
-+++ /tmp/dpep.PpW6qa/emacs21-21.4a/configure 2005-05-01 20:06:49.172794552 +0200
+diff -urNad emacs21-21.4a~/configure emacs21-21.4a/configure
+--- emacs21-21.4a~/configure 2005-05-01 14:24:45.000000000 +0200
++++ emacs21-21.4a/configure 2005-09-29 07:32:19.000000000 +0200
@@ -1,57 +1,326 @@
#! /bin/sh
-
@@ -2523,7 +2523,7 @@
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
-
++
+ cd $ac_dir
+ # Check for guested configure; otherwise get Cygnus style configure.
+ if test -f $ac_srcdir/configure.gnu; then
@@ -2750,7 +2750,7 @@
+echo >confdefs.h
+
+# Predefined preprocessor variables.
-+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
@@ -2780,7 +2780,7 @@
# Prefer explicitly selected file to automatically selected ones.
if test -z "$CONFIG_SITE"; then
if test "x$prefix" != xNONE; then
-@@ -517,41 +1219,107 @@
+@@ -517,42 +1219,108 @@
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
@@ -2888,7 +2888,6 @@
+
+
+
-+
-ac_exeext=
-ac_objext=o
@@ -2905,11 +2904,13 @@
-fi
+
+ ac_config_headers="$ac_config_headers src/config.h:src/config.in"
+
-
++
lispdir='${datadir}/emacs/${version}/lisp'
+ locallisppath='${datadir}/emacs/${version}/site-lisp:'\
@@ -562,37 +1330,38 @@
archlibdir='${libexecdir}/emacs/${version}/${configuration}'
docdir='${datadir}/emacs/${version}/etc'
@@ -3202,19 +3203,7 @@
canonical=$host
configuration=$host_alias
-@@ -904,11 +1724,6 @@
- machine=arm opsys=gnu-linux
- ;;
-
-- ppc-*-linux | \
-- powerpc-*-linux* )
-- machine=macppc opsys=gnu-linux
-- ;;
--
- ## Altos 3068
- m68*-altos-sysv* )
- machine=altos opsys=usg5-2
-@@ -1178,6 +1993,9 @@
+@@ -1178,6 +1998,9 @@
hppa*-*-nextstep* )
machine=hp800 opsys=nextstep
;;
@@ -3224,7 +3213,7 @@
## Orion machines
orion-orion-bsd* )
-@@ -1246,6 +2064,10 @@
+@@ -1246,6 +2069,10 @@
machine=ibmrt-aix opsys=usg5-2-2
;;
@@ -3235,7 +3224,7 @@
## Integrated Solutions `Optimum V'
m68*-isi-bsd4.2* )
machine=isi-ov opsys=bsd4-2
-@@ -1650,7 +2472,7 @@
+@@ -1650,7 +2477,7 @@
*-xenix* ) opsys=xenix ;;
*-linux-gnu* ) opsys=gnu-linux ;;
*-sco3.2v4* ) opsys=sco4 ; NON_GNU_CPP=/lib/cpp ;;
@@ -3244,7 +3233,7 @@
NON_GNU_CPP=/lib/cpp
# Prevent -belf from being passed to $CPP.
# /lib/cpp does not accept it.
-@@ -1674,6 +2496,11 @@
+@@ -1674,6 +2501,11 @@
machine=mips opsys=gnu-linux
;;
@@ -3256,7 +3245,7 @@
## UXP/DS
sparc-fujitsu-sysv4* )
machine=sparc opsys=uxpds
-@@ -1686,6 +2513,11 @@
+@@ -1686,6 +2518,11 @@
machine=f301 opsys=uxpv
;;
@@ -3268,7 +3257,7 @@
* )
unported=yes
;;
-@@ -1729,8 +2561,11 @@
+@@ -1729,8 +2566,11 @@
if test $unported = yes; then
@@ -3282,7 +3271,7 @@
fi
machfile="m/${machine}.h"
-@@ -1746,214 +2581,657 @@
+@@ -1746,214 +2586,657 @@
case ${with_gcc} in
"yes" ) CC="gcc" GCC=yes ;;
"no" ) : ${CC=cc} ;;
@@ -3461,13 +3450,13 @@
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
-+fi
-+
+ fi
+
+ CC=$ac_ct_CC
+else
+ CC="$ac_cv_prog_CC"
- fi
-
++fi
++
+fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
@@ -4076,7 +4065,7 @@
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
CFLAGS="-g -O2"
-@@ -1967,6 +3245,265 @@
+@@ -1967,6 +3250,265 @@
CFLAGS=
fi
fi
@@ -4342,7 +4331,7 @@
esac
-@@ -2016,106 +3553,250 @@
+@@ -2016,106 +3558,250 @@
#### should make an entry in src/config.h, don't forget to add an
#### #undef clause to src/config.h.in for autoconf to modify.
@@ -4673,7 +4662,7 @@
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
-@@ -2124,151 +3805,244 @@
+@@ -2124,151 +3810,244 @@
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
@@ -4995,7 +4984,7 @@
fi
rm -f conftest*
-@@ -2276,12 +4050,12 @@
+@@ -2276,12 +4055,12 @@
#### Extract some information from the operating system and machine files.
@@ -5012,7 +5001,7 @@
### First figure out CFLAGS (which we use for running the compiler here)
### and REAL_CFLAGS (which we use for real compilation).
-@@ -2370,7 +4144,7 @@
+@@ -2370,7 +4149,7 @@
#ifndef LD_SWITCH_X_SITE_AUX
#define LD_SWITCH_X_SITE_AUX
@@ -5021,7 +5010,7 @@
configure___ ld_switch_system=LD_SWITCH_SYSTEM
configure___ ld_switch_machine=LD_SWITCH_MACHINE
-@@ -2419,343 +4193,1060 @@
+@@ -2419,343 +4198,1060 @@
CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS"
fi
@@ -6214,11 +6203,11 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
++fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
-+fi
+ fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -6325,7 +6314,7 @@
ac_cv_header_stdc=no
fi
rm -f conftest*
-@@ -2764,16 +5255,19 @@
+@@ -2764,16 +5260,19 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -6351,7 +6340,7 @@
ac_cv_header_stdc=no
fi
rm -f conftest*
-@@ -2782,168 +5276,297 @@
+@@ -2782,168 +5281,297 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -6754,7 +6743,7 @@
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
#include <time.h>
-@@ -2957,42 +5580,68 @@
+@@ -2957,42 +5585,68 @@
#ifdef HAVE_UTIME_H
#include <utime.h>
#endif
@@ -6845,7 +6834,7 @@
#endif
#ifdef __cplusplus
extern "C" void (*signal (int, void (*)(int)))(int);
-@@ -3000,70 +5649,123 @@
+@@ -3000,70 +5654,123 @@
void (*signal ()) ();
#endif
@@ -7010,7 +6999,7 @@
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
#include <time.h>
-@@ -3074,468 +5776,710 @@
+@@ -3074,468 +5781,710 @@
#include <time.h>
#endif
#endif
@@ -7359,9 +7348,9 @@
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
+echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
+if test $ac_cv_member_struct_tm_tm_zone = yes; then
@@ -8043,7 +8032,7 @@
else
ac_cv_sys_long_file_names=yes
# Test for long file names in all the places we know might matter:
-@@ -3549,49 +6493,51 @@
+@@ -3549,49 +6498,51 @@
# /var/tmp likewise
# /usr/tmp likewise
if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
@@ -8114,7 +8103,7 @@
# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
if test "x$with_x" = xno; then
# The user explicitly disabled X.
-@@ -3601,207 +6547,209 @@
+@@ -3601,207 +6552,209 @@
# Both variables are already set.
have_x=yes
else
@@ -8201,14 +8190,14 @@
+/usr/X386/include
+/usr/x386/include
+/usr/XFree86/include/X11
-
++
+/usr/include
+/usr/local/include
+/usr/unsupported/include
+/usr/athena/include
+/usr/local/x11r5/include
+/usr/lpp/Xamples/include
-+
+
+/usr/openwin/include
+/usr/openwin/share/include'
+
@@ -8231,7 +8220,7 @@
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-+#include <X11/Intrinsic.h>
++#include <X11/Xlib.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -8305,7 +8294,7 @@
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ for ac_dir in $ac_x_header_dirs; do
-+ if test -r "$ac_dir/X11/Intrinsic.h"; then
++ if test -r "$ac_dir/X11/Xlib.h"; then
+ ac_x_includes=$ac_dir
+ break
+ fi
@@ -8339,18 +8328,18 @@
- rm -rf conftest*
- LIBS="$ac_save_LIBS"
+ ac_save_LIBS=$LIBS
-+ LIBS="-lXt $LIBS"
++ LIBS="-lX11 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-+#include <X11/Intrinsic.h>
++#include <X11/Xlib.h>
+int
+main ()
+{
-+XtMalloc (0)
++XrmInitialize ()
+ ;
+ return 0;
+}
@@ -8431,7 +8420,7 @@
+ # Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-+ if test -r $ac_dir/libXt.$ac_extension; then
++ if test -r $ac_dir/libX11.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
@@ -8467,7 +8456,7 @@
no_x=yes
else
# If each of the values was on the command line, it overrides each guess.
-@@ -3810,7 +6758,12 @@
+@@ -3810,7 +6763,12 @@
# Update the cache value to reflect the command line values.
ac_cv_have_x="have_x=yes \
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
@@ -8481,7 +8470,7 @@
fi
if test "$no_x" = yes; then
-@@ -3883,7 +6836,7 @@
+@@ -3883,7 +6841,7 @@
case ${HAVE_X11} in
yes ) HAVE_MENUS=yes ;;
esac
@@ -8490,7 +8479,7 @@
if test "${opsys}" = "hpux9"; then
case "${x_libraries}" in
*X11R4* )
-@@ -3907,130 +6860,249 @@
+@@ -3907,130 +6865,249 @@
# Assume not, until told otherwise.
GNU_MALLOC=yes
doug_lea_malloc=yes
@@ -8533,9 +8522,9 @@
+#else
+# include <assert.h>
+#endif
-
-+#undef malloc_get_state
+
++#undef malloc_get_state
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
@@ -8819,7 +8808,7 @@
if test $emacs_cv_var___after_morecore_hook = no; then
doug_lea_malloc=no
fi
-@@ -4044,9 +7116,9 @@
+@@ -4044,9 +7121,9 @@
GNU_MALLOC_reason="
(Using Doug Lea's new malloc from the GNU C Library.)"
fi
@@ -8831,7 +8820,7 @@
fi
-@@ -4055,112 +7127,275 @@
+@@ -4055,112 +7132,275 @@
fi
@@ -9006,13 +8995,13 @@
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
- fi
++fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
-+fi
+ fi
+
done
@@ -9059,9 +9048,9 @@
+#else
+# include <assert.h>
+#endif
-+
-+#undef $ac_func
++#undef $ac_func
++
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
@@ -9179,7 +9168,7 @@
/* Thanks to Mike Haertel and Jim Avera for this test.
Here is a matrix of mmap possibilities:
mmap private not fixed
-@@ -4176,27 +7411,19 @@
+@@ -4176,27 +7416,19 @@
VM page cache was not coherent with the file system buffer cache
like early versions of FreeBSD and possibly contemporary NetBSD.)
For shared mappings, we should conversely verify that changes get
@@ -9210,7 +9199,7 @@
/* This mess was copied from the GNU getpagesize.h. */
#if !HAVE_GETPAGESIZE
-@@ -4251,7 +7478,7 @@
+@@ -4251,7 +7483,7 @@
for (i = 0; i < pagesize; ++i)
*(data + i) = rand ();
umask (0);
@@ -9219,7 +9208,7 @@
if (fd < 0)
exit (1);
if (write (fd, data, pagesize) != pagesize)
-@@ -4261,15 +7488,15 @@
+@@ -4261,15 +7493,15 @@
/* Next, try to mmap the file at a fixed address which already has
something else allocated at it. If we can, also make sure that
we see the same garbage. */
@@ -9238,7 +9227,7 @@
exit (1);
for (i = 0; i < pagesize; ++i)
if (*(data + i) != *(data2 + i))
-@@ -4289,31 +7516,42 @@
+@@ -4289,31 +7521,42 @@
if (*(data + i) != *(data3 + i))
exit (1);
close (fd);
@@ -9295,7 +9284,7 @@
if test $use_mmap_for_buffers = yes; then
REL_ALLOC=no
-@@ -4321,185 +7559,291 @@
+@@ -4321,185 +7564,291 @@
LIBS="$libsrc_libs $LIBS"
@@ -9707,7 +9696,7 @@
;;
esac
-@@ -4525,26 +7869,53 @@
+@@ -4525,26 +7874,53 @@
fi
if test "${opsys}" = "gnu-linux"; then
@@ -9776,7 +9765,7 @@
if test "${xlinux_first_failure}" = "yes"; then
OLD_LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE"
OLD_C_SWITCH_X_SITE="$C_SWITCH_X_SITE"
-@@ -4554,24 +7925,51 @@
+@@ -4554,24 +7930,51 @@
C_SWITCH_X_SITE="$C_SWITCH_X_SITE -b i486-linuxaout"
CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
LIBS="$LIBS -b i486-linuxaout"
@@ -9841,7 +9830,7 @@
if test "${xlinux_second_failure}" = "yes"; then
# If we get the same failure with -b, there is no use adding -b.
# So take it out. This plays safe.
-@@ -4579,220 +7977,387 @@
+@@ -4579,220 +7982,387 @@
C_SWITCH_X_SITE="$OLD_C_SWITCH_X_SITE"
CPPFLAGS="$OLD_CPPFLAGS"
LIBS="$OLD_LIBS"
@@ -9985,9 +9974,9 @@
+#else
+# include <assert.h>
+#endif
-
-+#undef $ac_func
+
++#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
@@ -10346,7 +10335,7 @@
USE_X_TOOLKIT=none
fi
else
-@@ -4803,43 +8368,72 @@
+@@ -4803,43 +8373,72 @@
X_TOOLKIT_TYPE=$USE_X_TOOLKIT
if test "${USE_X_TOOLKIT}" != "none"; then
@@ -10440,7 +10429,7 @@
fi
OLDLIBS="$LIBS"
-@@ -4848,51 +8442,77 @@
+@@ -4848,51 +8447,77 @@
else
LIBS="-lXt $LIBS"
fi
@@ -10553,7 +10542,7 @@
fi
test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS"
-@@ -4901,140 +8521,219 @@
+@@ -4901,140 +8526,219 @@
# On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D.
if test "${HAVE_X11}" = "yes"; then
if test "${USE_X_TOOLKIT}" != "none"; then
@@ -10862,7 +10851,7 @@
fi
fi
-@@ -5042,102 +8741,237 @@
+@@ -5042,102 +8746,237 @@
HAVE_XAW3D=no
if test "${HAVE_X11}" = "yes"; then
if test "${USE_X_TOOLKIT}" != "none"; then
@@ -11162,7 +11151,7 @@
USE_TOOLKIT_SCROLL_BARS=yes
fi
-@@ -5146,9 +8980,9 @@
+@@ -5146,9 +8985,9 @@
if test "${with_xim}" != "no"; then
@@ -11174,7 +11163,7 @@
fi
-@@ -5156,565 +8990,1302 @@
+@@ -5156,565 +8995,1302 @@
HAVE_XPM=no
if test "${HAVE_X11}" = "yes"; then
if test "${with_xpm}" != "no"; then
@@ -12840,7 +12829,7 @@
#ifdef __GNUC__
# define alloca __builtin_alloca
#else
-@@ -5736,137 +10307,215 @@
+@@ -5736,137 +10312,215 @@
# endif
#endif
@@ -13133,7 +13122,7 @@
find_stack_direction ()
{
static char *addr = 0;
-@@ -5879,318 +10528,926 @@
+@@ -5879,318 +10533,926 @@
else
return (&dummy > addr) ? 1 : -1;
}
@@ -13723,11 +13712,11 @@
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_mail_maillock=no
-+fi
+ fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
- fi
++fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_mail_maillock" >&5
+echo "${ECHO_T}$ac_cv_lib_mail_maillock" >&6
+if test $ac_cv_lib_mail_maillock = yes; then
@@ -14149,13 +14138,13 @@
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
-+fi
+ fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
- fi
++fi
+
done
@@ -14282,7 +14271,7 @@
for ac_func in gethostname getdomainname dup2 \
rename closedir mkdir rmdir sysinfo \
-@@ -6200,168 +11457,372 @@
+@@ -6200,168 +11462,372 @@
__fpending mblen mbrlen strsignal setitimer ualarm index rindex \
gai_strerror mkstemp
do
@@ -14544,7 +14533,7 @@
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
- fi
++fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
@@ -14591,7 +14580,7 @@
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
-+fi
+ fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -14644,9 +14633,9 @@
+#else
+# include <assert.h>
+#endif
-+
-+#undef $ac_func
++#undef $ac_func
++
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
@@ -14763,7 +14752,7 @@
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
-@@ -6373,6 +11834,10 @@
+@@ -6373,6 +11839,10 @@
# endif
#endif
@@ -14774,7 +14763,7 @@
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
-@@ -6385,10 +11850,11 @@
+@@ -6385,10 +11855,11 @@
#undef putenv
static time_t time_t_max;
@@ -14788,7 +14777,7 @@
"TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"
};
#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
-@@ -6398,7 +11864,7 @@
+@@ -6398,7 +11869,7 @@
static void
spring_forward_gap ()
{
@@ -14797,7 +14786,7 @@
struct tm tm;
/* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
-@@ -6419,15 +11885,21 @@
+@@ -6419,15 +11890,21 @@
}
static void
@@ -14823,7 +14812,7 @@
}
static void
-@@ -6487,6 +11959,9 @@
+@@ -6487,6 +11964,9 @@
for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
continue;
time_t_max--;
@@ -14833,7 +14822,7 @@
delta = time_t_max / 997; /* a suitable prime number */
for (i = 0; i < N_STRINGS; i++)
{
-@@ -6495,219 +11970,555 @@
+@@ -6495,219 +11975,555 @@
for (t = 0; t <= time_t_max - delta; t += delta)
mktime_test (t);
@@ -15029,9 +15018,9 @@
+ exit 1
+fi
+) && ac_have_func=yes
-
-+# On HPUX9, an unprivileged user can get load averages through this function.
+
++# On HPUX9, an unprivileged user can get load averages through this function.
+
+for ac_func in pstat_getdynamic
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -15528,7 +15517,7 @@
fi
fi
-@@ -6715,660 +12526,1830 @@
+@@ -6715,660 +12531,1830 @@
if test $ac_have_func = no; then
# There is a commonly available library for RS/6000 AIX.
# Since it is not a standard part of AIX, it might be installed locally.
@@ -16206,14 +16195,14 @@
else
- echo "$ac_t""no" 1>&6
+ ac_cv_header_locale_h=$ac_header_preproc
- fi
++fi
+echo "$as_me:$LINENO: result: $ac_cv_header_locale_h" >&5
+echo "${ECHO_T}$ac_cv_header_locale_h" >&6
+
-+fi
-+
+ fi
+
++
+for ac_func in setlocale
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -16301,10 +16290,10 @@
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
-+fi
+ fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- fi
++fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
@@ -17167,9 +17156,9 @@
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+echo "$as_me:$LINENO: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5
+echo "${ECHO_T}$ac_cv_member_struct_nlist_n_un_n_name" >&6
+if test $ac_cv_member_struct_nlist_n_un_n_name = yes; then
@@ -17800,7 +17789,7 @@
fi
done
-@@ -7377,51 +14358,77 @@
+@@ -7377,51 +14363,77 @@
# That is because we have not set up to link ncurses in lib-src.
# It's better to believe a function is not available
# than to expect to find it in ncurses.
@@ -17913,7 +17902,7 @@
fi
-@@ -7429,174 +14436,321 @@
+@@ -7429,174 +14441,321 @@
if test "$with_hesiod" = yes ; then
# Don't set $LIBS here -- see comments above.
resolv=no
@@ -18352,7 +18341,7 @@
fi
fi
-@@ -7607,101 +14761,175 @@
+@@ -7607,101 +14766,175 @@
if test "$resolv" = yes ; then
RESOLVLIB=-lresolv
@@ -18404,9 +18393,9 @@
+#else
+# include <assert.h>
+#endif
-+
-+#undef hes_getmailhost
++#undef hes_getmailhost
++
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
@@ -18591,7 +18580,7 @@
fi
fi
-@@ -7710,379 +14938,589 @@
+@@ -7710,379 +14943,589 @@
# These tell us which Kerberos-related libraries to use.
if test "${with_kerberos+set}" = set; then
@@ -19459,7 +19448,7 @@
fi
fi
-@@ -8090,393 +15528,702 @@
+@@ -8090,393 +15533,702 @@
fi
if test "${with_kerberos5+set}" = set; then
@@ -20323,11 +20312,11 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
- fi
++fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
-+fi
+ fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -20476,7 +20465,7 @@
#include <time.h>
extern char **environ;
unset_TZ ()
-@@ -8506,97 +16253,157 @@
+@@ -8506,97 +16258,157 @@
exit (1);
exit (0);
}
@@ -20575,9 +20564,9 @@
+#else
+# include <assert.h>
+#endif
-+
-+#undef $ac_func
++#undef $ac_func
++
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
@@ -20688,7 +20677,7 @@
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -8608,54 +16415,106 @@
+@@ -8608,54 +16420,106 @@
#include <time.h>
#endif
#endif
@@ -20824,7 +20813,7 @@
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -8672,327 +16531,875 @@
+@@ -8672,327 +16536,875 @@
struct timezone dummy;
exit (gettimeofday (&time, &dummy));
}
@@ -20919,9 +20908,9 @@
+#else
+# include <assert.h>
+#endif
-
-+#undef socket
+
++#undef socket
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
@@ -21700,9 +21689,9 @@
+#else
+# include <assert.h>
+#endif
-+
-+#undef $ac_func
++#undef $ac_func
More information about the pkg-emacs-commits
mailing list