summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-05-12 15:08:49 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-05-12 15:08:49 +0000
commit453d871f36a9f30d44f6ffb36d9210e16c0d0c34 (patch)
tree09463d3fcaa261a9960b489e12e504c006faba25 /autogen.sh
parent8b93fc5c062bf1e3a3845ccd5cd54a05f6d110b9 (diff)
fixes 107967
Original commit message from CVS: fixes 107967
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh
index 25f8846b4..fdccd89ca 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -72,14 +72,14 @@ tool_run "$automake" "-a -c"
# if enable exists, add an -enable option for each of the lines in that file
if test -f enable; then
for a in `cat enable`; do
- CONFIGURE_OPT="$CONFIGURE_OPT --enable-$a"
+ CONFIGURE_FILE_OPT="--enable-$a"
done
fi
# if disable exists, add an -disable option for each of the lines in that file
if test -f disable; then
for a in `cat disable`; do
- CONFIGURE_OPT="$CONFIGURE_OPT --disable-$a"
+ CONFIGURE_FILE_OPT="$CONFIGURE_FILE_OPT --disable-$a"
done
fi
@@ -92,9 +92,10 @@ test -n "$NOCONFIGURE" && {
echo "+ running configure ... "
test ! -z "$CONFIGURE_DEF_OPT" && echo " ./configure default flags: $CONFIGURE_DEF_OPT"
test ! -z "$CONFIGURE_EXT_OPT" && echo " ./configure external flags: $CONFIGURE_EXT_OPT"
+test ! -z "$CONFIGURE_FILE_OPT" && echo " ./configure enable/disable flags: $CONFIGURE_FILE_OPT"
echo
-./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT || {
+./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT $CONFIGURE_FILE_OPT || {
echo " configure failed"
exit 1
}