* configure.ac (LOCAL_NETTLE_DEP): When building with the bundled

nettle library, setup a dependency when linking.
* src/Makefile.in (LOCAL_NETTLE_DEP): Use it here.

Rev: ChangeLog:1.1056
Rev: configure.ac:1.98
Rev: src/Makefile.in:1.52

ChangeLog

+2010-06-01  Niels Mller  <nisse@lysator.liu.se>
+
+	* configure.ac (LOCAL_NETTLE_DEP): When building with the bundled
+	nettle library, setup a dependency when linking.
+	* src/Makefile.in (LOCAL_NETTLE_DEP): Use it here.
+
 2010-05-25  Niels Mller  <nisse@lysator.liu.se>
 
 	* src/lsh-keygen.c (dsa_generate_key): Updated call to

configure.ac

@@ -619,6 +619,8 @@ if test x$with_system_argp = xno ; then
   LIB_ARGP="-largp"
 fi
 
+LOCAL_NETTLE_DEP=''
+
 if test x$with_system_nettle = xno ; then
   AC_CONFIG_COMMANDS([nettle-symlinks],
   [nettle_srcdir="`cd "$srcdir/nettle" && pwd`"
@@ -626,8 +628,11 @@ if test x$with_system_nettle = xno ; then
     (mkdir $d 2>/dev/null; cd $d && rm -f nettle nettle_builddir && ln -s ../nettle nettle_builddir && ln -s $nettle_srcdir nettle)
   done])
   BUILD_SUBDIRS="$BUILD_SUBDIRS nettle"
+  LOCAL_NETTLE_DEP="nettle_builddir/libnettle.a nettle_builddir/libhogweed.a"
 fi
 
+AC_SUBST(LOCAL_NETTLE_DEP)
+
 if test x$with_system_libspki = xno ; then
   AC_CONFIG_COMMANDS([libspki-symlinks],
   [spki_srcdir="`cd "$srcdir/spki" && pwd`"

src/Makefile.in

@@ -18,6 +18,8 @@ MKDIR_P = @MKDIR_P@
 
 AUTOHEADER = autoheader
 
+LOCAL_NETTLE_DEP = @LOCAL_NETTLE_DEP@
+
 SUBDIRS = testsuite
 
 include config.make
@@ -297,28 +299,28 @@ packet_types.h: ssh.h invert-defs
 lsh$(EXEEXT): $(lsh_OBJS)
 	$(LINK) $(lsh_OBJS) $(LIBS) -o $@
 
-lsh-transport$(EXEEXT): $(lsh_transport_OBJS)
+lsh-transport$(EXEEXT): $(lsh_transport_OBJS) $(LOCAL_NETTLE_DEP)
 	$(LINK) $(lsh_transport_OBJS) -lspki -lhogweed -lnettle $(LIBS) -o $@
 
-lsh-keygen$(EXEEXT): $(lsh_keygen_OBJS)
+lsh-keygen$(EXEEXT): $(lsh_keygen_OBJS) $(LOCAL_NETTLE_DEP)
 	$(LINK) $(lsh_keygen_OBJS) -lspki -lhogweed -lnettle $(LIBS) -o $@
 
-lsh-decrypt-key$(EXEEXT): $(lsh_decrypt_key_OBJS)
+lsh-decrypt-key$(EXEEXT): $(lsh_decrypt_key_OBJS) $(LOCAL_NETTLE_DEP)
 	$(LINK) $(lsh_decrypt_key_OBJS) -lspki -lhogweed -lnettle $(LIBS) -o $@
 
-lsh-decode-key$(EXEEXT): $(lsh_decode_key_OBJS)
+lsh-decode-key$(EXEEXT): $(lsh_decode_key_OBJS) $(LOCAL_NETTLE_DEP)
 	$(LINK) $(lsh_decode_key_OBJS) -lspki -lhogweed -lnettle $(LIBS) -o $@
 
-lsh-export-key$(EXEEXT): $(lsh_export_key_OBJS)
+lsh-export-key$(EXEEXT): $(lsh_export_key_OBJS) $(LOCAL_NETTLE_DEP)
 	$(LINK) $(lsh_export_key_OBJS) -lspki -lhogweed -lnettle $(LIBS) -o $@
 
-lsh-make-seed$(EXEEXT): $(lsh_make_seed_OBJS)
+lsh-make-seed$(EXEEXT): $(lsh_make_seed_OBJS) $(LOCAL_NETTLE_DEP)
 	$(LINK) $(lsh_make_seed_OBJS) -lspki -lhogweed -lnettle $(LIBS) -o $@
 
-lshd$(EXEEXT): $(lshd_OBJS)
+lshd$(EXEEXT): $(lshd_OBJS) $(LOCAL_NETTLE_DEP)
 	$(LINK) $(lshd_OBJS) -lspki -lhogweed -lnettle $(LIBS) -o $@
 
-lshd-userauth$(EXEEXT): $(lshd_userauth_OBJS)
+lshd-userauth$(EXEEXT): $(lshd_userauth_OBJS) $(LOCAL_NETTLE_DEP)
 	$(LINK) $(lshd_userauth_OBJS) -lspki -lhogweed -lnettle $(LIBS) -o $@
 
 lshd-connection$(EXEEXT): $(lshd_connection_OBJS)