--use-deps now the default

diff --git a/automake.in b/automake.in
index ae49fc310db4fb8ffd326204a92611cdaff97217..505983d69e8d71598613d6daa7d475e64bbef5ea 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -40,7 +40,7 @@ common='THANKS TODO README NEWS COPYING COPYING.LIB INSTALL NLS ChangeLog config
 echo=echo
 
 mfiles=
-am_usedeps=no
+am_usedeps=yes
 am_incdeps=no
 while test $# -gt 0; do
    case "$1" in
@@ -49,7 +49,6 @@ while test $# -gt 0; do
        $echo "\
   --help                print this help, then exit
   --version             print version number, then exit
-  --use-deps            include code to auto-generate dependencies
   --include-deps        include generated dependencies in Makefile"
        echo
        $echo "Files which are automatically distributed, if found:"
@@ -68,12 +67,9 @@ while test $# -gt 0; do
        exit 0
        ;;
 
-    --use-deps)
-       am_usedeps=yes
-       ;;
-
     --include-deps)
        am_incdeps=yes
+       am_usedeps=no
        ;;
 
     -- ) # Stop option processing.
@@ -98,11 +94,6 @@ while test $# -gt 0; do
    shift
 done
 
-if test "$am_usedeps" = yes && test "$am_incdeps" = yes; then
-   $echo "automake: can't specify both --use-deps and --include-deps" 1>&2
-   exit 1
-fi
-
 test -n "$mfiles" || {
    # Look around.
    mfiles=`echo */Makefile.am`