* Use AC_LIBLTDL_CONVENIENCE

* Added --{en,dis}able-static --{en,dis}able-shared again, since i know now
  that we can build a libltdl convenience library

diff --git a/configure.in b/configure.in
index 591752cf9686a0d577e9ea0202f9a0db2c14df3e..7619c0c6d53083e5fefabd9d1440ea6f5577589e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -113,10 +113,15 @@ AC_PROG_CC
 AM_PROG_AS
 AC_PROG_RANLIB
 AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
+dnl libtool stuff
+AC_LIBTOOL_DLOPEN
+AC_LIBLTDL_CONVENIENCE
+AC_PROG_LIBTOOL
+AC_SUBST(LIBLTDL)
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -395,6 +400,7 @@ dnl pass configure options to classpath
 if test x"${STATIC_CLASSPATH}" = "x1"; then
         AC_DEFINE([STATIC_CLASSPATH], 1, [use classpath statically linked])
        AM_CONDITIONAL([STATIC_CLASSPATH], [true])
+       CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-static --disable-shared"
 
        dnl check for some classpath related stuff when we link statically
        AM_ICONV_LINK
@@ -422,6 +428,7 @@ if test x"${STATIC_CLASSPATH}" = "x1"; then
        fi
 else
        AM_CONDITIONAL([STATIC_CLASSPATH], [false])
+       CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-static --enable-shared"
 fi