PR guile/17367

gdb/ChangeLog:

	* acinclude.m4 (GDB_GUILE_PROGRAM_NAMES): Pass guile version as
	last parameter to pkg-config, not first.
	* configure.ac: Pass --with-guile provided pkg-config path to
	GDB_GUILE_PROGRAM_NAMES.
	* configure: Regenerate.
This commit is contained in:
Doug Evans
2014-09-09 21:18:25 -07:00
parent b4a3d263b0
commit d342a0da4f
4 changed files with 58 additions and 7 deletions

View File

@@ -478,14 +478,14 @@ dnl similar to Guile's 'GUILE_PROGS' macro.)
AC_DEFUN([GDB_GUILE_PROGRAM_NAMES], [
AC_CACHE_CHECK([for the absolute file name of the 'guild' command],
[ac_cv_guild_program_name],
[ac_cv_guild_program_name="`$1 $2 --variable guild`"
[ac_cv_guild_program_name="`$1 --variable guild $2`"
# In Guile up to 2.0.11 included, guile-2.0.pc would not define
# the 'guild' and 'bindir' variables. In that case, try to guess
# what the program name is, at the risk of getting it wrong if
# Guile was configured with '--program-suffix' or similar.
if test "x$ac_cv_guild_program_name" = "x"; then
guile_exec_prefix="`$1 $2 --variable exec_prefix`"
guile_exec_prefix="`$1 --variable exec_prefix $2`"
ac_cv_guild_program_name="$guile_exec_prefix/bin/guild"
fi
])