Merge branch 'master' into release

5 files changed, 21 insertions, 42 deletions

diff --git a/.travis.yml b/.travis.yml
index 3feaebe..ea51b28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: c
 
+cache: ccache
+
 addons:
   apt:
     packages:
diff --git a/configure.ac b/configure.ac
index e2682b2..1dee623 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,6 @@ AC_PREREQ(2.69)
 AC_INIT(distcc, 3.2, distcc@lists.samba.org)
 
 AC_CONFIG_HEADERS(src/config.h)
-AC_CANONICAL_HOST
 
 # FreeBSD installs its version of libpopt into /usr/local/, but does
 # not put that on the default library and header path.
@@ -23,25 +22,6 @@ AC_CANONICAL_HOST
 # either set CPPFLAGS and LDFLAGS when running configure, or use
 # --with-extra-foo.
 
-##### defaults
-
-dnl --with-docdir
-AC_DEFUN([DISTCC_WITH_DOCDIR],
-[AC_ARG_WITH(docdir,
-            AC_HELP_STRING([--with-docdir=DIR],
-                           [Use DIR to store documentation files (default ${datadir}/doc/distcc)]),
-            [with_docdir=$withval])
-if test "x$with_docdir" = "x" ; then
-  docdir='${datadir}/doc/distcc'
-else
-  docdir=$with_docdir
-fi
-AC_SUBST(docdir)
-])
-
-dnl Run the check for --with-docdir
-DISTCC_WITH_DOCDIR
-
 # Check for socklen_t, and do something appropiate on systems
 # that don't have it.
 AC_CHECK_TYPE([socklen_t], ,[
@@ -100,6 +80,18 @@ AC_TRY_COMPILE([
 AC_ARG_WITH(included-popt,
 	AC_HELP_STRING([--with-included-popt], [use bundled popt library, not from system]))
 
+AC_ARG_ENABLE(pump-mode,
+	AC_HELP_STRING([--disable-pump-mode],
+		[include server support (pump mode), requires python]),
+		[pump_mode=${enableval}], [pump_mode=yes])
+
+# We prefer to use the latest Python
+if test "x${pump_mode}" = xyes; then
+	AM_PATH_PYTHON([3.1],,[:])
+	AC_ARG_VAR(PYTHON, [Python interpreter])
+	AC_SUBST(PYTHON_RELATIVE_LIB)
+fi
+
 AC_ARG_ENABLE(rfc2553,
 	AC_HELP_STRING([--enable-rfc2553], [use getaddrinfo, getnameinfo, etc]))
 
@@ -255,13 +247,6 @@ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
-# We prefer to use the latest Python
-#
-# NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present
-# in autoconf 2.53.
-AM_PATH_PYTHON([3.1],,[:])
-AC_ARG_VAR(PYTHON, [Python interpreter])
-AC_SUBST(PYTHON_RELATIVE_LIB)
 AC_C_INLINE
 AC_C_BIGENDIAN
 
@@ -540,7 +525,6 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 CC="$PTHREAD_CC"
 
 dnl ##### Output
-AC_SUBST(docdir)
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(CPPFLAGS)
diff --git a/src/arg.c b/src/arg.c
index 8edd9ba..1f2d334 100644
--- a/src/arg.c
+++ b/src/arg.c
@@ -136,7 +136,7 @@ int dcc_scan_args(char *argv[], char **input_file, char **output_file,
     int ret;
 
      /* allow for -o foo.o */
-    if ((ret = dcc_copy_argv(argv, ret_newargv, 2)) != 0)
+    if ((ret = dcc_copy_argv(argv, ret_newargv, 4)) != 0)
         return ret;
     argv = *ret_newargv;
 
diff --git a/src/compile.c b/src/compile.c
index 3dc5a75..a811c85 100644
--- a/src/compile.c
+++ b/src/compile.c
@@ -450,12 +450,6 @@ static int dcc_please_send_email_after_investigation(
  */
 static void dcc_rewrite_generic_compiler(char **argv)
 {
-#ifdef __APPLE__ /* FIXME */
-
-    assert(argv);
-
-    return;
-#else
     char linkbuf[MAXPATHLEN + 1], *link = NULL, *t;
     int ret, dir;
     ssize_t ssz;
@@ -522,7 +516,6 @@ static void dcc_rewrite_generic_compiler(char **argv)
         rs_trace("Rewriting '%s' to '%s'", "cc", "gcc");
     } else
         return;
-#endif
 }
 
 
@@ -689,7 +682,7 @@ dcc_build_somewhere(char *argv[],
     dcc_free_argv(argv);
     argv = new_argv;
     if (!getenv("DISTCC_NO_REWRITE_CROSS")) {
-        dcc_rewrite_generic_compiler(new_argv); /* does not work on Mac FIXME */
+        dcc_rewrite_generic_compiler(new_argv);
         dcc_add_clang_target(new_argv);
         dcc_gcc_rewrite_fqn(new_argv);
     }
@@ -896,7 +889,7 @@ dcc_build_somewhere(char *argv[],
     }
 
     if (!dcc_getenv_bool("DISTCC_FALLBACK", 1)) {
-        rs_log_warning("failed to distribute and fallbacks are disabled");
+        rs_log_error("failed to distribute and fallbacks are disabled");
         /* Try copying any server-side error message to stderr;
          * If we fail the user will miss all the messages from the server; so
          * we pretend we failed remotely.
diff --git a/src/distcc.c b/src/distcc.c
index 16d10a6..a1e56b2 100644
--- a/src/distcc.c
+++ b/src/distcc.c
@@ -241,13 +241,13 @@ int main(int argc, char **argv)
 
     dcc_trace_version();
 
-    compiler_name = (char *) dcc_find_basename(argv[0]);
-
-#if HAVE_LIBIBERTY    
+#if HAVE_LIBIBERTY
     /* Expand @FILE arguments. */
     expandargv(&argc, &argv);
 #endif
- 
+
+    compiler_name = (char *) dcc_find_basename(argv[0]);
+
     /* Ignore SIGPIPE; we consistently check error codes and will
      * see the EPIPE. */
     dcc_ignore_sigpipe(1);