Ticket #9167: implib.patch

src/aclocal.m4

@@ -232 +232 @@
 AC_SUBST(LIBEXT)
 AC_SUBST(SHAREDEXT)dnl  Name components of a dynamically linked library
 AC_SUBST(SHAREDPREFIX)
+AC_SUBST(IMPLIB_EXT)dnl Name components of a dynamically linked library import file
+AC_SUBST(IMPLIB_PREFIX)
 AC_SUBST(OBJEXT)dnl     These are set by autoconf
 AC_SUBST(EXEEXT)
 AC_SUBST(INSTALL_TARGET)dnl Which type of installation: flat directory or unix like.
@@ -241 +243 @@
 ECL_LDRPATH=''
 SHAREDEXT='so'
 SHAREDPREFIX='lib'
+IMPLIB_EXT=''
+IMPLIB_PREFIX=''
 LIBPREFIX='lib'
 LIBEXT='a'
 PICFLAG='-fPIC'
@@ -252 +256 @@
 clibs=''
 SONAME=''
 SONAME_LDFLAGS=''
+IMPLIB_NAME=''
+IMPLIB_LDFLAGS=''
 case "${host_os}" in
         # libdir may have a dollar expression inside
         linux*)
@@ -354 +360 @@
                 shared='yes'
                 THREAD_CFLAGS='-D_THREAD_SAFE'
                 THREAD_LIBS='-lpthread'
-                SHARED_LDFLAGS="-shared ${LDFLAGS}"
-                BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
-                SHAREDPREFIX=''
+                SHARED_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
+                BUNDLE_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
+                SHAREDPREFIX='cyg'
                 SHAREDEXT='dll'
+                IMPLIB_PREFIX='lib'
+                IMPLIB_EXT='dll.a'
+                IMPLIB_NAME="${IMPLIB_PREFIX}ecl.${IMPLIB_EXT}"
+                IMPLIB_LDFLAGS="-Wl,--out-implib,${IMPLIB_NAME}"
                 PICFLAG=''
                 ;;
         mingw*)
@@ -367 +377 @@
                 enable_threads='yes'
                 THREAD_CFLAGS='-D_THREAD_SAFE'
                 THREAD_GC_FLAGS='--enable-threads=win32'
-                SHARED_LDFLAGS=''
-                BUNDLE_LDFLAGS=''
+                SHARED_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
+                BUNDLE_LDFLAGS="-shared -Wl,--enable-auto-image-base ${LDFLAGS}"
                 SHAREDPREFIX=''
                 SHAREDEXT='dll'
+                IMPLIB_PREFIX='lib'
+                IMPLIB_EXT='dll.a'
+                IMPLIB_NAME="${IMPLIB_PREFIX}ecl.${IMPLIB_EXT}"
+                IMPLIB_LDFLAGS="-Wl,--out-implib,${IMPLIB_NAME}"
                 PICFLAG=''
                 INSTALL_TARGET='flatinstall'
                 TCPLIBS='-lws2_32'

src/compile.lsp.in

@@ -42 +42 @@
 ;;;
 ;;; * Add include path to not yet installed headers, and remove include flag
 ;;;   (-I) to installed directory, and Notice that we must explicitely mention
-;;;   libecl.so/ecl.dll instead of using -lecl. This is to avoid interference
+;;;   libecl.so/cygecl.dll instead of using -lecl. This is to avoid interference
 ;;;   with an already installed copy of ECL.
 ;;;
 (setq c::*cc-flags*
@@ -50 +50 @@
       #+msvc "@CFLAGS@ @ECL_CFLAGS@"
       c::*ecl-include-directory* "@true_builddir@/"
       c::*ecl-library-directory* "@true_builddir@/")
-#-:wants-dlopen 
+#-:wants-dlopen
 (setf c::*ld-flags*
       "@LDFLAGS@ @LIBPREFIX@ecl.@LIBEXT@ @CORE_LIBS@ @LIBS@ @FASL_LIBS@")
 #+(and :wants-dlopen (not nonstop))
@@ -124 +124 @@
 ;;;
 ;;; We do not need the -rpath flag for the library, nor -lecl.
 ;;;
-(let* ((c::*ld-shared-flags* #-msvc "@SHARED_LDFLAGS@ @LDFLAGS@ @SONAME_LDFLAGS@ @CORE_LIBS@ @LIBS@ @FASL_LIBS@"
+(let* ((c::*ld-shared-flags* #-msvc " @IMPLIB_LDFLAGS@ @SHARED_LDFLAGS@ @LDFLAGS@ @SONAME_LDFLAGS@ @CORE_LIBS@ @LIBS@ @FASL_LIBS@"
                              #+msvc "@SHARED_LDFLAGS@ @LDFLAGS@ @STATICLIBS@ @CLIBS@")
        (c::*cc-flags* (concatenate 'string "-DECL_API -I@true_builddir@/c " c::*cc-flags*))
        (extra-args nil))

src/configure.in

@@ -576 +576 @@
 AC_SUBST(SONAME)
 AC_SUBST(SONAME_LDFLAGS)
 
+dnl ----------------------------------------------------------------------
+dnl IMPLIB_NAME is only active when IMPLIB_NAME is non nil
+dnl
+AC_MSG_CHECKING(for import name)
+if test "${enable_soname}" != yes; then
+   IMPLIB_NAME=''
+   AC_MSG_RESULT([none])
+else
+   AC_MSG_RESULT([${IMPLIB_NAME}])
+fi
+AC_SUBST(IMPLIB_NAME)
+AC_SUBST(IMPLIB_LDFLAGS)
+
 dnl Related to that, the package version number
 ECL_VERSION_NUMBER=$(($PACKAGE_MAJOR * 10000 + $PACKAGE_MINOR * 100 + $PACKAGE_LEAST))
 AC_SUBST(ECL_VERSION_NUMBER)

src/Makefile.in

@@ -174 +174 @@
           if test -s $$i ; then \
            if echo $$i | grep dll; then \
             $(INSTALL_LIBRARY) $$i $(DESTDIR)$(bindir); \
-           fi; \
-           $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \
+           else \
+            $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \
+           fi \
           fi \
         done
+        if [ "x@IMPLIB_NAME@" != "x" -a -f "@IMPLIB_NAME@" ]; then \
+          $(INSTALL_LIBRARY) @IMPLIB_NAME@ $(DESTDIR)$(libdir); \
+        fi
         if [ "x@SONAME@" != "x" -a -f "@SONAME@" ]; then \
           ( cd $(DESTDIR)$(libdir) && $(RM) -f @SONAME3@ @SONAME2@ @SONAME1@ && \
             mv @SONAME@ @SONAME3@ && \