[distcc] BUG: failure to compile distcc 2.13 out-of-tree

[Dennis Henriksen]

Distcc version 2.3 does not support compiling out of the source tree in 
its current state.  Using the process outline below
it becomes evident that, -I ./src is missing from the CPPFLAGS in 
Makefile.in and that configure doesnt create the necessary
subdirs eg. popt and lzo.

    cd /usr/src/
    bzcat2 distcc-2.13.tar.bz2 | tar xf -

    cd /usr/local/build/i386-linux   
    mkdir distcc   
    cd distcc
    /usr/src/distcc-2.13/configure --without-gtk --without-gnome   
    make

Please consider the attached patch as a means to achieve support for 
compiling distcc out-of-tree.

regards
Dennis Henriksen




-------------- next part --------------
diff -urN distcc-2.13/Makefile.in distcc-2.13.osrl/Makefile.in
--- distcc-2.13/Makefile.in	Mon Jan 12 02:01:20 2004
+++ distcc-2.13.osrl/Makefile.in	Sat Apr  3 13:40:45 2004
@@ -30,7 +30,7 @@
 LDFLAGS = @LDFLAGS@
 CC = @CC@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@ ${DIR_DEFS} -I$(srcdir)/lzo
+CPPFLAGS = @CPPFLAGS@ ${DIR_DEFS} -Isrc -I$(srcdir)/lzo
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
diff -urN distcc-2.13/configure.ac distcc-2.13.osrl/configure.ac
--- distcc-2.13/configure.ac	Tue Mar  2 06:01:17 2004
+++ distcc-2.13.osrl/configure.ac	Sat Apr  3 15:00:02 2004
@@ -389,7 +389,7 @@
 dnl AC_DEFINE_UNQUOTED(PACKAGE, $PACKAGE, [Package name])
 dnl AC_DEFINE_UNQUOTED(VERSION, $VERSION, [Package version])
 AC_DEFINE_UNQUOTED(GNU_HOST, ["$host"], [Your gnu-style host triple])
-AC_OUTPUT([Makefile])
+AC_OUTPUT([Makefile] popt/.stamp-conf lzo/.stamp-conf )
 
 
 ##### Finalization
diff -urN distcc-2.13/lzo/.stamp-conf.in distcc-2.13.osrl/lzo/.stamp-conf.in
--- distcc-2.13/lzo/.stamp-conf.in	Thu Jan  1 01:00:00 1970
+++ distcc-2.13.osrl/lzo/.stamp-conf.in	Sat Apr  3 16:14:39 2004
@@ -0,0 +1 @@
+ at src_dir@
diff -urN distcc-2.13/popt/.stamp-conf.in distcc-2.13.osrl/popt/.stamp-conf.in
--- distcc-2.13/popt/.stamp-conf.in	Thu Jan  1 01:00:00 1970
+++ distcc-2.13.osrl/popt/.stamp-conf.in	Sat Apr  3 16:14:35 2004
@@ -0,0 +1 @@
+ at src_dir@