Warn about static libs vs. source-highlight only when necessary

Avoid the error message when source-highlight is actually available.

2020-12-19  Bernd Edlinger  <bernd.edlinger@hotmail.de>

	* configure.ac: Move the static libs vs. source-highlight
	error message to a better place.
	* configure: Regenerate.
This commit is contained in:
Bernd Edlinger
2020-12-16 19:47:18 +01:00
parent a24e049847
commit 0455b7d325
3 changed files with 18 additions and 12 deletions

12
gdb/configure vendored
View File

@@ -12069,13 +12069,13 @@ $as_echo "no - pkg-config not found" >&6; }
as_fn_error $? "pkg-config was not found in your system" "$LINENO" 5
fi
else
case "$LDFLAGS" in
*static-libstdc*)
as_fn_error $? "source highlight is incompatible with -static-libstdc++; either use --disable-source-highlight or --without-static-standard-libraries" "$LINENO" 5
;;
esac
if ${pkg_config_prog_path} --exists source-highlight; then
case "$LDFLAGS" in
*static-libstdc*)
as_fn_error $? "source highlight is incompatible with -static-libstdc++; either use --disable-source-highlight or --without-static-standard-libraries" "$LINENO" 5
;;
esac
SRCHIGH_CFLAGS=`${pkg_config_prog_path} --cflags source-highlight`
SRCHIGH_LIBS=`${pkg_config_prog_path} --libs source-highlight`