Make LIBTOOL invocations explicit

[Alex Kiernan]

Alex Kiernan <alexk at demon.net> writes:

> To build with purify & libtool, I needed these diffs to the Makefiles
> (problem is that libtool can't infer its operating mode as all it has
> is `purify') - there'll be some skew patching as I've hand removed
> some other changes:
> 

Argh, and when a Makefile creates two build methods out of one, test
both of them (apply lart to self). Please can you apply this one too:

Index: configure.in
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/configure.in,v
retrieving revision 1.194
diff -u -r1.194 configure.in
--- configure.in	2001/01/29 16:50:38	1.194
+++ configure.in	2001/02/05 23:37:18
@@ -66,19 +66,28 @@
     EXTLIB='la'
     EXTOBJ='lo'
     LIBTOOL='../libtool'
-    UPLIBTOOL='../../libtool'
+    LIBTOOLCC='../libtool --mode=compile'
+    UPLIBTOOLCC='../../libtool --mode=compile'
+    LIBTOOLLD='../libtool --mode=link'
+    UPLIBTOOLLD='../../libtool --mode=link'
 else
     AC_CANONICAL_HOST
     AC_PROG_CC
     EXTLIB='a'
     EXTOBJ='o'
     LIBTOOL=''
-    UPLIBTOOL=''
+    LIBTOOLCC=''
+    UPLIBTOOLCC=''
+    LIBTOOLLD=''
+    UPLIBTOOLLD=''
     AC_SUBST(LIBTOOL)
 fi
 AC_SUBST(EXTLIB)
 AC_SUBST(EXTOBJ)
-AC_SUBST(UPLIBTOOL)
+AC_SUBST(LIBTOOLCC)
+AC_SUBST(UPLIBTOOLCC)
+AC_SUBST(LIBTOOLLD)
+AC_SUBST(UPLIBTOOLLD)
 
 dnl INN has quite a few more configurable paths than autoconf supports by
 dnl default.  For right now, those additional paths are configured with
Index: Makefile.global.in
===================================================================
RCS file: /upstream-repositories/inn-cvs.isc.org/inn/Makefile.global.in,v
retrieving revision 1.53
diff -u -r1.53 Makefile.global.in
--- Makefile.global.in	2001/02/05 22:42:08	1.53
+++ Makefile.global.in	2001/02/05 23:37:18
@@ -65,14 +65,17 @@
 ##  directories two levels deep.
 
 LIBTOOL         = @LIBTOOL@
-UPLIBTOOL       = @UPLIBTOOL@
+LIBTOOLCC       = @LIBTOOLCC@
+UPLIBTOOLCC     = @UPLIBTOOLCC@
+LIBTOOLLD       = @LIBTOOLLD@
+UPLIBTOOLLD     = @UPLIBTOOLLD@
 EXTOBJ          = @EXTOBJ@
 EXTLIB          = @EXTLIB@
 
-LIBCC           = $(LIBTOOL) --mode=compile $(CC)
-LIBLD           = $(LIBTOOL) --mode=link $(CC)
-UPLIBCC         = $(UPLIBTOOL) --mode=compile $(CC)
-UPLIBLD         = $(UPLIBTOOL) --mode=link $(CC)
+LIBCC           = $(LIBTOOLCC) $(CC)
+LIBLD           = $(LIBTOOLLD) $(CC)
+UPLIBCC         = $(UPLIBTOOLCC) $(CC)
+UPLIBLD         = $(UPLIBTOOLLD) $(CC)
 
 ##  INN libraries.  Nearly all INN programs are linked with libinn, and any
 ##  INN program that reads from or writes to article storage or overview is

-- 
Alex Kiernan, Principal Engineer, Development, Thus PLC