Only issue warning about running configure

without arguments when configure will actually running configure.

diff --git a/ChangeLog b/ChangeLog
index 216bea666d52fd870740945a64e7938c24b15a25..beaba48fe80ad87c84a65d88e516a164625909d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-03  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/autogen.sh: Only issue warning about running configure
+       without arguments when configure will actually running configure.
+
 2004-03-03  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * scm/new-markup.scm (stack-stencil-line): robustness.

diff --git a/autogen.sh b/autogen.sh
index bc99b2d1afcb7715290a3ced31dc642e0cfebaa5..f851875cab1db911e683eb93339d0d4b3a9240a0 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -35,28 +35,29 @@ if test -z "$autoconf"; then
     exit 1
 fi
 
-if test -z "$*"; then
-  echo "WARNING: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-for coin in $srcdir/configure.in #`find $srcdir -name configure.in -print`
+for i in $srcdir/configure.in #`find $srcdir -name configure.in -print`
 do 
-  dr=`dirname $coin`
-  echo processing $dr
+  dir=`dirname $i`
+  echo processing $dir
   (
-      cd $dr
+      cd $dir
       echo "Running autoconf ..."
       $autoconf
   )
 done
 
 #conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
-if test -z "$NOCONFIGURE"; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@"
-else
-  echo Skipping configure process.
+if test -n "$NOCONFIGURE"; then
+    echo Skipping configure process.
+    exit 0
 fi
+
+if test -z "$*"; then
+    echo "warning: about to run \`./configure' without arguments."
+    echo "arguments on the \`$0\'"
+    echo "command line will be passed to \`./configure'."
+    echo
+fi
+
+echo Running $srcdir/configure $conf_flags "$@" ...
+$srcdir/configure $conf_flags "$@"

diff --git a/stepmake/autogen.sh b/stepmake/autogen.sh
index bc99b2d1afcb7715290a3ced31dc642e0cfebaa5..f851875cab1db911e683eb93339d0d4b3a9240a0 100755 (executable)
--- a/stepmake/autogen.sh
+++ b/stepmake/autogen.sh
@@ -35,28 +35,29 @@ if test -z "$autoconf"; then
     exit 1
 fi
 
-if test -z "$*"; then
-  echo "WARNING: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-for coin in $srcdir/configure.in #`find $srcdir -name configure.in -print`
+for i in $srcdir/configure.in #`find $srcdir -name configure.in -print`
 do 
-  dr=`dirname $coin`
-  echo processing $dr
+  dir=`dirname $i`
+  echo processing $dir
   (
-      cd $dr
+      cd $dir
       echo "Running autoconf ..."
       $autoconf
   )
 done
 
 #conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
-if test -z "$NOCONFIGURE"; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@"
-else
-  echo Skipping configure process.
+if test -n "$NOCONFIGURE"; then
+    echo Skipping configure process.
+    exit 0
 fi
+
+if test -z "$*"; then
+    echo "warning: about to run \`./configure' without arguments."
+    echo "arguments on the \`$0\'"
+    echo "command line will be passed to \`./configure'."
+    echo
+fi
+
+echo Running $srcdir/configure $conf_flags "$@" ...
+$srcdir/configure $conf_flags "$@"