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 f1e4a3f52b70fdb191312aa9ad47231f9ec9723b..c171af841c7e40ef3451ef4aade6314271aa02e8 100644 (file)
--- a/include/heap.h
+++ b/include/heap.h
@@ -51,7 +51,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);
 
@@ -103,7 +103,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 9daefcf2131c85312098e4edd1c68f49665f44ee..8900ee0d226b1bf543eb25377dae39c4ef6800cd 100644 (file)
--- 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 9a33acbad5c745895ff33606f44fa3fc349111a2..66aa0eb3f0be04e01f4ead56167e4c6f105b6981 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -887,7 +887,6 @@ ufsdump_SOURCES = \
 ufsdump_LDADD = \
        libsquid.la \
        libauth.la \
-       -L../lib -lmiscutil \
        @XTRA_OBJS@ \
        @REPL_OBJS@ \
        @STORE_OBJS@ \
@@ -897,6 +896,7 @@ ufsdump_LDADD = \
        @SNMPLIB@ \
        @ICAP_LIBS@ \
        @SSLLIB@ \
+       -L$(top_builddir)/lib -lmiscutil \
        @XTRA_LIBS@ \
        @EPOLL_LIBS@ \
        @MINGW_LIBS@