summaryrefslogtreecommitdiff
path: root/module
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-03-16 21:18:12 +0100
committerAndy Wingo <wingo@pobox.com>2010-03-16 21:20:34 +0100
commit44602b08680ad6422dd88780c23540c0632bcc68 (patch)
tree7c10f189079a405c94bf4e278861e408cdccd607 /module
parent89607fab50ed88dff3b6fb5310a6753da8dbaa97 (diff)
downloadguile-44602b08680ad6422dd88780c23540c0632bcc68.tar.gz
rename libguile to libguile-@EFFECTIVE_VERSION@, currently libguile-2.0
* libguile/Makefile.am (lib_LTLIBRARIES): Instead of just "libguile.la", make "libguile-@EFFECTIVE_VERSION@.la". This allows multiple versions of Guile to be installed at once. See http://www106.pair.com/rhp/parallel.html for a rationale. (libguile_@GUILE_EFFECTIVE_VERSION@_la_CFLAGS): (libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES): (EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES): (libguile_@GUILE_EFFECTIVE_VERSION@_la_DEPENDENCIES): (libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD): (libguile_@GUILE_EFFECTIVE_VERSION@_la_LDFLAGS): Fixup automake vars to include the effective version. (guile_LDADD): Fix up the spelling of libguile. * libguile/bytevectors.c (scm_bootstrap_bytevectors): * libguile/foreign.c (scm_register_foreign): * libguile/i18n.c (scm_bootstrap_i18n): * libguile/instructions.c (scm_bootstrap_instructions): * libguile/objcodes.c (scm_bootstrap_objcodes): * libguile/programs.c (scm_bootstrap_programs): * libguile/vm.c (scm_bootstrap_vm): Register extensions using e.g. "libguile-2.0" as the libname -- i.e., including the effective version in the libname. * module/ice-9/i18n.scm: * module/rnrs/bytevector.scm: * module/rnrs/io/ports.scm: * module/system/foreign.scm: * module/system/vm/instruction.scm: * module/system/vm/objcode.scm: * module/system/vm/program.scm: * module/system/vm/vm.scm: When doing a load-extension for something in Guile, use the effective version also. * meta/guile-2.0-uninstalled.pc.in (Libs): * meta/guile-2.0.pc.in (Libs): Use -lguile-@EFFECTIVE_VERSION@. This change should mean that code built against Guile should not be affected by the libguile rename. * guile-readline/Makefile.am (libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD): * srfi/Makefile.am (libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LIBADD): (libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD): (libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD): (libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LIBADD): * test-suite/standalone/Makefile.am (test_num2integral_LDADD): (test_round_LDADD): (libtest_asmobs_la_LIBADD): (libtest_ffi_la_LIBADD): (test_list_LDADD): (test_unwind_LDADD): (test_conversion_LDADD): (test_loose_ends_LDADD): (test_scm_c_read_LDADD): (test_scm_take_locale_symbol_LDADD): (test_scm_take_u8vector_LDADD): (libtest_extensions_la_LIBADD): (test_with_guile_module_LDADD): (test_scm_with_guile_LDADD): Fix up the spelling of libguile.la.
Diffstat (limited to 'module')
-rw-r--r--module/ice-9/i18n.scm3
-rw-r--r--module/rnrs/bytevector.scm3
-rw-r--r--module/rnrs/io/ports.scm3
-rw-r--r--module/system/foreign.scm3
-rw-r--r--module/system/vm/instruction.scm5
-rw-r--r--module/system/vm/objcode.scm5
-rw-r--r--module/system/vm/program.scm3
-rw-r--r--module/system/vm/vm.scm3
8 files changed, 18 insertions, 10 deletions
diff --git a/module/ice-9/i18n.scm b/module/ice-9/i18n.scm
index 6fa31e409..ce04aa304 100644
--- a/module/ice-9/i18n.scm
+++ b/module/ice-9/i18n.scm
@@ -84,7 +84,8 @@
(eval-when (eval load compile)
- (load-extension "libguile" "scm_init_i18n"))
+ (load-extension (string-append "libguile-" (effective-version))
+ "scm_init_i18n"))
;;;
diff --git a/module/rnrs/bytevector.scm b/module/rnrs/bytevector.scm
index 56b8a6403..9b8ac450b 100644
--- a/module/rnrs/bytevector.scm
+++ b/module/rnrs/bytevector.scm
@@ -71,7 +71,8 @@
utf8->string utf16->string utf32->string))
-(load-extension "libguile" "scm_init_bytevectors")
+(load-extension (string-append "libguile-" (effective-version))
+ "scm_init_bytevectors")
(define-macro (endianness sym)
(if (memq sym '(big little))
diff --git a/module/rnrs/io/ports.scm b/module/rnrs/io/ports.scm
index 308a36cc8..17d490796 100644
--- a/module/rnrs/io/ports.scm
+++ b/module/rnrs/io/ports.scm
@@ -52,7 +52,8 @@
;; binary output
put-u8 put-bytevector))
-(load-extension "libguile" "scm_init_r6rs_ports")
+(load-extension (string-append "libguile-" (effective-version))
+ "scm_init_r6rs_ports")
diff --git a/module/system/foreign.scm b/module/system/foreign.scm
index 2a7433230..73c11feaa 100644
--- a/module/system/foreign.scm
+++ b/module/system/foreign.scm
@@ -33,7 +33,8 @@
make-foreign-function
make-c-struct parse-c-struct))
-(load-extension "libguile" "scm_init_foreign")
+(load-extension (string-append "libguile-" (effective-version))
+ "scm_init_foreign")
(define *writers*
`((,float . ,bytevector-ieee-single-native-set!)
diff --git a/module/system/vm/instruction.scm b/module/system/vm/instruction.scm
index 403e9cdc7..287e47293 100644
--- a/module/system/vm/instruction.scm
+++ b/module/system/vm/instruction.scm
@@ -1,6 +1,6 @@
;;; Guile VM instructions
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2010 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
@@ -24,4 +24,5 @@
instruction-pops instruction-pushes
instruction->opcode opcode->instruction))
-(load-extension "libguile" "scm_init_instructions")
+(load-extension (string-append "libguile-" (effective-version))
+ "scm_init_instructions")
diff --git a/module/system/vm/objcode.scm b/module/system/vm/objcode.scm
index 7c0490da6..966f34585 100644
--- a/module/system/vm/objcode.scm
+++ b/module/system/vm/objcode.scm
@@ -1,6 +1,6 @@
;;; Guile VM object code
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2010 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
@@ -24,4 +24,5 @@
load-objcode write-objcode
word-size byte-order))
-(load-extension "libguile" "scm_init_objcodes")
+(load-extension (string-append "libguile-" (effective-version))
+ "scm_init_objcodes")
diff --git a/module/system/vm/program.scm b/module/system/vm/program.scm
index 1afc3e0f4..6c5956620 100644
--- a/module/system/vm/program.scm
+++ b/module/system/vm/program.scm
@@ -44,7 +44,8 @@
program-num-free-variables
program-free-variable-ref program-free-variable-set!))
-(load-extension "libguile" "scm_init_programs")
+(load-extension (string-append "libguile-" (effective-version))
+ "scm_init_programs")
(define (make-binding name boxed? index start end)
(list name boxed? index start end))
diff --git a/module/system/vm/vm.scm b/module/system/vm/vm.scm
index c6e550b05..c50959bcc 100644
--- a/module/system/vm/vm.scm
+++ b/module/system/vm/vm.scm
@@ -31,7 +31,8 @@
vm-next-hook vm-apply-hook vm-boot-hook vm-return-hook
vm-break-hook vm-exit-hook vm-halt-hook vm-enter-hook))
-(load-extension "libguile" "scm_init_vm")
+(load-extension (string-append "libguile-" (effective-version))
+ "scm_init_vm")
(define (vms:time stat) (vector-ref stat 0))
(define (vms:clock stat) (vector-ref stat 1))