From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 30 May 2012 07:25:59 +0000 (+0200)
Subject: [ng] general: assume dot-starting file names are supported
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6af35514459fc2d9be800cdb3936daaefd13634;p=thirdparty%2Fautomake.git

[ng] general: assume dot-starting file names are supported

Now that we've dropped support for DJGPP, Windows 95/98/ME and MS-DOS,
that should always the case.

* lib/am/texibuild.am: Just assume we can have directories whose name
starts with a dot, i.e., that '${am__leading_dot}' expands to '.'.
* m4/depend.m4 (AM_SET_DEPDIR): Likewise.  Now $(DEPDIR) will be set
unconditionally to '.deps'.
* m4/init.m4 (AM_INIT_AUTOMAKE): Don't AC_REQUIRE the m4 macro
'AM_SET_LEADING_DOT' anymore.
* m4/lead-dot.m4: Delete.
* Makefile.am (dist_automake_ac_DATA): Remove it.
* NG-NEWS: Update.
* t/subobj11a.sh: Just assume $(DEPDIR) expands to '.deps'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/Makefile.am b/Makefile.am
index 533faef45..51fb414a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -243,7 +243,6 @@ dist_automake_ac_DATA = \
   m4/gcj.m4 \
   m4/init.m4 \
   m4/install-sh.m4 \
-  m4/lead-dot.m4 \
   m4/lex.m4 \
   m4/lispdir.m4 \
   m4/maintainer.m4 \
diff --git a/NG-NEWS b/NG-NEWS
index ed36fe261..1e3c4643c 100644
--- a/NG-NEWS
+++ b/NG-NEWS
@@ -228,6 +228,12 @@ Obsolete Features Removed
   Of course, MinGW/MSYS and Cygwin on Windows 2000 and later are still
   fully supported.
 
+* Automake-generated Makefiles assume the target systems always support
+  file names starting with a dot; accordingly, the internal m4 macro
+  'AM_SET_LEADING_DOT' and AC_SUBST'd variable 'am__leading_dot' have
+  been removed.
+
+
 Source Files with Unknown Extensions
 ====================================
 
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 039e6de38..10f5b3694 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -25,7 +25,7 @@
 ## 2) If the texinfo file has some minor mistakes which cause makeinfo
 ##    to fail, the info files are not removed.  (They are needed by the
 ##    developer while he writes documentation.)
-	%AM_V_MAKEINFO%restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+	%AM_V_MAKEINFO%restore=: && backupdir=.am$$$$ && \
 ?INSRC?	am__cwd=`pwd` && $(am__cd) $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 ## If makeinfo is not installed we must not backup the files so
diff --git a/m4/depend.m4 b/m4/depend.m4
index 0c1112e2c..caa984b83 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -159,10 +159,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # -------------
 # Choose a directory name for dependency files.
 # This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
+AC_DEFUN([AM_SET_DEPDIR], [AC_SUBST([DEPDIR], [.deps])])
 
 
 # AM_DEP_TRACK
diff --git a/m4/init.m4 b/m4/init.m4
index 0abf7879e..9d06c9615 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -68,7 +68,6 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
 			     [_AM_PROG_TAR([v7])])])
diff --git a/m4/lead-dot.m4 b/m4/lead-dot.m4
deleted file mode 100644
index 8a8680539..000000000
--- a/m4/lead-dot.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-##                                                          -*- Autoconf -*-
-# Copyright (C) 2003-2012 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 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
diff --git a/t/subobj11a.sh b/t/subobj11a.sh
index ae02e59b3..3dbf52b9e 100755
--- a/t/subobj11a.sh
+++ b/t/subobj11a.sh
@@ -63,13 +63,7 @@ $AUTOMAKE -a
 ./configure --enable-dependency-tracking
 
 $MAKE
-depdir=`sed -n 's/^ *DEPDIR *= *//p' Makefile`
-if test x"$depdir" != x; then
-  depdir=src/$depdir
-else
-  fatal_ "cannot extract value of DEPDIR from Makefile"
-fi
-
+depdir=src/.deps
 ls -l "$depdir"
 test -f "$depdir"/foo.Po