From 3591eb531f23e121f5a696e49bc1084c25c0f995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Thu, 23 Sep 2004 18:31:49 +0200
Subject: [PATCH] More Cygwin fixes.
Rev: src/nettle/Makefile.am:1.80
Rev: src/nettle/configure.ac:1.43
---
Makefile.am | 8 ++++----
configure.ac | 8 ++++++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5d9e8aad..a0ca2d16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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,
# and LD_LIBRARY_PATH=nettle-dir/.lib at run time.
$(SHLIBFORLINK): $(SHLIBOBJECTS)
- $(SHLIBLINK) $^ -o $@
+ $(SHLIBLINK) $^ -o $@ $(SHLIBLIBS)
-mkdir .lib 2>/dev/null
- ( [ -z "$(SHLIBSONAME)" ] || cd .lib \
+ [ -z "$(SHLIBSONAME)" ] || (cd .lib \
&& ln -sf ../$(SHLIBFORLINK) $(SHLIBSONAME))
endif
@@ -151,8 +151,8 @@ install-data-local: $(SHLIBINSTALL)
install-shared: $(SHLIBFORLINK)
$(INSTALL_DATA) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE)
- ( [ -z "$(SHLIBSONAME)" ] \
- || cd $(DESTDIR)$(libdir) \
+ [ -z "$(SHLIBSONAME)" ] \
+ || (cd $(DESTDIR)$(libdir) \
&& ln -sf $(SHLIBFILE) $(SHLIBSONAME) \
&& ln -sf $(SHLIBFILE) $(SHLIBFORLINK) )
diff --git a/configure.ac b/configure.ac
index 559a55f8..5c6e1476 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,13 +125,16 @@ case `uname -sr` in
SHLIBFORLINK='cygnettle-$(SHLIBMAJOR)-$(SHLIBMINOR).dll'
SHLIBSONAME=''
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
SHLIBSONAME='$(SHLIBFORLINK).$(SHLIBMAJOR)'
SHLIBFILE='$(SHLIBSONAME).$(SHLIBMINOR)'
SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME)'
+ # FIXME: It might make some sense to link with -lgmp
+ SHLIBLIBS=''
;;
esac
@@ -159,7 +162,8 @@ AC_SUBST(SHLIBFILE)
AC_SUBST(SHLIBLINK)
AC_SUBST(SHLIBTARGET)
AC_SUBST(SHLIBINSTALL)
-
+AC_SUBST(SHLIBLIBS)
+
AC_PATH_PROG(M4, m4, m4)
# Checks for typedefs, structures, and compiler characteristics.
--
GitLab