diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rwxr-xr-x | config.guess | 17 | ||||
| -rwxr-xr-x | config.sub | 6 | ||||
| -rwxr-xr-x | configure | 22 | ||||
| -rw-r--r-- | lib/Makefile.in | 4 | ||||
| -rw-r--r-- | m4/gl-comp.m4 (renamed from m4/gnulib-comp.m4) | 0 | ||||
| -rw-r--r-- | m4/gnulib-cache.m4 | 37 | ||||
| -rw-r--r-- | src/config.in | 5 |
10 files changed, 57 insertions, 59 deletions
@@ -1,3 +1,18 @@ +2011-01-27 Paul Eggert <[email protected]> + + fix two m4/gnulib-*.m4 file names that clashed under MS-DOS + * Makefile.in (DOS-gnulib-comp.m4): New macro. + (sync-from-gnulib): Rename m4/gnulib-comp.m4 to m4/gl-comp.m4 to avoid + problems with MS-DOS 8+3 file name restrictions. + Remove m4/gnulib-cache.m4, as we can live without it. If we kept + it, it would also cause problems when extracting Emacs distribution + tarballs on MS-DOS hosts. + (ACLOCAL_INPUTS): Adjust to file renaming. + * aclocal.m4, configure, lib/Makefile.in, src/config.in: Regenerate. + * config.guess, config.sub: Sync from gnulib. + * m4/gnulib-cache.m4: Remove from repository. + * m4/gl-comp.m4: Rename from m4/gnulib-comp.m4. + 2011-01-25 Glenn Morris <[email protected]> * README: Add a note about ranges in copyright years. diff --git a/Makefile.in b/Makefile.in index e45cb927c5..92d6736182 100644 --- a/Makefile.in +++ b/Makefile.in @@ -324,6 +324,9 @@ gnulib_srcdir = ../gnulib $(gnulib_srcdir): git clone git://git.savannah.gnu.org/gnulib.git $@ +# A shorter name that satisfies MS-DOS 8+3 constraints. +DOS-gnulib-comp.m4 = gl-comp.m4 + # Update modules from gnulib, for maintainers, who should have it in # $(gnulib_srcdir) (relative to $(srcdir) and should have build tools # as per $(gnulib_srcdir)/DEPENDENCIES. @@ -333,7 +336,8 @@ GNULIB_TOOL_FLAGS = \ sync-from-gnulib: $(gnulib_srcdir) cd $(srcdir) && \ $(gnulib_srcdir)/gnulib-tool $(GNULIB_TOOL_FLAGS) $(GNULIB_MODULES) - rm $(srcdir)/m4/warn-on-use.m4 + cd $(srcdir)/m4 && rm gnulib-cache.m4 warn-on-use.m4 + cd $(srcdir)/m4 && mv gnulib-comp.m4 $(DOS-gnulib-comp.m4) cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc cp \ $(gnulib_srcdir)/build-aux/config.sub \ @@ -406,7 +410,7 @@ AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/configure: $(AUTOCONF_INPUTS) cd ${srcdir} && autoconf -ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4 +ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/$(DOS-gnulib-comp.m4) $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) cd $(srcdir) && aclocal -I m4 diff --git a/aclocal.m4 b/aclocal.m4 index a152fd3453..8fca11b541 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -988,8 +988,8 @@ m4_include([m4/00gnulib.m4]) m4_include([m4/c-strtod.m4]) m4_include([m4/extensions.m4]) m4_include([m4/getopt.m4]) +m4_include([m4/gl-comp.m4]) m4_include([m4/gnulib-common.m4]) -m4_include([m4/gnulib-comp.m4]) m4_include([m4/include_next.m4]) m4_include([m4/mktime.m4]) m4_include([m4/multiarch.m4]) diff --git a/config.guess b/config.guess index 4c8f032e78..78553c4ea0 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2010-09-24' +timestamp='2011-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -92,7 +92,7 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' HUP INT TERM +trap 'exit 1' 1 2 15 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -106,7 +106,7 @@ trap 'exit 1' HUP INT TERM set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || @@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead diff --git a/config.sub b/config.sub index 3ec94f181e..2d8169626d 100755 --- a/config.sub +++ b/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2010-12-11' +timestamp='2011-01-01' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -4007,6 +4007,17 @@ case "${canonical}" in CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS" ;; + ia64*-hp-hpux1[1-9]* ) + machine=hp800 opsys=hpux11 + ## FIXME. Peter O'Gorman reports that dumping using unexelf.o doesn't + ## work either: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6811 + CANNOT_DUMP=yes + ;; + + hppa*-*-linux-gnu* ) + machine=hp800 opsys=gnu-linux + ;; + ## IBM machines rs6000-ibm-aix4.[23]* ) machine=ibmrs6000 opsys=aix4-2 @@ -6552,15 +6563,16 @@ rm -f core conftest.err conftest.$ac_objext \ CPP=`eval "echo $CPP"` -CANNOT_DUMP=no +test "x$CANNOT_DUMP" = "x" && CANNOT_DUMP=no case "$opsys" in - your-opsys-here) - CANNOT_DUMP=yes + your-opsys-here) CANNOT_DUMP=yes ;; +esac + +test "$CANNOT_DUMP" = "yes" && \ $as_echo "#define CANNOT_DUMP 1" >>confdefs.h - ;; -esac + diff --git a/lib/Makefile.in b/lib/Makefile.in index 36304c3e11..2ac0278f7e 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -51,8 +51,8 @@ subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/c-strtod.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gl-comp.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/mktime.m4 \ $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/stddef_h.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ diff --git a/m4/gnulib-comp.m4 b/m4/gl-comp.m4 index 32d3cce430..32d3cce430 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gl-comp.m4 diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 deleted file mode 100644 index 4a2928d966..0000000000 --- a/m4/gnulib-cache.m4 +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2002-2011 Free Software Foundation, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# Generated by gnulib-tool. -# -# This file represents the specification of how gnulib-tool is used. -# It acts as a cache: It is written and read by gnulib-tool. -# In projects that use version control, this file is meant to be put under -# version control, like the configure.ac and various Makefile.am files. - - -# Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files dtoastr getopt-gnu mktime - -# Specification in the form of a few gnulib-tool.m4 macro invocations: -gl_LOCAL_DIR([]) -gl_MODULES([ - dtoastr - getopt-gnu - mktime -]) -gl_AVOID([]) -gl_SOURCE_BASE([lib]) -gl_M4_BASE([m4]) -gl_PO_BASE([]) -gl_DOC_BASE([doc]) -gl_TESTS_BASE([tests]) -gl_LIB([libgnu]) -gl_MAKEFILE_NAME([gnulib.mk]) -gl_MACRO_PREFIX([gl]) -gl_PO_DOMAIN([]) -gl_VC_FILES([false]) diff --git a/src/config.in b/src/config.in index f414f81fb4..c08f10be17 100644 --- a/src/config.in +++ b/src/config.in @@ -1,8 +1,9 @@ /* src/config.in. Generated from configure.in by autoheader. */ /* GNU Emacs site configuration template file. - Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + +Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2011 + Free Software Foundation, Inc. This file is part of GNU Emacs. |