Merge pull request #9983 from SUSE/wip-cmake-fix-fcgi-include-dir

author Kefu Chai <tchaikov@gmail.com>

Mon, 4 Jul 2016 13:43:24 +0000 (21:43 +0800)

committer GitHub <noreply@github.com>

Mon, 4 Jul 2016 13:43:24 +0000 (21:43 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 4 Jul 2016 13:43:24 +0000 (21:43 +0800)
committer GitHub <noreply@github.com>
Mon, 4 Jul 2016 13:43:24 +0000 (21:43 +0800)
diff --cc configure.ac
Simple merge
diff --cc src/rgw/Makefile.am
Simple merge
diff --cc src/test/Makefile-client.am
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 4 Jul 2016 13:43:24 +0000 (21:43 +0800)
committer	GitHub <noreply@github.com>
	Mon, 4 Jul 2016 13:43:24 +0000 (21:43 +0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/Makefile-client.am	patch \|	diff1 \|	diff2 \|	blob \| history