aboutsummaryrefslogtreecommitdiff
path: root/gdb/acinclude.m4
diff options
context:
space:
mode:
authorDoug Evans <xdje42@gmail.com>2014-09-09 21:18:25 -0700
committerDoug Evans <xdje42@gmail.com>2014-09-09 21:18:25 -0700
commitd342a0da4fa83b680426511a7d0e1b1e299c63b8 (patch)
tree8d2b73afdc502bb218f675735c82961b5e407c78 /gdb/acinclude.m4
parentb4a3d263b07508de083928823aee72699e59afc0 (diff)
downloadgdb-d342a0da4fa83b680426511a7d0e1b1e299c63b8.zip
gdb-d342a0da4fa83b680426511a7d0e1b1e299c63b8.tar.gz
gdb-d342a0da4fa83b680426511a7d0e1b1e299c63b8.tar.bz2
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.
Diffstat (limited to 'gdb/acinclude.m4')
-rw-r--r--gdb/acinclude.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index 2b46f73..3ff5155 100644
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -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
])