From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 31 Jan 2009 11:44:58 +0000 (+1300)
Subject: Fix link error on ufsdump
X-Git-Tag: SQUID_3_2_0_1~1232
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=641ac151f22b68c045a0604916c0832066a98e76;p=thirdparty%2Fsquid.git

Fix link error on ufsdump

It appears that libmiscutil MUST be linked after all used local .la libs
or it's symbols may get dropped.
---

diff --git a/include/heap.h b/include/heap.h
index 70d2e846d2..41e65b1f81 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -53,7 +53,7 @@
  * the current aging factor for the heap.
  */
 typedef unsigned long heap_mutex_t;
-typedef void *heap_t;
+typedef void * heap_t;
 typedef double heap_key;
 typedef heap_key heap_key_func(heap_t, heap_key);
 
@@ -105,7 +105,7 @@ SQUIDCEXTERN void delete_heap(heap *);
  * should be done with this data structure (especially modifying it!)  The
  * heap does not assume ownership of the data passed to it.
  */
-SQUIDCEXTERN heap_node *heap_insert(heap *, heap_t dat);
+SQUIDCEXTERN heap_node *heap_insert(heap *hp, heap_t dat);
 
 /*
  * Delete a node out of a heap.  Returns the heap data from the deleted
diff --git a/lib/heap.c b/lib/heap.c
index 2f68c9a1c5..7675ee4f98 100644
--- a/lib/heap.c
+++ b/lib/heap.c
@@ -53,7 +53,6 @@
 #include <stdio.h>
 #endif
 
-#include "heap.h"
 #include "util.h"
 
 /*
diff --git a/src/Makefile.am b/src/Makefile.am
index 24ff3a6a66..45e247e4ec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -919,7 +919,6 @@ ufsdump_LDADD = \
 	libauth.la \
 	icmp/libicmp.la icmp/libicmp-core.la \
 	ip/libip.la \
-	-L../lib -lmiscutil \
 	@XTRA_OBJS@ \
 	@REPL_OBJS@ \
 	@STORE_OBJS@ \
@@ -929,6 +928,7 @@ ufsdump_LDADD = \
 	@SNMPLIB@ \
 	${ADAPTATION_LIBS} \
 	@SSLLIB@ \
+	-L$(top_builddir)/lib -lmiscutil \
 	@XTRA_LIBS@ \
 	@EPOLL_LIBS@ \
 	@MINGW_LIBS@