[Guile-commits] GNU Guile branch, master, updated. v2.1.0-233-g545d776

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=545d776ef6b529eae8cd1d6cad0fe0d792c133a9

The branch, master has been updated
       via  545d776ef6b529eae8cd1d6cad0fe0d792c133a9 (commit)
      from  649f6043dec99337b9635893451773d9d2420a94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 545d776ef6b529eae8cd1d6cad0fe0d792c133a9
Author: Andy Wingo <address@hidden>
Date:   Mon Oct 14 11:33:41 2013 +0200

    Put the readline extension in the extensionsdir
    
    * GUILE-VERSION:
    * acinclude.m4:
    * guile-readline/LIBGUILEREADLINE-VERSION:
    * guile-readline/Makefile.am: Rename libguile-readline-v-18.so to
      guile-readline.so, and install it to the extensions dir instead of the
      libdir.
    
    * guile-readline/ice-9/readline.scm: Load guile-readline instead of
      libguile-readline-v-18.

-----------------------------------------------------------------------

Summary of changes:
 GUILE-VERSION                           |    4 +---
 acinclude.m4                            |    9 +--------
 guile-readline/LIBGUILEREADLINE-VERSION |   14 --------------
 guile-readline/Makefile.am              |   20 +++++++++-----------
 guile-readline/ice-9/readline.scm       |    4 ++--
 5 files changed, 13 insertions(+), 38 deletions(-)
 delete mode 100644 guile-readline/LIBGUILEREADLINE-VERSION

diff --git a/GUILE-VERSION b/GUILE-VERSION
index acaa566..4a3f4fc 100644
--- a/GUILE-VERSION
+++ b/GUILE-VERSION
@@ -11,9 +11,7 @@ GUILE_EFFECTIVE_VERSION=2.2
 # All of the shared lib versioning info.  Right now, for this to work
 # properly, you'll also need to add AC_SUBST calls to the right place
 # in configure.in, add the right -version-info statement to your
-# Makefile.am The only library not handled here is
-# guile-readline/libguile-readline.  It is handled in
-# ./guile-readline/LIBGUILEREADLINE-VERSION.
+# Makefile.am.
 
 # See libtool info pages for more information on how and when to
 # change these.
diff --git a/acinclude.m4 b/acinclude.m4
index 8ef6e99..6a1470f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,7 +1,7 @@
 dnl -*- Autoconf -*-
 
 dnl Copyright (C) 1997, 1999, 2000, 2001, 2002, 2004, 2006,
-dnl   2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+dnl   2007, 2008, 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GUILE
 dnl
@@ -462,13 +462,6 @@ AC_DEFUN([GUILE_READLINE], [
   AC_CHECK_FUNCS([strdup])
 
   AC_SUBST([READLINE_LIBS])
-
-  . $srcdir/guile-readline/LIBGUILEREADLINE-VERSION
-  AC_SUBST(LIBGUILEREADLINE_MAJOR)
-  AC_SUBST(LIBGUILEREADLINE_INTERFACE_CURRENT)
-  AC_SUBST(LIBGUILEREADLINE_INTERFACE_REVISION)
-  AC_SUBST(LIBGUILEREADLINE_INTERFACE_AGE)
-  AC_SUBST(LIBGUILEREADLINE_INTERFACE)
 ])
 
 dnl GUILE_LIBUNISTRING_WITH_ICONV_SUPPORT
diff --git a/guile-readline/LIBGUILEREADLINE-VERSION 
b/guile-readline/LIBGUILEREADLINE-VERSION
deleted file mode 100644
index dfd515e..0000000
--- a/guile-readline/LIBGUILEREADLINE-VERSION
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*-shell-script-*-
-
-# This file contains the shared library versioning information.  Right
-# now, for this to work properly, you'll also need to add AC_SUBST
-# calls to the right place in configure.in, add the right
-# -version-info statement to your Makefile.am, and add a call to
-# source this file from configure.in.  Later we may automate more of
-# this.
-
-LIBGUILEREADLINE_MAJOR=18
-LIBGUILEREADLINE_INTERFACE_CURRENT=18
-LIBGUILEREADLINE_INTERFACE_REVISION=0
-LIBGUILEREADLINE_INTERFACE_AGE=0
-LIBGUILEREADLINE_INTERFACE="${LIBGUILEREADLINE_INTERFACE_CURRENT}:${LIBGUILEREADLINE_INTERFACE_REVISION}:${LIBGUILEREADLINE_INTERFACE_AGE}"
diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am
index 0c4ca77..ade7dd0 100644
--- a/guile-readline/Makefile.am
+++ b/guile-readline/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with Automake to create Makefile.in
 ##
 ##   Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006, 2007, 2008,
-##     2009, 2010, 2012 Free Software Foundation, Inc.
+##     2009, 2010, 2012, 2013 Free Software Foundation, Inc.
 ##
 ##   This file is part of guile-readline.
 ##
@@ -42,17 +42,16 @@ AM_CPPFLAGS = -I. -I.. -I$(srcdir)/..                       
\
 
 AM_CFLAGS = $(GCC_CFLAGS)
 
-lib_LTLIBRARIES = address@hidden@.la
+extensionsdir=$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions
 
address@hidden@_la_SOURCES = readline.c
address@hidden@_la_LIBADD =     \
+extensions_LTLIBRARIES = guile-readline.la
+
+guile_readline_la_SOURCES = readline.c
+guile_readline_la_LIBADD =                             \
   $(READLINE_LIBS)                                     \
   ../libguile/address@hidden@.la ../lib/libgnu.la
 
address@hidden@_la_LDFLAGS =    \
-  -version-info @LIBGUILEREADLINE_INTERFACE@ -export-dynamic   \
-  -no-undefined
-
+guile_readline_la_LDFLAGS = -export-dynamic -no-undefined -module
 
 BUILT_SOURCES = readline.x
 
@@ -64,10 +63,9 @@ SUFFIXES += .x
 .c.x:
        $(AM_V_SNARF)$(GUILE_SNARF) -o $@ $< $(snarfcppopts)
 
-EXTRA_DIST += LIBGUILEREADLINE-VERSION ChangeLog-2008
+EXTRA_DIST += ChangeLog-2008
 
-ETAGS_ARGS +=                                                  \
-  $(address@hidden@_la_SOURCES)
+ETAGS_ARGS += $(guile_readline_la_SOURCES)
 
 CLEANFILES += *.x *.go
 
diff --git a/guile-readline/ice-9/readline.scm 
b/guile-readline/ice-9/readline.scm
index a9f7cdc..1b2fa56 100644
--- a/guile-readline/ice-9/readline.scm
+++ b/guile-readline/ice-9/readline.scm
@@ -1,6 +1,6 @@
 ;;;; readline.scm --- support functions for command-line editing
 ;;;;
-;;;;   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2006, 2009, 2010, 2011 Free 
Software Foundation, Inc.
+;;;;   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2006, 2009, 2010, 2011, 
2013 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
 ;;; but only when it isn't already present.
 
 (if (not (provided? 'readline))
-    (load-extension "libguilereadline-v-18" "scm_init_readline"))
+    (load-extension "guile-readline" "scm_init_readline"))
 
 (if (not (provided? 'readline))
     (scm-error 'misc-error


hooks/post-receive
-- 
GNU Guile