* ltconfig.in (dlopen, dlopen_self): default is unknown

* ltmain.in: fixed -dlopen self, print a warning
  if -dlopen is used without AC_LIBTOOL_DLOPEN
* mdemo/Makefile.am: use -dlopen self

diff --git a/ChangeLog b/ChangeLog
index 376dfc1ec7de54943967180f983421e5fd873f69..5a77c0c9b2b432b8f16dcdcbeaebf379af9e9e7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-02-22  Thomas Tanner  <tanner@gmx.de>
+
+       * ltconfig.in (dlopen, dlopen_self): default is unknown
+       * ltmain.in: fixed -dlopen self, print a warning
+         if -dlopen is used without AC_LIBTOOL_DLOPEN 
+       * mdemo/Makefile.am: use -dlopen self
+
 1999-02-22  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * ltmain.in: added missing mkdir $progdir for on-demand executable

diff --git a/ltconfig.in b/ltconfig.in
index d18a44606ac344928a299a8328961fc6a5972629..7e734fbe6f52347820c507dc6a4e2ec6edb219b1 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -177,8 +177,8 @@ can_build_shared=yes
 enable_shared=yes
 # All known linkers require a `.a' archive for static linking.
 enable_static=yes
-enable_dlopen=no
-enable_dlopen_self=no
+enable_dlopen=unknown
+enable_dlopen_self=unknown
 ltmain=
 silent=
 srcdir=

diff --git a/ltmain.in b/ltmain.in
index 745e33317d4860ba4944cd420472508ee740918d..0c8576e5407f62bcee876a9e06257d3146d0bdda 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -869,9 +869,11 @@ compiler."
          self)
            if test "$prev" = dlprefiles; then
              dlself=yes
-           elif test "$prev" = dlfiles && test "$dlopen_self" = no; then
+           elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
              dlself=yes
            fi
+           prev=
+           continue
            ;;
          *)
            dlprefiles="$dlprefiles $arg"
@@ -1186,7 +1188,7 @@ compiler."
        # This library was specified with -dlopen.
        if test "$prev" = dlfiles; then
          dlfiles="$dlfiles $arg"
-         if test -z "$dlname" || test "$dlopen" = no || test "$build_libtool_libs" = no; then
+         if test -z "$dlname" || test "$dlopen" != yes || test "$build_libtool_libs" = no; then
            # If there is no dlname, no dlopen support or we're linking statically,
            # we need to preload.
            prev=dlprefiles
@@ -2166,6 +2168,12 @@ EOF
        $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
       fi
 
+      if test "$preload" = yes; then
+       if test "$dlopen" = unknown || test "$dlopen_self" = unknown; then
+         $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+       fi 
+      fi
+    
       if test "$dlself" = yes && test "$export_dynamic" = no; then
        $echo "$modename: error: \`-dlopen self' requires \`-export-dynamic'" 1>&2
        exit 1

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index d2da5618e722b0c172fefa2c14129f4890cbbdb4..e2b62f446ac15782e8b5c8d8eb915018aa00ea93 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -30,7 +30,8 @@ mdemo_SOURCES = main.c
 mdemo_LDFLAGS = -export-dynamic ## FIXME: remove this when libtool and libltdl
 ## handle dependencies of modules
 ## The quotes around -dlopen below fool automake into accepting it
-mdemo_LDADD = ../libltdl/libltdl.la "-dlopen" foo1.la "-dlopen" libfoo2.la
+mdemo_LDADD = ../libltdl/libltdl.la "-dlopen" self \
+               "-dlopen" foo1.la "-dlopen" libfoo2.la
 mdemo_DEPENDENCIES = ../libltdl/libltdl.la foo1.la libfoo2.la
 
 # Create a statically linked version of mdemo.