WIP autoolslib-exp

5 files changed, 38 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 08504f2..99b2816 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@
 # Deps & libs
 .deps
 .libs
+*.def
 
 # http://www.gnu.org/software/automake
 
@@ -56,4 +57,8 @@ Makefile
 /config.log
 /config.status
 /libtool
-/ltmain.sh
\ No newline at end of file
+/ltmain.sh
+
+# configure2-generated
+
+config.mak
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index 1c8ce13..0a6605a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,5 +2,18 @@ ACLOCAL_AMFLAGS = -I m4
 
 lib_LTLIBRARIES  = libdl.la
 libdl_la_SOURCES = dlfcn.c
-libdl_la_LDFLAGS = -no-undefined
-include_HEADERS = dlfcn.h
\ No newline at end of file
+# Don't build libdl as libdl-0.dll
+libdl_la_LDFLAGS = -avoid-version -no-undefined @GEN_DEF@
+include_HEADERS = dlfcn.h
+
+$(lib_LTLIBRARIES): @LIBDL_MSVC_LIB@
+
+libdl.lib:
+        $(MSVCLIB) -def:libdl.def -out:libdl.lib
+
+install-exec:: @EXTRA_INSTALL@
+
+install-msvc-lib:
+        mkdir -p "$(DESTDIR)$(libdir)"
+        @echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libdir)'"
+        $(INSTALL_DATA) libdl.lib "$(DESTDIR)$(libdir)"
diff --git a/acinclude.m4 b/acinclude.m4
index 352fbdd..57a1c98 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -28,6 +28,7 @@
 # - MINGW_AC_MSVC_IMPORT_LIBS:
 #   - Renamed the option to --enable-msvc for compatibility with the old
 #     configure script.
+#   - Error if shared lib is not enabled.
 # - Cosmetics:
 #   - Use '' instead of `'
 
@@ -48,7 +49,10 @@ AC_DEFUN([MINGW_AC_MSVC_IMPORT_LIBS],
   [enable building of MSVC compatible import libraries]),[],
   [enable_msvc=no])
  AC_CHECK_TOOL([MSVCLIB], [lib])
- if test "x$enable_msvc" = xyes && test -n "$MSVCLIB"
+
+ if test "x$enable_msvc" = xyes && test "x$enable_shared" != xyes
+ then AC_MSG_ERROR([MSVC import lib requested but shared lib not enabled.])
+ elif test "x$enable_msvc" = xyes && test -n "$MSVCLIB"
  then $1="$2"
  elif test "x$enable_msvc" = xyes
  then AC_MSG_WARN([no MSVC compatible 'lib' program found in \$PATH
diff --git a/configure.ac b/configure.ac
index c9596bd..60baafd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,8 @@ AC_CANONICAL_BUILD
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT
 
+# Set the flags here to make libtool catch the flags
+CFLAGS='-Wall -O3 -fomit-frame-pointer'
 AC_PROG_CC
 
 AC_MSG_CHECKING([windows.h and win32 API])
@@ -26,6 +28,15 @@ AC_LINK_IFELSE([
 ])
 
 MINGW_AC_MSVC_IMPORT_LIBS([LIBDL_MSVC_LIB], [libdl.lib])
+AC_SUBST([LIBDL_MSVC_LIB])
+
+test -n "${LIBDL_MSVC_LIB}" && \
+    GEN_DEF="-Wl,--output-def,libdl.def" && \
+    EXTRA_INSTALL="install-msvc-lib"
+AC_SUBST([GEN_DEF])
+AC_SUBST([EXTRA_INSTALL])
+
+test -n 
 
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT
\ No newline at end of file
diff --git a/configure2 b/configure2
index ba5fcd7..1ea0e86 100755
--- a/configure2
+++ b/configure2
@@ -232,4 +232,4 @@ if enabled shared; then
 fi
 echo "wine:   $wine $winecmd"
 
-echo "Run `make -f Makefile2` to build."
\ No newline at end of file
+echo "Run \`make -f Makefile2\` to build."
\ No newline at end of file