* mdemo/README: Explain the deliberate incompleteness of the

Windows port.
* mdemo/configure.in: Use AC_LIBTOOL_WIN32_DLL.
* mdemo/Makefile.am (LDFLAGS):  Add -no-undefined.

diff --git a/ChangeLog b/ChangeLog
index a5dacb29aa329d8687ab4b245f3e50e6d3fcf2eb..bbca8b2f617e2da9bd85431b71fdf8c3f948dbf8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-01-14  Gary V. Vaughan  <gary@oranda.demon.co.uk>
 
+       * mdemo/README: Explain the deliberate incompleteness of the
+       Windows port.
+       * mdemo/configure.in: Use AC_LIBTOOL_WIN32_DLL.
+       * mdemo/Makefile.am (LDFLAGS):  Add -no-undefined.
+
        * libltdl/ltdl.h (LTDL_STMT_START, LTDL_STMT_END):  Macros for
        wrapping other macros to make a portable compound statement from
        multiple C statements in the expansion.

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index d37bacdbde33892063b2695297c8fbef8349adc9..1eda10ea1068054d3f27d5a38b15bd942e4adeda 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -10,11 +10,11 @@ lib_LTLIBRARIES = foo1.la libfoo2.la
 
 foo1_la_SOURCES = foo1.c
 foo1_la_LIBADD = $(LIBM)
-foo1_la_LDFLAGS = -module -avoid-version
+foo1_la_LDFLAGS = -no-undefined -module -avoid-version
 
 libfoo2_la_SOURCES = foo2.c
 libfoo2_la_LIBADD = $(LIBM)
-libfoo2_la_LDFLAGS = -module -export-symbols-regex "libfoo2.*"
+libfoo2_la_LDFLAGS = -no-undefined -module -export-symbols-regex "libfoo2.*"
 
 noinst_HEADERS = foo.h
 

diff --git a/mdemo/README b/mdemo/README
index adb625562c6cdf6d38465379b6ddef4c66f801e9..936396a9bb37a1e2a8f4905fec634db7e745437d 100644 (file)
--- a/mdemo/README
+++ b/mdemo/README
@@ -8,3 +8,10 @@ wrapper called "libltdl".
 All exported symbols are prefixed with "libname_LTX_" to avoid
 symbols conflicts, especially when linking statically.
 libltdl will automatically cut the prefix off to get the real name.
+
+Note that on Windows, for the purposes of illustrating ltdl, the
+libraries *are* built as dll's, but do not have the __declspec
+machinery to make them suitable for loading at link time.  This is
+only for clarity inside this example, look at the example in ../demo
+to see how the __declspec macros should be set up.
+

diff --git a/mdemo/configure.in b/mdemo/configure.in
index c01bdf2645928676644fe01ec56e6beebc9f2535..363d18de896ef72d28468bc3f93ff5b47f3f665f 100644 (file)
--- a/mdemo/configure.in
+++ b/mdemo/configure.in
@@ -14,6 +14,7 @@ dnl on demand even with broken makes
 AC_LIBLTDL_CONVENIENCE(../libltdl)
 AC_SUBST(LIBLTDL)
 
+AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)