mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Switch from guile-1.8.pc' to guile-2.0.pc'.

Browse source 
* configure.ac: Produce guile-2.0*.pc.

* meta/Makefile.am (EXTRA_DIST): Rename guile-1.8*.pc.in to
  guile-2.0*.pc.in.
  (pkgconfig_DATA): Update accordingly.

* meta/guile-config (guile-module): Likewise.
This commit is contained in:
Ludovic Courtès 2009-08-15 12:05:36 +02:00
parent e3c9c676ae
commit c1a15f3dd7
6 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -69,7 +69,8 @@ guile-readline/guile-readline-config.h
guile-readline/guile-readline-config.h.in
*.go
TAGS
guile-1.8.pc
/meta/guile-2.0.pc
/meta/guile-2.0-uninstalled.pc
gdb-pre-inst-guile
cscope.out
cscope.files

4
configure.ac
View file

@ -1539,8 +1539,8 @@ AC_CONFIG_FILES([
testsuite/Makefile
])
AC_CONFIG_FILES([meta/guile-1.8.pc])
AC_CONFIG_FILES([meta/guile-1.8-uninstalled.pc])
AC_CONFIG_FILES([meta/guile-2.0.pc])
AC_CONFIG_FILES([meta/guile-2.0-uninstalled.pc])
AC_CONFIG_FILES([check-guile], [chmod +x check-guile])
AC_CONFIG_FILES([benchmark-guile], [chmod +x benchmark-guile])
AC_CONFIG_FILES([meta/guile], [chmod +x meta/guile])

6
meta/Makefile.am
View file

@ -1,7 +1,7 @@
## Process this file with Automake to create Makefile.in
## Jim Blandy <jimb@red-bean.com> --- September 1997
##
## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008 Free Software Foundation, Inc.
## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
##
## This file is part of GUILE.
##
@ -23,10 +23,10 @@
bin_SCRIPTS=guile-config guile-tools
EXTRA_DIST= $(bin_SCRIPTS) \
guile.m4 ChangeLog-2008 \
guile-1.8.pc.in guile-1.8-uninstalled.pc.in
guile-2.0.pc.in guile-2.0-uninstalled.pc.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = guile-1.8.pc
pkgconfig_DATA = guile-2.0.pc
## FIXME: in the future there will be direct automake support for
## doing this. When that happens, switch over.

0
meta/guile-1.8-uninstalled.pc.in → meta/guile-2.0-uninstalled.pc.in
View file

0
meta/guile-1.8.pc.in → meta/guile-2.0.pc.in
View file

4
meta/guile-config
View file

@ -4,7 +4,7 @@ exec guile -e main -s $0 "$@"
;;;; guile-config --- utility for linking programs with Guile
;;;; Jim Blandy <jim@red-bean.com> --- September 1997
;;;;
;;;; Copyright (C) 1998, 2001, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
;;;; Copyright (C) 1998, 2001, 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@ -71,7 +71,7 @@ exec guile -e main -s $0 "$@"
(dle " " p " --help - show usage info (this message)")
(dle " " p " --help SUBCOMMAND - show help for SUBCOMMAND")))
(define guile-module "guile-1.8")
(define guile-module "guile-2.0")
(define (pkg-config . args)
(let* ((real-args (cons "pkg-config" args))