summaryrefslogtreecommitdiff
blob: 425b27e2d8e04670e0a743f05a99f3e3ebb56552 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
--- configure.in.orig	2006-10-29 19:44:25.000000000 +1100
+++ configure.in	2006-10-29 19:45:02.000000000 +1100
@@ -147,9 +147,9 @@
 fi    
 
 dnl Makefile vars.
-HT_LDFLAGS="$HT_LIBS $HT_LDFLAGS"
 AC_SUBST(IO_DIR)
 AC_SUBST(HT_LDFLAGS)
+AC_SUBST(HT_LIBS)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
--- Makefile.am.orig	2006-10-29 19:44:31.000000000 +1100
+++ Makefile.am	2006-10-29 19:45:38.000000000 +1100
@@ -17,9 +17,8 @@
 
 INCLUDES	= -I$(srcdir)/$(ANALYSER_DIR) -I$(srcdir)/$(ASM_DIR) -I$(srcdir)/$(INFO_DIR) -I$(srcdir)/$(IO_DIR) -I$(srcdir)/$(COMIO_DIR) -I$(srcdir)/$(OUTPUT_DIR) -I$(srcdir)/$(EVAL_DIR) -I$(srcdir)/$(MINILZO_DIR) -I$(srcdir)/$(SRT_DIR) -I$(srcdir)
 
-ht_LDADD	= $(ANALYSER_DIR)/libanalyser.a $(ASM_DIR)/libasm.a $(INFO_DIR)/libinfo.a $(IO_DIR)/libhtio.a $(OUTPUT_DIR)/liboutput.a $(COMIO_DIR)/libcomio.a $(EVAL_DIR)/libhteval.a $(MINILZO_DIR)/liblzo.a $(SRT_DIR)/libsrt.a
+ht_LDADD	= $(ANALYSER_DIR)/libanalyser.a $(ASM_DIR)/libasm.a $(INFO_DIR)/libinfo.a $(IO_DIR)/libhtio.a $(OUTPUT_DIR)/liboutput.a $(COMIO_DIR)/libcomio.a $(EVAL_DIR)/libhteval.a $(MINILZO_DIR)/liblzo.a $(SRT_DIR)/libsrt.a @HT_LIBS@
 ht_LDFLAGS	= @HT_LDFLAGS@
-ht_LIBS		= @HT_LIBS@
 
 ht_SOURCES	= htdoc.c htdoc.h blockop.cc blockop.h coff_s.h common.cc common.h \
 config.h cstream.cc cstream.h demangle.h elfstruc.h htendian.cc \