From efc3e2d8444c326b1d5f2149c4fd2a0342728da1 Mon Sep 17 00:00:00 2001
From: Martin Nolte <mnolte@dune-project.org>
Date: Tue, 22 Apr 2008 14:25:57 +0000
Subject: [PATCH] missing autogen.sh prohibited autogen from working Please
test changes to the build system before commit!
[[Imported from SVN: r5174]]
---
bin/dunecontrol | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/bin/dunecontrol b/bin/dunecontrol
index d88776cf7..c242496a3 100755
--- a/bin/dunecontrol
+++ b/bin/dunecontrol
@@ -232,21 +232,19 @@ run_default_update () {
run_default_autogen () {
PARAMS="$CMD_PARAMS"
local M4_PATH=""
- if test -x autogen.sh; then
- for m in $FOUND_MODULES; do
- path=$(eval "echo \$PATH_$m")
- if test -d $path/m4; then
- M4_PATH="$path $M4_PATH"
- fi
- done
- if test -f autogen.sh; then
- eval echo "WARNING: \$NAME_$module contains obsolete autogen.sh," \
- > /dev/stderr
- echo " dune-autogen is used instead." > /dev/stderr
+ for m in $FOUND_MODULES; do
+ path=$(eval "echo \$PATH_$m")
+ if test -d $path/m4; then
+ M4_PATH="$path $M4_PATH"
fi
-# eval ./autogen.sh "$M4_PATH" "$PARAMS" || exit 1
- eval "$COMMAND_DIR/dune-autogen" "$M4_PATH" "$PARAMS" || exit 1
+ done
+ if test -f autogen.sh; then
+ eval echo "WARNING: \$NAME_$module contains obsolete autogen.sh," \
+ > /dev/stderr
+ echo " dune-autogen is used instead." > /dev/stderr
fi
+# eval ./autogen.sh "$M4_PATH" "$PARAMS" || exit 1
+ eval "$COMMAND_DIR/dune-autogen" "$M4_PATH" "$PARAMS" || exit 1
}
run_default_configure () {
--
GitLab