Merge "BuildSystem: For consistency, avoid double-checking via if clauses." into 13

author Joshua Colp <jcolp@digium.com>

Tue, 13 Mar 2018 15:43:16 +0000 (10:43 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Tue, 13 Mar 2018 15:43:16 +0000 (10:43 -0500)
author Joshua Colp <jcolp@digium.com>
Tue, 13 Mar 2018 15:43:16 +0000 (10:43 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 13 Mar 2018 15:43:16 +0000 (10:43 -0500)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Tue, 13 Mar 2018 15:43:16 +0000 (10:43 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Tue, 13 Mar 2018 15:43:16 +0000 (10:43 -0500)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history