diff options
| author | Craig Silverstein <csilvers@khanacademy.org> | 2008-06-03 23:06:38 +0000 |
|---|---|---|
| committer | Craig Silverstein <csilvers@khanacademy.org> | 2008-06-03 23:06:38 +0000 |
| commit | a5c67a43bf6e1a27e727506b39f5969e36bc3110 (patch) | |
| tree | a331b0b2a693b15a1273afa29112680055f86bb6 | |
| parent | 6a9e89db36740adb188e420848005991360bbb43 (diff) | |
| download | distcc-git-a5c67a43bf6e1a27e727506b39f5969e36bc3110.tar.gz | |
Fix up the list of zeroconf files needed to actually compile distcc
and distccd.
Tested by installing avahi and running 'make' plus 'make check'.
Reviewed by klarlund
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index c81f051..86b9588 100644 --- a/Makefile.in +++ b/Makefile.in @@ -234,7 +234,8 @@ common_obj = src/arg.o src/argutil.o \ src/dotd.o \ src/hosts.o src/hostfile.o \ src/implicit.o src/loadfile.o \ - lzo/minilzo.o + lzo/minilzo.o \ + @ZEROCONF_COMMON_OBJS@ distcc_obj = src/backoff.o \ src/climasq.o src/clinet.o src/clirpc.o \ @@ -859,7 +860,7 @@ daemon-installcheck: benchmark: @echo "The distcc macro-benchmark uses your existing distcc installation" - @if [ "$$DISTCC_HOSTS" ]; \ + @if [ -n "$$DISTCC_HOSTS" ]; \ then echo "DISTCC_HOSTS=\"$$DISTCC_HOSTS\""; \ else echo "You must set up servers and set DISTCC_HOSTS before running the benchmark"; \ exit 1; \ diff --git a/configure.ac b/configure.ac index e8e62e7..d0e5a74 100644 --- a/configure.ac +++ b/configure.ac @@ -441,10 +441,13 @@ PKG_CHECK_MODULES(AVAHI, [avahi-client >= 0.6], [AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available]) CFLAGS="$CFLAGS $AVAHI_CFLAGS" LIBS="$LIBS $AVAHI_LIBS" -ZEROCONF_DISTCC_OBJS="src/zeroconf.o" +ZEROCONF_COMMON_OBJS="src/zeroconf.o src/gcc-id.o" +ZEROCONF_DISTCC_OBJS="" ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o"], -[ZEROCONF_DISTCC_OBJS="" +[ZEROCONF_COMMON_OBJS="" +ZEROCONF_DISTCC_OBJS="" ZEROCONF_DISTCCD_OBJS=""]) +AC_SUBST(ZEROCONF_COMMON_OBJS) AC_SUBST(ZEROCONF_DISTCC_OBJS) AC_SUBST(ZEROCONF_DISTCCD_OBJS) |