From: Jim Meyering <jim@meyering.net>
Date: Sat, 25 Mar 2000 18:26:47 +0000 (+0000)
Subject: back out last change
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=536e0a0dd39c9cfd8589674224bd746e5403ab84;p=pspp

back out last change
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 8c5745fe7e..df1c810a7a 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,8 +1,3 @@
-2000-03-24  Jim Meyering  <meyering@lucent.com>
-
-	* jm-macros.m4 (jm_MACROS): Invoke `AC_CONFIG_AUX_DIR(.)' to work
-	around bug that made cvs-automake complain it couldn't find lib/depcomp.
-
 2000-03-10  Jim Meyering  <meyering@lucent.com>
 
 	* lib-check.m4: Look for getspnam in -lgen, too.
diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index d60f2d5375..a991628ee4 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,4 +1,4 @@
-#serial 14
+#serial 13
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
@@ -6,10 +6,6 @@ AC_DEFUN(jm_MACROS,
 [
   AC_PREREQ(2.14a)
 
-  # Kludge to work around bug in latest cvs automake.
-  # FIXME: remove this directive once the bug is fixed.
-  AC_CONFIG_AUX_DIR(.)
-
   GNU_PACKAGE="GNU $PACKAGE"
   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
     [The concatenation of the strings `GNU ', and PACKAGE.])
@@ -20,7 +16,7 @@ AC_DEFUN(jm_MACROS,
   AC_SUBST(MAN)
   AC_SUBST(DF_PROG)
 
-  # This macro actually runs replacement code.  See isc-posix.m4.
+  dnl This macro actually runs replacement code.  See isc-posix.m4.
   AC_REQUIRE([AC_ISC_POSIX])dnl
 
   AC_CHECK_HEADERS( \