diff --git a/ChangeLog b/ChangeLog
index fec2cf91..ca01d351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-03-09  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* libtool.m4 (AC_LIBLTDL_INSTALLABLE, AC_LIBLTDL_CONVENIENCE):
+	renamed convenience libltdl, dropped toinst hack for installable
+	* libltdl/Makefile.am: ditto
+	* libltdl/configure.in: ditto; abort if none of the macros is used
+
 	* ltmain.in: $output_objdir/$objdir/ -> $output_objdir/lt-
 
 1999-03-09  Thomas Tanner  <tanner@gmx.de>
diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 0f3fc19e..a676d633 100644
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -6,27 +6,20 @@ LTDL_VERSION = -version-info 1:1:1
 
 if INSTALL_LTDL
 include_HEADERS = ltdl.h
+lib_LTLIBRARIES = libltdl.la
 else
 noinst_HEADERS = ltdl.h
 endif
 
 if CONVENIENCE_LTDL
-noinst_LTLIBRARIES = libltdl.la
+noinst_LTLIBRARIES = libltdlc.la
 endif
 
 libltdl_la_SOURCES = ltdl.c
 libltdl_la_LIBADD = $(LIBADD_DL)
 
-lib_LTLIBRARIES = @LIBLIBS@
-EXTRA_LTLIBRARIES =
-
-@TOINST@/libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES)
-	test -d $(TOINST) || mkdir $(TOINST)
-	$(LINK) $(libltdl_la_OBJECTS) \
-		-rpath $(libdir) $(LTDL_VERSION) $(libltdl_la_LIBADD)
-
-distclean-local:
-	test -z $(TOINST) || rm -rf $(TOINST)
+libltdlc_la_SOURCES = ltdl.c
+libltdlc_la_LIBADD = $(LIBADD_DL)
 
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
diff --git a/libltdl/configure.in b/libltdl/configure.in
index a1156eb7..ed83c4e9 100644
--- a/libltdl/configure.in
+++ b/libltdl/configure.in
@@ -6,24 +6,13 @@ AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
 
-TOINST=toinst
-AC_SUBST(TOINST)
-
 if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
-  AC_MSG_WARN([*** Neither AC_LIBLTDL_INSTALLABLE nor AC_LIBLTDL_CONVENIENCE were used])
-  AC_MSG_WARN([*** in configure.in; building convenience library for backward])
-  AC_MSG_WARN([*** compatibility.  This is deprecated, and will not work in the future])
-  enable_ltdl_convenience=yes
+  AC_MSG_WARN([*** Neither [A""C_LIBLTDL_INSTALLABLE] nor [A""C_LIBLTDL_CONVENIENCE] were used])
+  AC_MSG_ERROR([*** in the top-level configure.in; aborting])
 fi
 
 AC_ARG_ENABLE(ltdl-install,
   [--enable-ltdl-install     install libltdl])
-if test x"$enable_ltdl_install" != xno; then
-  LIBLIBS=$TOINST/libltdl.la
-else
-  LIBLIBS=
-fi
-AC_SUBST(LIBLIBS)
 
 AM_CONDITIONAL(INSTALL_LTDL, test x"$enable_ltdl_install" != xno)
 AM_CONDITIONAL(CONVENIENCE_LTDL, test x"$enable_ltdl_convenience" != xno)
diff --git a/libtool.m4 b/libtool.m4
index 02442355..3d397e5c 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -610,7 +610,7 @@ AC_CHECK_LIB(m, cos)
 # flat, and, if you're not using automake, define top_builddir as
 # appropriate in the Makefiles.
 AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
-  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
   ac_configure_args="$ac_configure_args --enable-ltdl-convenience"
 ])
 
@@ -629,7 +629,7 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
-    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/toinst/libltdl.la
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
   fi
 ])