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.

5 files changed, 13 insertions, 38 deletions

diff --git a/GUILE-VERSION b/GUILE-VERSION
index acaa5666a..4a3f4fcef 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 8ef6e99ec..6a1470f24 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 dfd515e29..000000000
--- 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 0c4ca773e..ade7dd09d 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 = libguilereadline-v-@LIBGUILEREADLINE_MAJOR@.la
+extensionsdir=$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions
 
-libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES = readline.c
-libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD =	\
+extensions_LTLIBRARIES = guile-readline.la
+
+guile_readline_la_SOURCES = readline.c
+guile_readline_la_LIBADD =				\
   $(READLINE_LIBS)					\
   ../libguile/libguile-@GUILE_EFFECTIVE_VERSION@.la ../lib/libgnu.la
 
-libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_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 +=							\
-  $(libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_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 a9f7cdc6d..1b2fa5650 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