FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR build/17105.

Browse source 
Tested with/without guile,python on amd64-linux.

I'm not sure we still have to deal with shells that can't
handle empty for lists, but I played it safe.
Otherwise this patch would be a lot smaller (though a diff -b
will still show the real changes).

	PR build/17105
	* configure.ac: Add AM_CONDITIONALs for HAVE_PYTHON, HAVE_GUILE.
	* configure: Regenerate.
	* data-directory/Makefile.in (PYTHON_FILE_LIST): Renamed from
	PYTHON_FILES.
	(PYTHON_FILES): New variable.
	(GUILE_FILE_LIST): Renamed from GUILE_FILES.
	(GUILE_FILES): New variable.
	(stamp-python, install-python, uninstall-python): Handle empty
	file list.
	(stamp-guile, install-guile, uninstall-guile): Ditto.
This commit is contained in:
Doug Evans 2014-07-26 16:41:29 -07:00
parent ee7333ae06
commit 4df4275506
4 changed files with 102 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gdb/configure vendored
View file

@ -658,9 +658,13 @@ TARGET_SYSTEM_ROOT
CONFIG_LDFLAGS
RDYNAMIC
ALLOCA
HAVE_GUILE_FALSE
HAVE_GUILE_TRUE
GUILE_LIBS
GUILE_CPPFLAGS
pkg_config_prog_path
HAVE_PYTHON_FALSE
HAVE_PYTHON_TRUE
PYTHON_LIBS
PYTHON_CPPFLAGS
PYTHON_CFLAGS
@ -8686,6 +8690,14 @@ fi
if test "${have_libpython}" != no; then
HAVE_PYTHON_TRUE=
HAVE_PYTHON_FALSE='#'
else
HAVE_PYTHON_TRUE='#'
HAVE_PYTHON_FALSE=
fi
# -------------------- #
# Check for libguile. #
@ -9102,6 +9114,14 @@ else
fi
if test "${have_libguile}" != no; then
HAVE_GUILE_TRUE=
HAVE_GUILE_FALSE='#'
else
HAVE_GUILE_TRUE='#'
HAVE_GUILE_FALSE=
fi
# PR 17185, see if we can get the libgc version to see if we need
# to apply the workaround.
@ -15475,6 +15495,14 @@ if test -z "${GMAKE_TRUE}" && test -z "${GMAKE_FALSE}"; then
as_fn_error "conditional \"GMAKE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then
as_fn_error "conditional \"HAVE_PYTHON\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_GUILE_TRUE}" && test -z "${HAVE_GUILE_FALSE}"; then
as_fn_error "conditional \"HAVE_GUILE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
: ${CONFIG_STATUS=./config.status}