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
parent
b4a3d263b0
commit
d342a0da4f
4 changed files with 58 additions and 7 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2014-09-09 Doug Evans <xdje42@gmail.com>
|
||||
|
||||
PR guile/17367
|
||||
* 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.
|
||||
|
||||
2014-09-09 Gabriel Krisman Bertazi <gabriel@krisman.be>
|
||||
|
||||
* MAINTAINERS (Write After Approval): Add "Gabriel Krisman
|
||||
|
|
|
|||
|
|
@ -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
|
||||
])
|
||||
|
|
|
|||
38
gdb/configure
vendored
38
gdb/configure
vendored
|
|
@ -9171,20 +9171,22 @@ $as_echo "${found_usable_guile}" >&6; }
|
|||
esac
|
||||
|
||||
if test "${have_libguile}" != no; then
|
||||
case "${with_guile}" in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the absolute file name of the 'guild' command" >&5
|
||||
$as_echo_n "checking for the absolute file name of the 'guild' command... " >&6; }
|
||||
if test "${ac_cv_guild_program_name+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_cv_guild_program_name="`"${pkg_config_prog_path}" "${guile_version}" --variable guild`"
|
||||
ac_cv_guild_program_name="`"${with_guile}" --variable guild "${guile_version}"`"
|
||||
|
||||
# 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="`"${pkg_config_prog_path}" "${guile_version}" --variable exec_prefix`"
|
||||
guile_exec_prefix="`"${with_guile}" --variable exec_prefix "${guile_version}"`"
|
||||
ac_cv_guild_program_name="$guile_exec_prefix/bin/guild"
|
||||
fi
|
||||
|
||||
|
|
@ -9199,6 +9201,38 @@ $as_echo "$ac_cv_guild_program_name" >&6; }
|
|||
GUILD="$ac_cv_guild_program_name"
|
||||
|
||||
|
||||
;;
|
||||
*)
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the absolute file name of the 'guild' command" >&5
|
||||
$as_echo_n "checking for the absolute file name of the 'guild' command... " >&6; }
|
||||
if test "${ac_cv_guild_program_name+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_cv_guild_program_name="`"${pkg_config_prog_path}" --variable guild "${guile_version}"`"
|
||||
|
||||
# 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="`"${pkg_config_prog_path}" --variable exec_prefix "${guile_version}"`"
|
||||
ac_cv_guild_program_name="$guile_exec_prefix/bin/guild"
|
||||
fi
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_guild_program_name" >&5
|
||||
$as_echo "$ac_cv_guild_program_name" >&6; }
|
||||
|
||||
if ! "$ac_cv_guild_program_name" --version >&5 2>&5; then
|
||||
as_fn_error "'$ac_cv_guild_program_name' appears to be unusable" "$LINENO" 5
|
||||
fi
|
||||
|
||||
GUILD="$ac_cv_guild_program_name"
|
||||
|
||||
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
if test "$cross_compiling" = no; then
|
||||
|
|
|
|||
|
|
@ -1143,8 +1143,9 @@ dnl It could be a shell script. It is invoked as:
|
|||
dnl pkg-config --exists $version
|
||||
dnl pkg-config --cflags $version
|
||||
dnl pkg-config --libs $version
|
||||
dnl $version will be the default guile version (currently guile-2.0),
|
||||
dnl but the program is free to ignore this.
|
||||
dnl pkg-config --variable guild $version
|
||||
dnl The script will be called with $version having each value in
|
||||
dnl $try_guile_versions until --exists indicates success.
|
||||
|
||||
AC_ARG_WITH(guile,
|
||||
AS_HELP_STRING([--with-guile@<:@=GUILE@:>@], [include guile support (auto/yes/no/<guile-version>/<pkg-config-program>)]),
|
||||
|
|
@ -1196,7 +1197,14 @@ esac
|
|||
|
||||
if test "${have_libguile}" != no; then
|
||||
dnl Get the name of the 'guild' program.
|
||||
GDB_GUILE_PROGRAM_NAMES(["${pkg_config_prog_path}"], ["${guile_version}"])
|
||||
case "${with_guile}" in
|
||||
[[\\/]]* | ?:[[\\/]]*)
|
||||
GDB_GUILE_PROGRAM_NAMES(["${with_guile}"], ["${guile_version}"])
|
||||
;;
|
||||
*)
|
||||
GDB_GUILE_PROGRAM_NAMES(["${pkg_config_prog_path}"], ["${guile_version}"])
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl Make sure guild can handle this host.
|
||||
GDB_TRY_GUILD([$srcdir/guile/lib/gdb/support.scm])
|
||||
|
|
|
|||
Loading…
Reference in a new issue