William A. Rowe, Jr. wrote:
> LIBTOOL = /bin/sh /usr/local/apache20/build/libtool --silent
> SH_LIBTOOL = /bin/sh /usr/local/apache20/build/libtool --silent
> 
> I don't know where it came up with that nonsense...
> 
> APR & APR-UTIL are installed in /usr/local/apr, httpd in /usr/local/apache20.
> 
> It seems like config_vars.mk is imagining something, we use apr's libtool.

Badda bing badda boom.

Here's my suggested gross hack, which should handle the config_vars.mk libtool
relocation, for strictly in-tree apr builds, and leave it alone for builds
against a system apr.  It also avoids changing SH_LIBTOOL which was always
simply $(LIBTOOL).

Anyone see a better alternative?


Index: Makefile.in
===================================================================
--- Makefile.in	(revision 486457)
+++ Makefile.in	(working copy)
@@ -93,8 +93,10 @@
 	@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) 
 	@cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
 	cp build/*.mk $(DESTDIR)$(installbuilddir); \
-	sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
+	if [ -f srclib/apr/libtool ]; then \
+	  sed 's#i^LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
 	    build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
+	fi;
 	cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
 	cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
 

Reply via email to