From 94f3137eb64067531522d34e9bc67cc66fd6d00b Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 12 May 2003 15:11:27 +0000 Subject: fixes 107967 Original commit message from CVS: fixes 107967 --- autogen.sh | 7 ++++--- common | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index df5cb8f5..72296795 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 } diff --git a/common b/common index ed429334..c5d7301d 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit ed429334bba35b10172ba97d9b3795b75a65b388 +Subproject commit c5d7301d645fbee2881c30e86152cb3d2152e33b -- cgit v1.2.1