build: fix configure script neglecting, re-enable out-of-tree builds

For the former, a prototype and the final code got (hm, mysteriously)
intertwisted.  For the latter, I am clearly guilty of (rare, anyway)
testing of the out-of-tree builds only with libqb-already-system-wide
scenario, which is rather shortsighted.

Thanks Fabio and his ci.kronosnet.org project for spotting that.

X-mas-present-for: Fabio M. Di Nitto <fdinitto@redhat.com>
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
This commit is contained in:
Jan Pokorný 2017-12-26 00:02:26 +01:00
parent 28dff090c7
commit 6d62b64752
No known key found for this signature in database
GPG Key ID: 61BBB23A9E8F8DE2
2 changed files with 4 additions and 2 deletions

View File

@ -710,7 +710,7 @@ if test "x${GCC}" = xyes; then
| grep __stop___verbose | cut -d" " -f 3)
test "${verbose_start_addr}" = "${verbose_stop_addr}" \
&& gcc_has_attribute_section_visible=no \
|| { verbose_start_type=$(${READELF} -s backup \
|| { verbose_start_type=$(${READELF} -s "conftest${shrext_cmds}" \
| sed -n '/__start___verbose/{s/^\s*//p;q}' \
| tr -s ' ' \
| cut -d" " -f6)

View File

@ -101,7 +101,9 @@ endif
endif
qblog_script.ld: %.ld: %.ld.in
$(AM_V_GEN)$(CPP) -xc -I$(top_srcdir)/include -D_GNU_SOURCE -C -P $< \
$(AM_V_GEN)$(CPP) -C -D_GNU_SOURCE -P \
-I$(top_srcdir)/include -I$(top_builddir)/include \
-xc $< \
| sed -n "/$$(sed -n '/^[^#]/{s/[*\/]/\\&/g;p;q;}' $<)/,$$ p" \
> $@