* m4/lispdir.m4 (AM_PATH_LISPDIR): Require Autoconf 2.59c,

because it uses `datarootdir'.  Bump copyright year and serial.

diff --git a/ChangeLog b/ChangeLog
index 868f0b97e393973cebc2bba2d3222e308980adda..2ca3251b0e9b7bbe32af7040c98de4c0c2adc898 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * m4/lispdir.m4 (AM_PATH_LISPDIR): Require Autoconf 2.59c,
+       because it uses `datarootdir'.  Bump copyright year and serial.
+
 2006-04-10  Stepan Kasal  <kasal@ucw.cz>
 
        * NEWS: Fix typo.

diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 29c4e0d85873b0f9e754c97142da3c5d76425a0a..45b51cff4e79ead0200388b972b33461c6260279 100644 (file)
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -3,19 +3,20 @@
 ## From Ulrich Drepper
 ## Almost entirely rewritten by Alexandre Oliva
 ## ------------------------
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+# 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
+# serial 10
 
 # AM_PATH_LISPDIR
 # ---------------
 AC_DEFUN([AM_PATH_LISPDIR],
-[ # If set to t, that means we are running in a shell under Emacs.
+[AC_PREREQ([2.59c])dnl
+ # 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])