Commit 3591eb53 authored by Niels Möller's avatar Niels Möller

More Cygwin fixes.

Rev: src/nettle/Makefile.am:1.80
Rev: src/nettle/configure.ac:1.43
parent 26e0654c
...@@ -138,9 +138,9 @@ SHLIBOBJECTS = $(patsubst %.c,%_p.$(OBJEXT),$(libnettle_a_SOURCES)) \ ...@@ -138,9 +138,9 @@ SHLIBOBJECTS = $(patsubst %.c,%_p.$(OBJEXT),$(libnettle_a_SOURCES)) \
# The point of the sym links is to use -Lnettle-dir at linktime, # The point of the sym links is to use -Lnettle-dir at linktime,
# and LD_LIBRARY_PATH=nettle-dir/.lib at run time. # and LD_LIBRARY_PATH=nettle-dir/.lib at run time.
$(SHLIBFORLINK): $(SHLIBOBJECTS) $(SHLIBFORLINK): $(SHLIBOBJECTS)
$(SHLIBLINK) $^ -o $@ $(SHLIBLINK) $^ -o $@ $(SHLIBLIBS)
-mkdir .lib 2>/dev/null -mkdir .lib 2>/dev/null
( [ -z "$(SHLIBSONAME)" ] || cd .lib \ [ -z "$(SHLIBSONAME)" ] || (cd .lib \
&& ln -sf ../$(SHLIBFORLINK) $(SHLIBSONAME)) && ln -sf ../$(SHLIBFORLINK) $(SHLIBSONAME))
endif endif
...@@ -151,8 +151,8 @@ install-data-local: $(SHLIBINSTALL) ...@@ -151,8 +151,8 @@ install-data-local: $(SHLIBINSTALL)
install-shared: $(SHLIBFORLINK) install-shared: $(SHLIBFORLINK)
$(INSTALL_DATA) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE) $(INSTALL_DATA) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE)
( [ -z "$(SHLIBSONAME)" ] \ [ -z "$(SHLIBSONAME)" ] \
|| cd $(DESTDIR)$(libdir) \ || (cd $(DESTDIR)$(libdir) \
&& ln -sf $(SHLIBFILE) $(SHLIBSONAME) \ && ln -sf $(SHLIBFILE) $(SHLIBSONAME) \
&& ln -sf $(SHLIBFILE) $(SHLIBFORLINK) ) && ln -sf $(SHLIBFILE) $(SHLIBFORLINK) )
......
...@@ -125,13 +125,16 @@ case `uname -sr` in ...@@ -125,13 +125,16 @@ case `uname -sr` in
SHLIBFORLINK='cygnettle-$(SHLIBMAJOR)-$(SHLIBMINOR).dll' SHLIBFORLINK='cygnettle-$(SHLIBMAJOR)-$(SHLIBMINOR).dll'
SHLIBSONAME='' SHLIBSONAME=''
SHLIBFILE='libnettle.dll.a' SHLIBFILE='libnettle.dll.a'
SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(SHLIBFILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive' SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(SHLIBFILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--no-whole-archive'
SHLIBLIBS='$(LIBS)'
;; ;;
*) *)
SHLIBFORLINK=libnettle.so SHLIBFORLINK=libnettle.so
SHLIBSONAME='$(SHLIBFORLINK).$(SHLIBMAJOR)' SHLIBSONAME='$(SHLIBFORLINK).$(SHLIBMAJOR)'
SHLIBFILE='$(SHLIBSONAME).$(SHLIBMINOR)' SHLIBFILE='$(SHLIBSONAME).$(SHLIBMINOR)'
SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME)' SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME)'
# FIXME: It might make some sense to link with -lgmp
SHLIBLIBS=''
;; ;;
esac esac
...@@ -159,7 +162,8 @@ AC_SUBST(SHLIBFILE) ...@@ -159,7 +162,8 @@ AC_SUBST(SHLIBFILE)
AC_SUBST(SHLIBLINK) AC_SUBST(SHLIBLINK)
AC_SUBST(SHLIBTARGET) AC_SUBST(SHLIBTARGET)
AC_SUBST(SHLIBINSTALL) AC_SUBST(SHLIBINSTALL)
AC_SUBST(SHLIBLIBS)
AC_PATH_PROG(M4, m4, m4) AC_PATH_PROG(M4, m4, m4)
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment