Răsfoiți Sursa

Merge branch 'maint'

* maint:
  Update to latest depcomp
  Run autotools 2.71
  Add install-sh (autoconf requires this even though it is not used...)

Conflicts:
	build/autotools/Makefile
	build/autotools/depcomp
	configure
Bryan Drewery 2 ani în urmă
părinte
comite
ff7eb384b5
2 a modificat fișierele cu 6 adăugiri și 5 ștergeri
  1. 1 0
      build/autotools/Makefile
  2. 5 5
      build/autotools/depcomp

+ 1 - 0
build/autotools/Makefile

@@ -33,6 +33,7 @@ autoconf:
 	@ls -al ../../configure
 	@cp -f `automake --print-libdir`/config.guess .
 	@cp -f `automake --print-libdir`/config.sub .
+	@cp -f `automake --print-libdir`/depcomp .
 
 clean:
 	@echo "Cleaning..."

+ 5 - 5
build/autotools/depcomp

@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 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
@@ -16,7 +16,7 @@ scriptversion=2013-05-30.07; # UTC
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -783,9 +783,9 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End: