Support @FILE arguments correctly. Requires GNU libiberty.

Fixes issue 85

git-svn-id: http://distcc.googlecode.com/svn/trunk@774 01de4be4-8c4a-0410-9132-4925637da917

3 files changed, 10 insertions, 1 deletions

diff --git a/INSTALL b/INSTALL
index fc4a134..4e89782 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ QUICK SUMMARY
 
 0. Install prerequisites.  For example, on Debian or Ubuntu, you could use
 
-      sudo apt-get install gcc make python python-dev
+      sudo apt-get install gcc make python python-dev binutils-dev
 
 1. Build and install
 
@@ -51,6 +51,7 @@ To build distcc you need
 
    GNU Make
    A C compiler
+   GNU libiberty (distributed with GNU Binutils and GCC)
 
 It is also highly desireable to have
 
diff --git a/configure.ac b/configure.ac
index a7041c6..04e48b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,6 +356,9 @@ else
     POPT_INCLUDES=''
 fi
 
+AC_CHECK_LIB([iberty], [expandargv],
+             ,
+             AC_MSG_ERROR([Cannot find libiberty]))
 
 
 ########################################################################
diff --git a/src/distcc.c b/src/distcc.c
index ee05617..812e4ad 100644
--- a/src/distcc.c
+++ b/src/distcc.c
@@ -41,6 +41,8 @@
 #include <errno.h>
 #include <signal.h>
 
+#include <libiberty.h>
+
 #include "distcc.h"
 #include "trace.h"
 #include "exitcode.h"
@@ -233,6 +235,9 @@ int main(int argc, char **argv)
 
     compiler_name = (char *) dcc_find_basename(argv[0]);
 
+    /* Expand @FILE arguments. */
+    expandargv(&argc, &argv);
+
     /* Ignore SIGPIPE; we consistently check error codes and will
      * see the EPIPE. */
     dcc_ignore_sigpipe(1);