Changeset e160bfe8 in mainline for tools/autotool.py

Timestamp:

2017-10-23T18:51:34Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

327f147

Parents:

31cca4f3 (diff), 367db39a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline (again) to fix build

Perhaps it wasn't so good idea to start merging mainline in these unstable times

File:

• tools/autotool.py (modified) (2 diffs)

tools/autotool.py

@@ -42 +42 @@
 CONFIG = 'Makefile.config'
 MAKEFILE = 'Makefile.common'
-HEADER = 'common.h'
+HEADER = 'common.h.new'
 GUARD = 'AUTOTOOL_COMMON_H_'
 
@@ -850 +850 @@
                 check_app(["diff", "--version"], "Diff utility", "usually part of diffutils")
                 check_app(["make", "--version"], "Make utility", "preferably GNU Make")
-                check_app(["makedepend", "-f", "-"], "Makedepend utility", "usually part of imake or xutils")
                 check_app(["unzip"], "unzip utility", "usually part of zip/unzip utilities")