FYI: distchecks!!!

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * config/gnu-obstack.m4 (M4_AC_FUNC_OBSTACK): Be sure `m4/' exists
        when creating `m4/obstack.h'.
        * tests/Makefile.am (TESTS_ENVIRONMENT): Pass top_srcdir and
        top_builddir.
        * tests/defs: Make them absolute.
        (CDPATH) Neutralize.
        * tests/gethem: Use them.

Index: NEWS
===================================================================
RCS file: /cvs/m4/NEWS,v
retrieving revision 1.4
diff -u -u -r1.4 NEWS
--- NEWS 2000/12/01 01:22:41 1.4
+++ NEWS 2001/08/15 11:47:17
@@ -1,7 +1,7 @@
 GNU m4 NEWS - History of user-visible changes.         -*- outline -*-
-Copyright 1992, 1993, 1994, 1998, 2000 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1998, 2000, 2001 Free Software Foundation, Inc.
 
-Version beta 1.4p - November 2000, by Gary V. Vaughan
+Version beta 1.4q - August 2001, by Gary V. Vaughan
 
 * `configure --without-modules' will build an m4 binary with no preloaded
   modules.  At startup it will search for and load modules `m4' and either
Index: config/gnu-obstack.m4
===================================================================
RCS file: /cvs/m4/config/gnu-obstack.m4,v
retrieving revision 1.4
diff -u -u -r1.4 gnu-obstack.m4
--- config/gnu-obstack.m4 2001/08/14 01:19:07 1.4
+++ config/gnu-obstack.m4 2001/08/15 11:47:17
@@ -18,11 +18,16 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-#serial 3
+#serial 4
 
-# FIXME: This is not portable I guess.  There is no reason for all
-# the CPP in the world to support #include_next.  So?  Copy the
-# actual content of obstack.h if CPP does not support 'include_next'?
+# FIXME: This might not be portable...  When obstack.h is found, we
+# want to use the system's obstack.h.  But we don't want to install
+# config.h, so we _need_ m4/obstack.h.  The current proposal is based
+# on `#include_next', which is certainly not portable, but chances are
+# very high that a system with a proper obstack implementation has a
+# good compiler.  It might be chimeric to try some more robust
+# solution.  One such solution would be to hard code the _path_ of the
+# native obstack.h into an `#include' in our obstack.h.
 
 AC_PREREQ(2.52)
 
@@ -43,6 +48,9 @@
 rm -f $m4_obstack_h
 if test $m4_cv_func_obstack = yes; then
   AC_DEFINE(HAVE_OBSTACK, 1, [Define if libc includes obstacks.])
+  # We are in the core of configure, when build directories do not
+  # exist yet, as they are created by config.status.
+  test -d m4 || mkdir m4
   cat >$m4_obstack_h <<EOF
 /* The native header works properly. */
 #include_next <obstack.h>
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/m4/tests/Makefile.am,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile.am
--- tests/Makefile.am 2000/12/01 01:22:41 1.6
+++ tests/Makefile.am 2001/08/15 11:47:17
@@ -1,16 +1,16 @@
 ## This file is part of GNU m4
 ## Copyright 2000 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
-## the Free Software Foundation; either version 2 of the License, or 
+## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
 ##
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -26,6 +26,7 @@
 MAINTAINERCLEANFILES = Makefile.in $(GENERATED_TESTS) config.m4 config.sh \
        stamp-TESTS
 
+TESTS_ENVIRONMENT = top_builddir=$(top_builddir) top_srcdir=$(top_srcdir)
 TESTS = $(GENERATED_TESTS) $(OTHER_TESTS)
 
 GENERATED_TESTS = \
Index: tests/defs
===================================================================
RCS file: /cvs/m4/tests/defs,v
retrieving revision 1.3
diff -u -u -r1.3 defs
--- tests/defs 2001/08/14 01:19:07 1.3
+++ tests/defs 2001/08/15 11:47:17
@@ -1,17 +1,17 @@
 # -*- sh -*-
 # Defines for GNU m4 testing environment.
-# Copyright 1991-1994, 1999, 2000 Free Software Foundation, Inc.
-#  
+# Copyright 1991-1994, 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
-# the Free Software Foundation; either version 2 of the License, or 
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -19,6 +19,18 @@
 #
 # Written by Erick Branderhorst <address@hidden>
 
+# Setting nls related vars. Override them in the test when needed.
+LANGUAGE=C
+export LANGUAGE
+LC_ALL=C
+export LC_ALL
+LANG=C
+export LANG
+
+# CDPATH.
+unset CDPATH >/dev/null 2>&1
+test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+
 # Ensure $srcdir set correctly.
 test -f ${srcdir}/defs || {
    echo "defs: installation error" 1>&2
@@ -39,6 +51,10 @@
     ;;
 esac
 
+# Since we `cd', it is somewhat dangerous to rely upon relative paths.
+top_builddir=`cd $top_builddir && pwd`
+top_srcdir=`cd $top_srcdir && pwd`
+
 rm -rf testSubDir > /dev/null 2>&1
 mkdir testSubDir
 cd testSubDir
@@ -60,16 +76,7 @@
 echo "=== Running test $0"
 
 # See how GNU m4 should be run.  No options as default.
-test -z "$M4" && M4="${SHELL-/bin/sh} $srcdir/../libtool --mode=execute 
$srcdir/../src/m4"
+test -z "$M4" && M4="${SHELL-/bin/sh} $top_builddir/libtool --mode=execute 
$top_builddir/src/m4"
 
 # See how cmp should be run.
 test -z "$CMP" && CMP=cmp
-
-# Setting nls related vars. Override them in the test when needed.
-LANGUAGE=C
-export LANGUAGE
-LC_ALL=C
-export LC_ALL
-LANG=C
-export LANG
-
Index: tests/get-them
===================================================================
RCS file: /cvs/m4/tests/get-them,v
retrieving revision 1.2
diff -u -u -r1.2 get-them
--- tests/get-them 2000/11/24 23:24:34 1.2
+++ tests/get-them 2001/08/15 11:47:17
@@ -49,7 +49,7 @@
       close (file);
     seq++;
     count++;
-    o = 0; 
+    o = 0;
     e = 0;
     error_flag = 0;
     i = 0;
@@ -67,7 +67,7 @@
     printthem(error, e, "okerr");
     printf ("\n") >> file;
     if (include_flag == 1) printf ("M4PATH=$srcdir ") >> file;
-    printf ("$M4 -M ../../modules -d in >out") >> file;
+    printf ("$M4 -M $top_builddir/modules -d in >out") >> file;
     if (error_flag == 1) printf (" 2>err") >> file;
     if (error_flag == 1) printf ("\nsed -e \"s,^[^:]*[lt-]*m4[.ex]*:,m4:,\" 
err >sederr && mv sederr err") >> file;
     printf ("\n\n$CMP -s out ok") >> file;