From: Jim Meyering <jim@meyering.net>
Date: Fri, 26 Sep 2003 20:11:15 +0000 (+0000)
Subject: .
X-Git-Tag: v5.1.0~533
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e7f3fae30b60a7cb71e36a08759541ca3ec1621;p=thirdparty%2Fcoreutils.git

.
---

diff --git a/aclocal.m4 b/aclocal.m4
index 3be50a835a..aaea34b6f1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -833,21 +833,33 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.])
 fi])])
 
+# Enable extensions on systems that normally disable them.
+
+# Copyright (C) 2003 Free Software Foundation, Inc.
+
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+
 # gl_USE_SYSTEM_EXTENSIONS
 # ------------------------
 # Enable extensions on systems that normally disable them,
 # typically due to standards-conformance issues.
 AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], [
-  AC_REQUIRE([AC_AIX])
+  AC_BEFORE([$0], [AC_COMPILE_IFELSE])
+  AC_BEFORE([$0], [AC_RUN_IFELSE])
+
   AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_AIX])
   AC_REQUIRE([AC_MINIX])
+
   AH_VERBATIM([__EXTENSIONS__],
 [/* Enable extensions on Solaris.  */
 #ifndef __EXTENSIONS__
 # undef __EXTENSIONS__
 #endif])
-  AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
-  AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
   AC_DEFINE([__EXTENSIONS__])
 ])
 
diff --git a/src/Makefile.in b/src/Makefile.in
index b5ca1a7069..d5d92dbc51 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -873,7 +873,7 @@ uninstall-binPROGRAMS:
 	done
 
 clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
 	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \