diff --git a/nettle/ChangeLog b/nettle/ChangeLog index 8783138bc7f9bcc9eabeba7d53f1e5fc7bcaa009..1443ef99e61ba6d25ff82cbad641780b3dbbde85 100644 --- a/nettle/ChangeLog +++ b/nettle/ChangeLog @@ -1,3 +1,13 @@ +2010-01-13 Niels M�ller <nisse@lysator.liu.se> + + * Makefile.in ($(LIBHOGWEED_FORLINK)): Depend on + $(LIBNETTLE_FORLINK). + + * configure.ac (LIBHOGWEED_LIBS): Added -lnettle -lgmp for the + default case. Follows debian, and also makes dlopen of + libhogweed.so work, without having to use RTLD_GLOBAL. + (LIBHOGWEED_LINK): Added -L., to find our libnettle.so. + 2009-10-21 Niels M�ller <nisse@lysator.liu.se> * tools/Makefile.in (pkcs1-conv$(EXEEXT)): Added dependency on diff --git a/nettle/Makefile.in b/nettle/Makefile.in index 82244f8d11f19c8777b59cc2c516678c7ab25f9a..1952743b501199f46de73991a543b13212e80f5e 100644 --- a/nettle/Makefile.in +++ b/nettle/Makefile.in @@ -148,7 +148,7 @@ $(LIBNETTLE_FORLINK): $(nettle_PURE_OBJS) [ -z "$(LIBNETTLE_SONAME)" ] || (cd .lib \ && ln -sf ../$(LIBNETTLE_FORLINK) $(LIBNETTLE_SONAME)) -$(LIBHOGWEED_FORLINK): $(hogweed_PURE_OBJS) +$(LIBHOGWEED_FORLINK): $(hogweed_PURE_OBJS) $(LIBNETTLE_FORLINK) $(LIBHOGWEED_LINK) $(hogweed_PURE_OBJS) -o $@ $(LIBHOGWEED_LIBS) -mkdir .lib 2>/dev/null [ -z "$(LIBHOGWEED_SONAME)" ] || (cd .lib \ diff --git a/nettle/configure.ac b/nettle/configure.ac index 616fa689997b168c3b5c16a33db615a6f0565ace..e18685090b2eee55f406f6a27fd62fc7e0a718fc 100644 --- a/nettle/configure.ac +++ b/nettle/configure.ac @@ -204,9 +204,13 @@ case "$host_os" in LIBHOGWEED_FORLINK=libhogweed.so LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)' LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' - LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(LIBHOGWEED_SONAME)' - # FIXME: It might make some sense to link with -lnettle -lgmp - LIBHOGWEED_LIBS='' + LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -L. -shared -Wl,-soname=$(LIBHOGWEED_SONAME)' + # Requested by debian, to make linking with only -lhogweed work + # (does not work in general, e.g., with static linking all of + # -lhogweed -lgmp -lnettle are still required). Also makes dlopen + # of libhogweed.so work, without having to use RTLD_GLOBAL. + # Depends on -L. above, to locate nettle.so. + LIBHOGWEED_LIBS='-lnettle -lgmp' ;; esac