* config/config.guess, config/config.sub, doc/standards.texi:

* config/lispdir.m4: Update from masters.
* configure.ac: Bump to 2.52f.

diff --git a/ChangeLog b/ChangeLog
index 9f901013220d7a22ba3805014b535df98aa3a678..8782213612a723067bfb30fb60ecbcecad8fd2f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-02  Akim Demaille  <akim@epita.fr>
+
+       * config/config.guess, config/config.sub, doc/standards.texi:
+       * config/lispdir.m4: Update from masters.
+       * configure.ac: Bump to 2.52f.
+
 2001-11-02  Akim Demaille  <akim@epita.fr>
 
        * bin/autoreconf.in (&autoreconf): Set `$aclocal_flags' to ''.

diff --git a/NEWS b/NEWS
index bef401cece65ee66123c635104cde980988b8a05..e56662c5d26e0e7c4d20389dc895d128336e18f5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-* Major changes in Autoconf 2.52e                       -*- outline -*-
+* Major changes in Autoconf 2.52f                       -*- outline -*-
 
 ** Requirements
 
@@ -7,6 +7,7 @@
   rewritten in Perl.
 
 ** Documentation
+
 - AC_INIT
   Argument requirements, output variables, defined macros.
 - M4sugar, M4sh, Autotest
@@ -17,6 +18,7 @@
   The Autoconf manual is now distributed under the terms of the GNU FDL.
 
 ** configure
+
 - $LINENO
   Now used instead of hard coded line numbers.
   This eases the comparison of `configure's, and diminishes the
@@ -27,9 +29,11 @@
   @top_buildpath@.
 
 ** Emacs
+
   Autoconf and Autotest modes are provided.
 
 ** Executables
+
 - autom4te
   New, used by the Autoconf suite to cache and speed up most processing.
 - --force, -f
@@ -46,11 +50,13 @@
   --m4dir is no longer supported.
 
 ** Bug fixes
+
 - The top level $prefix is propagated to the AC_CONFIG_SUBDIRS configures.
 - AC_TRY_RUN
   Under the user pressure, $? is finally available.  Probably a mistake.
 
 ** C Macros
+
 - AC_C_BIGENDIAN supports the cross-compiling case.
 - AC_C_BIGENDIAN accepts ACTION-IF-TRUE, ACTION-IF-FALSE, and
   ACTION-IF-UNKNOWN arguments.  All are facultative, and the default
@@ -58,12 +64,14 @@
   always did.
 
 ** Generic macros
+
 - AC_CONFIG_COMMANDS, HEADERS, FILES, LINKS.
   Provide the user with srcdir, ac_srcdir, ac_top_srcdir, ac_builddir,
   ac_top_builddir, ac_srcpath, ac_top_srcpath, ac_buildpath,
   ac_top_buildpath.
 
 ** Library macros
+
 - AC_FUNC_STRERROR_R now sets STRERROR_R_CHAR_P, not HAVE_WORKING_STRERROR_R,
   because POSIX 1003.1-200x draft 7 says strerror_r returns int, not char *.
 

diff --git a/config/config.guess b/config/config.guess
index 1e2f91fb09d0187665e2d63e2e0d2d86a6138ff1..297e5c30f41b65e95341322c77994c4d1d447134 100755 (executable)
--- a/config/config.guess
+++ b/config/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-08-23'
+timestamp='2001-10-05'
 
 # 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
@@ -24,8 +24,9 @@ timestamp='2001-08-23'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Originally written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -127,7 +128,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-       # Netbsd (nbsd) targets should (where applicable) match one or
+       # NetBSD (nbsd) targets should (where applicable) match one or
        # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
        # switched to ELF, *-*-netbsd* would select the old
@@ -144,6 +145,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
            macppc) machine=powerpc-apple ;;
            hp3[0-9][05]) machine=m68k-hp ;;
            ibmrt|romp-ibm) machine=romp-ibm ;;
+           sparc*) machine=`uname -p`-unknown ;;
            *) machine=${UNAME_MACHINE}-unknown ;;
        esac
        # The Operating System including object format, if it has switched
@@ -172,6 +174,45 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
        echo "${machine}-${os}${release}"
        exit 0 ;;
+    amiga:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    arc:OpenBSD:*:*)
+       echo mipsel-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    hp300:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mac68k:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    macppc:OpenBSD:*:*)
+       echo powerpc-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+       echo m88k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+       echo powerpc-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    pmax:OpenBSD:*:*)
+       echo mipsel-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    sgi:OpenBSD:*:*)
+       echo mipseb-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    sun3:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+       echo mipsel-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    *:OpenBSD:*:*)
+       echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
     alpha:OSF1:*:*)
        if test $UNAME_RELEASE = "V4.0"; then
                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -247,30 +288,9 @@ EOF
     Amiga*:UNIX_System_V:4.0:*)
        echo m68k-unknown-sysv4
        exit 0;;
-    amiga:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-amigaos
        exit 0 ;;
-    arc64:OpenBSD:*:*)
-       echo mips64el-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    arc:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    hkmips:OpenBSD:*:*)
-       echo mips-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    pmax:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    sgi:OpenBSD:*:*)
-       echo mips-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
     *:OS/390:*:*)
        echo i370-ibm-openedition
        exit 0 ;;
@@ -333,12 +353,6 @@ EOF
     aushp:SunOS:*:*)
        echo sparc-auspex-sunos${UNAME_RELEASE}
        exit 0 ;;
-    sparc*:NetBSD:*)
-       echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
-       exit 0 ;;
-    atari*:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -365,18 +379,6 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mac68k:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-       echo m88k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
     powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}
        exit 0 ;;
@@ -393,6 +395,7 @@ EOF
        echo clipper-intergraph-clix${UNAME_RELEASE}
        exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+       eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -414,7 +417,6 @@ EOF
          exit (-1);
        }
 EOF
-       eval $set_cc_for_build
        $CC_FOR_BUILD $dummy.c -o $dummy \
          && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
          && rm -f $dummy.c $dummy && exit 0
@@ -484,6 +486,7 @@ EOF
        exit 0 ;;
     *:AIX:2:3)
        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+               eval $set_cc_for_build
                sed 's/^                //' << EOF >$dummy.c
                #include <sys/systemcfg.h>
 
@@ -495,7 +498,6 @@ EOF
                        exit(0);
                        }
 EOF
-               eval $set_cc_for_build
                $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
                rm -f $dummy.c $dummy
                echo rs6000-ibm-aix3.2.5
@@ -546,10 +548,8 @@ EOF
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;
            9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+               if [ -x /usr/bin/getconf ]; then
+                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                     case "${sc_cpu_version}" in
                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -558,12 +558,13 @@ EOF
                         case "${sc_kernel_bits}" in
                           32) HP_ARCH="hppa2.0n" ;;
                           64) HP_ARCH="hppa2.0w" ;;
+                         '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                         esac ;;
                     esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              sed 's/^              //' << EOF >$dummy.c
+               fi
+               if [ "${HP_ARCH}" = "" ]; then
+                   eval $set_cc_for_build
+                   sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -596,11 +597,10 @@ EOF
                   exit (0);
               }
 EOF
-       eval $set_cc_for_build
-       (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-       if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-       rm -f $dummy.c $dummy
-       fi ;;
+                   (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+                   if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+                   rm -f $dummy.c $dummy
+               fi ;;
        esac
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
        exit 0 ;;
@@ -609,6 +609,7 @@ EOF
        echo ia64-hp-hpux${HPUX_REV}
        exit 0 ;;
     3050*:HI-UX:*:*)
+       eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
        #include <unistd.h>
        int
@@ -634,7 +635,6 @@ EOF
          exit (0);
        }
 EOF
-       eval $set_cc_for_build
        $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
        rm -f $dummy.c $dummy
        echo unknown-hitachi-hiuxwe2
@@ -664,9 +664,6 @@ EOF
     parisc*:Lites*:*:*)
        echo hppa1.1-hp-lites
        exit 0 ;;
-    hppa*:OpenBSD:*:*)
-       echo hppa-unknown-openbsd
-       exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
        echo c1-convex-bsd
         exit 0 ;;
@@ -718,9 +715,6 @@ EOF
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    hp300:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
        exit 0 ;;
@@ -733,9 +727,6 @@ EOF
     *:FreeBSD:*:*)
        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
        exit 0 ;;
-    *:OpenBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-       exit 0 ;;
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
        exit 0 ;;
@@ -851,6 +842,7 @@ EOF
                exit 0 ;;
        esac
        # Determine whether the default compiler is a.out or elf
+       eval $set_cc_for_build
        cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
@@ -875,7 +867,6 @@ EOF
   return 0;
 }
 EOF
-       eval $set_cc_for_build
        $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
        rm -f $dummy.c $dummy
        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
@@ -956,7 +947,7 @@ EOF
        exit 0 ;;
     M68*:*:R3V[567]*:*)
        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
        OS_REL=''
        test -r /etc/.relid \
        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1122,6 +1113,7 @@ esac
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
+eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1236,7 +1228,6 @@ main ()
 }
 EOF
 
-eval $set_cc_for_build
 $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy
 

diff --git a/config/config.sub b/config/config.sub
index ff13f7aa213a51c0386c0ce0e8324658ed706e88..791bcded7c3bf807b4ecb7521fcd2ef9ad175b2c 100755 (executable)
--- a/config/config.sub
+++ b/config/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-08-23'
+timestamp='2001-10-05'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-08-23'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -236,7 +237,8 @@ case $basic_machine in
        | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
        | mips64vr4100 | mips64vr4100el | mips64vr4300 \
        | mips64vr4300el | mips64vr5000 | mips64vr5000el \
-       | mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \
+       | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+       | mipsisa32 \
        | mn10200 | mn10300 \
        | ns16k | ns32k \
        | openrisc \
@@ -279,6 +281,7 @@ case $basic_machine in
        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
        | alphapca5[67]-* | arc-* \
        | arm-*  | armbe-* | armle-* | armv*-* \
+       | avr-* \
        | bs2000-* \
        | c[123]* | c30-* | [cjt]90-* | c54x-* \
        | clipper-* | cray2-* | cydra-* \
@@ -293,8 +296,8 @@ case $basic_machine in
        | m88110-* | m88k-* | mcore-* \
        | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
        | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-       | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \
-       | mipsle-* | mipstx39-* | mipstx39el-* \
+       | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+       | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -723,7 +726,7 @@ case $basic_machine in
         pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
-       pentium | p5 | k5 | k6 | nexgen)
+       pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;
        pentiumpro | p6 | 6x86 | athlon)
@@ -732,7 +735,7 @@ case $basic_machine in
        pentiumii | pentium2)
                basic_machine=i686-pc
                ;;
-       pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+       pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -794,7 +797,7 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
-       sparclite-wrs)
+       sparclite-wrs | simso-wrs)
                basic_machine=sparclite-wrs
                os=-vxworks
                ;;

diff --git a/config/lispdir.m4 b/config/lispdir.m4
index 9022b802a77cd1296b1fbe0c8881ebf4f367fa03..2c534d9983d5f2a4df236d7ada752abba16b1151 100644 (file)
--- a/config/lispdir.m4
+++ b/config/lispdir.m4
@@ -1,4 +1,4 @@
-## ------------------------
+## ------------------------                           -*- Autoconf -*-
 ## Emacs LISP file handling
 ## From Ulrich Drepper
 ## Almost entirely rewritten by Alexandre Oliva
@@ -21,29 +21,38 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 3
+# serial 4
 
+# AM_PATH_LISPDIR
+# ---------------
 AC_DEFUN([AM_PATH_LISPDIR],
- [AC_ARG_WITH(lispdir, 
-  [   --with-lispdir            Override the default lisp directory ],
-  [ lispdir="$withval" 
-    AC_MSG_CHECKING([where .elc files should go])
-    AC_MSG_RESULT([$lispdir])],
-  [
-  # If set to t, that means we are running in a shell under Emacs.
-  # If you have an Emacs named "t", then use the full path.
-  test x"$EMACS" = xt && EMACS=
-  AC_CHECK_PROGS(EMACS, emacs xemacs, no)
-  if test $EMACS != "no"; then
-    if test x${lispdir+set} != xset; then
-      AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir], [dnl
-       am_cv_lispdir=`$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' | sed -n -e 's,/$,,' -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}'`
-       if test -z "$am_cv_lispdir"; then
-         am_cv_lispdir='${datadir}/emacs/site-lisp'
-       fi
-      ])
-      lispdir="$am_cv_lispdir"
-    fi
-  fi
- ])
- AC_SUBST(lispdir)])
+[AC_ARG_WITH(lispdir,
+ [   --with-lispdir            Override the default lisp directory ],
+ [ lispdir="$withval"
+   AC_MSG_CHECKING([where .elc files should go])
+   AC_MSG_RESULT([$lispdir])],
+ [
+ # If set to t, that means we are running in a shell under Emacs.
+ # If you have an Emacs named "t", then use the full path.
+ test x"$EMACS" = xt && EMACS=
+ AC_CHECK_PROGS(EMACS, emacs xemacs, no)
+ if test $EMACS != "no"; then
+   if test x${lispdir+set} != xset; then
+     AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir],
+       [AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' >conftest.out])
+        am_cv_lispdir=`sed -n \
+       -e 's,/$,,' \
+       -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' \
+       -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}' \
+       conftest.out`
+       rm conftest.out
+       if test -z "$am_cv_lispdir"; then
+         am_cv_lispdir='${datadir}/emacs/site-lisp'
+       fi
+     ])
+     lispdir="$am_cv_lispdir"
+   fi
+ fi
+])
+AC_SUBST(lispdir)
+])# AM_PATH_LISPDIR

diff --git a/configure b/configure
index c4f9b8b1549bdcb9e60743108173ffbafa2edc64..96b59e1e18375bd27a3330162f40a4b53c20f147 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.52e for GNU Autoconf 2.52e.
+# Generated by GNU Autoconf 2.52e for GNU Autoconf 2.52f.
 #
 # Report bugs to <bug-autoconf@gnu.org>.
 #
@@ -290,8 +290,8 @@ mandir='${prefix}/man'
 # Identity of this package.
 PACKAGE_NAME='GNU Autoconf'
 PACKAGE_TARNAME='autoconf'
-PACKAGE_VERSION='2.52e'
-PACKAGE_STRING='GNU Autoconf 2.52e'
+PACKAGE_VERSION='2.52f'
+PACKAGE_STRING='GNU Autoconf 2.52f'
 PACKAGE_BUGREPORT='bug-autoconf@gnu.org'
 
 ac_prev=
@@ -697,7 +697,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Autoconf 2.52e to adapt to many kinds of systems.
+\`configure' configures GNU Autoconf 2.52f to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -759,7 +759,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Autoconf 2.52e:";;
+     short | recursive ) echo "Configuration of GNU Autoconf 2.52f:";;
    esac
   cat <<\_ACEOF
 
@@ -837,7 +837,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Autoconf configure 2.52e
+GNU Autoconf configure 2.52f
 generated by GNU Autoconf 2.52e
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -852,7 +852,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Autoconf $as_me 2.52e, which was
+It was created by GNU Autoconf $as_me 2.52f, which was
 generated by GNU Autoconf 2.52e.  Invocation command line was
 
   $ $0 $@
@@ -1355,7 +1355,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=autoconf
-VERSION=2.52e
+VERSION=2.52f
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE "$PACKAGE"
@@ -1584,16 +1584,16 @@ ac_config_files="$ac_config_files lib/emacs/Makefile"
 if test "${with_lispdir+set}" = set; then
   withval="$with_lispdir"
    lispdir="$withval"
-    echo "$as_me:$LINENO: checking where .elc files should go" >&5
+   echo "$as_me:$LINENO: checking where .elc files should go" >&5
 echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: $lispdir" >&5
+   echo "$as_me:$LINENO: result: $lispdir" >&5
 echo "${ECHO_T}$lispdir" >&6
 else
 
-  # If set to t, that means we are running in a shell under Emacs.
-  # If you have an Emacs named "t", then use the full path.
-  test x"$EMACS" = xt && EMACS=
-  for ac_prog in emacs xemacs
+ # If set to t, that means we are running in a shell under Emacs.
+ # If you have an Emacs named "t", then use the full path.
+ test x"$EMACS" = xt && EMACS=
+ for ac_prog in emacs xemacs
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -1634,24 +1634,34 @@ fi
 done
 test -n "$EMACS" || EMACS="no"
 
-  if test $EMACS != "no"; then
-    if test x${lispdir+set} != xset; then
-      echo "$as_me:$LINENO: checking where .elc files should go" >&5
+ if test $EMACS != "no"; then
+   if test x${lispdir+set} != xset; then
+     echo "$as_me:$LINENO: checking where .elc files should go" >&5
 echo $ECHO_N "checking where .elc files should go... $ECHO_C" >&6
 if test "${am_cv_lispdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-       am_cv_lispdir=`$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' | sed -n -e 's,/$,,' -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}'`
-       if test -z "$am_cv_lispdir"; then
-         am_cv_lispdir='${datadir}/emacs/site-lisp'
-       fi
+  { (echo "$as_me:$LINENO: \$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) \"\\n\")) (setq load-path (cdr load-path)))' >conftest.out") >&5
+  ($EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' >conftest.out) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+        am_cv_lispdir=`sed -n \
+       -e 's,/$,,' \
+       -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' \
+       -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}' \
+       conftest.out`
+       rm conftest.out
+       if test -z "$am_cv_lispdir"; then
+         am_cv_lispdir='${datadir}/emacs/site-lisp'
+       fi
 
 fi
 echo "$as_me:$LINENO: result: $am_cv_lispdir" >&5
 echo "${ECHO_T}$am_cv_lispdir" >&6
-      lispdir="$am_cv_lispdir"
-    fi
-  fi
+     lispdir="$am_cv_lispdir"
+   fi
+ fi
 
 fi;
 
@@ -2010,7 +2020,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GNU Autoconf $as_me 2.52e, which was
+This file was extended by GNU Autoconf $as_me 2.52f, which was
 generated by GNU Autoconf 2.52e.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2067,7 +2077,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU Autoconf config.status 2.52e
+GNU Autoconf config.status 2.52f
 configured by $0, generated by GNU Autoconf 2.52e,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.ac b/configure.ac
index cc3079bc92bb9a1d54dd4a2a1fbae923a6de4dfe..c2ec590f7c9961789a0fe2b61935bf9e34bbe23e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 #                                                       -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-# Copyright 1992, 1993, 1994, 1995, 1999, 2000, 2001 Free Software
-# Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,13 +22,13 @@
 # We need AC_CONFIG_TESTDIR.
 AC_PREREQ(2.52e)
 
-AC_INIT(GNU Autoconf, 2.52e, bug-autoconf@gnu.org)
+AC_INIT(GNU Autoconf, 2.52f, bug-autoconf@gnu.org)
 AC_CONFIG_SRCDIR(ChangeLog)
 
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_FILES(config/Makefile)
 
-AM_INIT_AUTOMAKE(autoconf, 2.52e)
+AM_INIT_AUTOMAKE(autoconf, 2.52f)
 
 # Initialize the test suite and build position independent wrappers.
 AC_CONFIG_TESTDIR(tests)

diff --git a/doc/standards.texi b/doc/standards.texi
index 19417afbe8ce83796f87dcc5a0c1880483aa8605..e11d668d3d2d60b1b4bfe5094f4b177f819e28a8 100644 (file)
--- a/doc/standards.texi
+++ b/doc/standards.texi
@@ -3,7 +3,7 @@
 @setfilename standards.info
 @settitle GNU Coding Standards
 @c This date is automagically updated when you save this file:
-@set lastupdate August 17, 2001
+@set lastupdate October 19, 2001
 @c %**end of header
 
 @ifinfo
@@ -117,6 +117,18 @@ suggested new wording for it; our time is limited.  We prefer a context
 diff to the @file{standards.texi} or @file{make-stds.texi} files, but if
 you don't have those files, please mail your suggestion anyway.
 
+These standards cover the minimum of what is important when writing a
+GNU package.  Likely, the needs for additional standards will come up.
+Sometimes, you might suggest that such standards be added to this
+document.  If you think your standards would be generally useful, please
+do suggest them.
+
+You should also set standards for your package on many questions not
+addressed or not firmly specified here.  The most important point is to
+be self-consistent---try to stick to the conventions you pick, and try
+to document them as much as possible.  That way, your program will be
+more maintainable by others.
+
 @node Legal Issues
 @chapter Keeping Free Software Free
 @cindex legal aspects
@@ -892,6 +904,24 @@ versions' changes.  You don't have to mention the name of the program in
 these notices, if that is inconvenient, since it appeared in the first
 line.
 
+Translations of the above lines must preserve the validity of the
+copyright notices (@pxref{Internationalization}).  If the translation's
+character set supports it, the @samp{(C)} should be replaced with the
+copyright symbol, as follows:
+
+@ifinfo 
+(the official copyright symbol, which is the letter C in a circle); 
+@end ifinfo 
+@ifnotinfo 
+@copyright{}
+@end ifnotinfo 
+
+Write the word ``Copyright'' exactly like that, in English.  Do not
+translate it into another language.  International treaties recognize
+the English word ``Copyright''; translations into other languages do not
+have legal significance.
+
+
 @cindex @samp{--help} option
 @item --help
 This option should output brief documentation for how to invoke the
@@ -3688,10 +3718,10 @@ free.
 @contents
 
 @bye
-Local variables:
-update-date-leading-regexp: "@c This date is automagically updated when you save this file:\n@set lastupdate "
-update-date-trailing-regexp: ""
-eval: (load "/gd/gnuorg/update-date.el")
-eval: (add-hook 'write-file-hooks 'update-date)
-compile-command: "make just-standards"
-End:
+@c Local variables:
+@c eval: (add-hook 'write-file-hooks 'time-stamp)
+@c time-stamp-start: "@set lastupdate "
+@c time-stamp-end: "$"
+@c time-stamp-format: "%:b %:d, %:y"
+@c compile-command: "make just-standards"
+@c End:

diff --git a/man/autoconf.1 b/man/autoconf.1
index a9d1e896f1ac9144718a8f4b7b338e85546a6aa3..bffafcf631eef751aa71352451604a63882e4de9 100644 (file)
--- a/man/autoconf.1
+++ b/man/autoconf.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOCONF "1" "October 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTOCONF "1" "November 2001" "GNU Autoconf 2.52f" FSF
 .SH NAME
 autoconf \- Generate configuration scripts
 .SH SYNOPSIS

diff --git a/man/autoheader.1 b/man/autoheader.1
index 1131c93ed66b275bb2230860f8a672c9799932ae..1e7dee9b212b6479fb7f83e71896c44a040c5a59 100644 (file)
--- a/man/autoheader.1
+++ b/man/autoheader.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOHEADER "1" "October 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTOHEADER "1" "November 2001" "GNU Autoconf 2.52f" FSF
 .SH NAME
 autoheader \- Create a template header for configure
 .SH SYNOPSIS

diff --git a/man/autom4te.1 b/man/autom4te.1
index 8337480817bab939dcb45deb68f5bd01ccf0702d..895d382c04707ae778a8255b7418f8dda77ed76a 100644 (file)
--- a/man/autom4te.1
+++ b/man/autom4te.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOM4TE "1" "October 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTOM4TE "1" "November 2001" "GNU Autoconf 2.52f" FSF
 .SH NAME
 autom4te \- Generate files and scripts thanks to M4
 .SH SYNOPSIS

diff --git a/man/autoreconf.1 b/man/autoreconf.1
index d9c77a285951f2418de4ff1c77f10fc684139736..fd5d7ed7d2d97df70486484a417b6510d0cff27b 100644 (file)
--- a/man/autoreconf.1
+++ b/man/autoreconf.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTORECONF "1" "November 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTORECONF "1" "November 2001" "GNU Autoconf 2.52f" FSF
 .SH NAME
 autoreconf \- Update generated configuration files
 .SH SYNOPSIS

diff --git a/man/autoscan.1 b/man/autoscan.1
index 59fea8e0c2990e7584bb24091fc7fa65695ee45e..cefb6a68b0df2fed875232fa1122ccaadf6470e1 100644 (file)
--- a/man/autoscan.1
+++ b/man/autoscan.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOSCAN "1" "October 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTOSCAN "1" "November 2001" "GNU Autoconf 2.52f" FSF
 .SH NAME
 autoscan \- Generate a preliminary configure.in
 .SH SYNOPSIS

diff --git a/man/autoupdate.1 b/man/autoupdate.1
index ee1477c4f2294e6c4c554d0b91c9db224ba296fd..169fa96e56d3e789d1f6086b025a76eeeaf9897f 100644 (file)
--- a/man/autoupdate.1
+++ b/man/autoupdate.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTOUPDATE "1" "October 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTOUPDATE "1" "November 2001" "GNU Autoconf 2.52f" FSF
 .SH NAME
 autoupdate \- Update a configure.in to a newer Autoconf
 .SH SYNOPSIS

diff --git a/man/config.guess.1 b/man/config.guess.1
index c81042f07297331560b176db5254b1b9a384de41..dd7177fe41cca6ef184362995fb6b2735e254128 100644 (file)
--- a/man/config.guess.1
+++ b/man/config.guess.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH CONFIG.GUESS "1" "August 2001" "GNU config.guess (2001-08-23)" FSF
+.TH CONFIG.GUESS "1" "November 2001" "GNU config.guess (2001-10-05)" FSF
 .SH NAME
 config.guess \- guess the build system triplet
 .SH SYNOPSIS

diff --git a/man/config.sub.1 b/man/config.sub.1
index 9990bf46b06eb9f0fe20a999a3ae6836250012f6..93639b30dc49975973431a93a73ff61ca980b1d5 100644 (file)
--- a/man/config.sub.1
+++ b/man/config.sub.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH CONFIG.SUB "1" "August 2001" "GNU config.sub (2001-08-23)" FSF
+.TH CONFIG.SUB "1" "November 2001" "GNU config.sub (2001-10-05)" FSF
 .SH NAME
 config.sub \- validate and canonicalize a configuration triplet
 .SH SYNOPSIS

diff --git a/man/ifnames.1 b/man/ifnames.1
index 277571e00057e6ca30f1b640b55e37d8b81a8223..13a7127e748a59f314516d80db8a2769b79412cd 100644 (file)
--- a/man/ifnames.1
+++ b/man/ifnames.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH IFNAMES "1" "October 2001" "ifnames " FSF
+.TH IFNAMES "1" "November 2001" "ifnames " FSF
 .SH NAME
 ifnames \- Extract CPP conditionals from a set of files
 .SH SYNOPSIS
@@ -26,7 +26,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "REPORTING BUGS"
 Report bugs to <bug-autoconf@gnu.org>.
 .PP
-ifnames (GNU Autoconf) 2.52e
+ifnames (GNU Autoconf) 2.52f
 .SH "SEE ALSO"
 .BR autoconf (1),
 .BR automake (1),