Add EXTRA_AUTORECONF_VARS

README.md

@@ -39,6 +39,12 @@ The following shortcuts can be used instead of the manual method:
 * `rbuild -A` runs `autoreconf --install` in the remote source directory.
 * `rbuild -a` runs `configure --prefix=$INSTALL_DIR` in the remote build directory.
 
+The only environment variable passed to `autoreconf` by default is `ACLOCAL_PATH`.
+You can point `ACLOCAL_PATH` in `.rbuild.conf` to directories with custom `m4` macros.
+To pass additional variables through `.rbuild.conf`, use:
+
+    EXTRA_AUTORECONF_VARS="..."
+
 The environment variables passed to `configure` by default are `CC`, `CFLAGS`,
 `CXX`, `CXXFLAGS` and `PKG_CONFIG_PATH`.  To pass additional variables through
 `.rbuild.conf`:

rbuild

@@ -80,7 +80,7 @@ function stage {
 
 function autoreconf {
     echo Remote autoreconf in $BUILD_HOST:$STAGING_DIR
-    $SSH $BUILD_HOST "cd \"$STAGING_DIR\" && autoreconf --install"
+    $SSH $BUILD_HOST "cd \"$STAGING_DIR\" && eval $AUTORECONF_VARS autoreconf --install"
 }
 
 function configure {
@@ -264,6 +264,9 @@ if [ -n "$deploy_host" ]; then
     DEPLOY_HOST=$deploy_host
 fi
 
+AUTORECONF_VARS="${AUTORECONF_VARS:-ACLOCAL_PATH=\'$ACLOCAL_PATH\'}"
+AUTORECONF_VARS+=" $EXTRA_AUTORECONF_VARS"
+
 CONFIGURE_VARS="${CONFIGURE_VARS:-PKG_CONFIG_PATH=\'$PKG_CONFIG_PATH\' CC=\'$CC\' CFLAGS=\'$CFLAGS\' CXX=\'$CXX\' CXXFLAGS=\'$CXXFLAGS\' CCAS=gcc CCASFLAGS=}"
 CONFIGURE_VARS+=" $EXTRA_CONFIGURE_VARS"