Merge commit '5fac1a7ada'
Conflicts: configure.ac doc/ref/libguile-parallel.texi
This commit is contained in:
commit
12dfe6568c
4 changed files with 67 additions and 24 deletions
|
|
@ -5,7 +5,7 @@ dnl
|
|||
define(GUILE_CONFIGURE_COPYRIGHT,[[
|
||||
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
|
||||
2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GUILE
|
||||
|
||||
|
|
@ -1646,9 +1646,6 @@ AC_CONFIG_FILES([
|
|||
module/Makefile
|
||||
])
|
||||
|
||||
AC_CONFIG_FILES([meta/guile-2.2.pc])
|
||||
AC_CONFIG_FILES([meta/guile-2.2-uninstalled.pc])
|
||||
|
||||
GUILE_CONFIG_SCRIPT([check-guile])
|
||||
GUILE_CONFIG_SCRIPT([benchmark-guile])
|
||||
GUILE_CONFIG_SCRIPT([meta/guile])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue