* autoreconf.sh (--install, --symlink): New options.

diff --git a/ChangeLog b/ChangeLog
index 491a68c6f17a73b83421776ccd6073f2616c8952..59086cb8dbbd1db0c8edb4ea5f0175a995177b24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-10  Akim Demaille  <akim@epita.fr>
+
+       * autoreconf.sh (--install, --symlink): New options.
+
 2000-07-10  Akim Demaille  <akim@epita.fr>
 
        * autoreconf.sh (dots, aclocal_m4, acconfig_h): Remove.

diff --git a/autoreconf.in b/autoreconf.in
index 3b1bbdabf74887ed433eb85fcc60115a21de8e00..6b862db4abff1ffc6c5129eb3e39794bd336a58b 100644 (file)
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -36,6 +36,11 @@ Operation modes:
   -v, --verbose   verbosely report processing
   -d, --debug     don't remove temporary files
   -f, --force     consider every files are obsolete
+  -i, --install   copy missing auxiliary files
+      --symlink   instead of copying, install symbolic links
+
+The option \`--install' is similar to the option \`--add-missing' in
+other tools.
 
 Library directories:
   -m, --macrodir=ACDIR  Autoconf's macro files location (rarely needed)
@@ -89,9 +94,13 @@ if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 debug=false
 dir=`echo "$0" | sed -e 's/[^/]*$//'`
 force=false
+# --install -- as --add-missing in other tools.
+install=false
 localdir=.
 # m4dir -- local Autoconf extensions.  Typically `m4'.
 m4dir=
+# symlink -- when --install, use symlinks instead.
+symlink=false
 verbose=:
 
 # Looking for autoconf.
@@ -161,6 +170,11 @@ while test $# -gt 0; do
      --force | -f )
        force=:; shift ;;
 
+     --install | -i )
+       install=:; shift ;;
+     --symlink )
+       symlink=:; shift ;;
+
      # Options of Automake.
      --cygnus | --foreign | --gnits | --gnu | --include-deps | -i )
        automake="$automake $1"; shift ;;
@@ -186,12 +200,23 @@ if test $# -ne 0; then
 fi
 
 # Dispatch autoreconf's option to the tools.
-autoconf="$autoconf -l $localdir `$verbose --verbose`"
-autoheader="$autoheader -l $localdir `$verbose --verbose`"
+# --localdir
+autoconf="$autoconf -l $localdir"
+autoheader="$autoheader -l $localdir"
+# --force
 $force || automake="$automake --no-force"
+# --verbose
+autoconf="$autoconf `$verbose --verbose`"
+autoheader="$autoheader `$verbose --verbose`"
 automake="$automake `$verbose --verbose`"
 aclocal="$aclocal `$verbose --verbose`"
+# --macrodir
 export AC_MACRODIR
+# --install and --symlink
+if $install; then
+  automake="$automake --add-missing `$symlink || echo --copy`"
+fi
+
 
 # Trap on 0 to stop playing with `rm'.
 $debug ||
@@ -292,7 +317,7 @@ while read dir; do
   test -f "Makefile.am" &&
     uses_automake=:
   if $uses_automake &&
-     { $force || $update Makefile.in Makefile.am; } then
+     { $force || $install || $update Makefile.in Makefile.am; } then
     $verbose running $automake in $dir >&2
     $automake
   fi

diff --git a/autoreconf.sh b/autoreconf.sh
index 3b1bbdabf74887ed433eb85fcc60115a21de8e00..6b862db4abff1ffc6c5129eb3e39794bd336a58b 100644 (file)
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -36,6 +36,11 @@ Operation modes:
   -v, --verbose   verbosely report processing
   -d, --debug     don't remove temporary files
   -f, --force     consider every files are obsolete
+  -i, --install   copy missing auxiliary files
+      --symlink   instead of copying, install symbolic links
+
+The option \`--install' is similar to the option \`--add-missing' in
+other tools.
 
 Library directories:
   -m, --macrodir=ACDIR  Autoconf's macro files location (rarely needed)
@@ -89,9 +94,13 @@ if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 debug=false
 dir=`echo "$0" | sed -e 's/[^/]*$//'`
 force=false
+# --install -- as --add-missing in other tools.
+install=false
 localdir=.
 # m4dir -- local Autoconf extensions.  Typically `m4'.
 m4dir=
+# symlink -- when --install, use symlinks instead.
+symlink=false
 verbose=:
 
 # Looking for autoconf.
@@ -161,6 +170,11 @@ while test $# -gt 0; do
      --force | -f )
        force=:; shift ;;
 
+     --install | -i )
+       install=:; shift ;;
+     --symlink )
+       symlink=:; shift ;;
+
      # Options of Automake.
      --cygnus | --foreign | --gnits | --gnu | --include-deps | -i )
        automake="$automake $1"; shift ;;
@@ -186,12 +200,23 @@ if test $# -ne 0; then
 fi
 
 # Dispatch autoreconf's option to the tools.
-autoconf="$autoconf -l $localdir `$verbose --verbose`"
-autoheader="$autoheader -l $localdir `$verbose --verbose`"
+# --localdir
+autoconf="$autoconf -l $localdir"
+autoheader="$autoheader -l $localdir"
+# --force
 $force || automake="$automake --no-force"
+# --verbose
+autoconf="$autoconf `$verbose --verbose`"
+autoheader="$autoheader `$verbose --verbose`"
 automake="$automake `$verbose --verbose`"
 aclocal="$aclocal `$verbose --verbose`"
+# --macrodir
 export AC_MACRODIR
+# --install and --symlink
+if $install; then
+  automake="$automake --add-missing `$symlink || echo --copy`"
+fi
+
 
 # Trap on 0 to stop playing with `rm'.
 $debug ||
@@ -292,7 +317,7 @@ while read dir; do
   test -f "Makefile.am" &&
     uses_automake=:
   if $uses_automake &&
-     { $force || $update Makefile.in Makefile.am; } then
+     { $force || $install || $update Makefile.in Makefile.am; } then
     $verbose running $automake in $dir >&2
     $automake
   fi

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 3b1bbdabf74887ed433eb85fcc60115a21de8e00..6b862db4abff1ffc6c5129eb3e39794bd336a58b 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -36,6 +36,11 @@ Operation modes:
   -v, --verbose   verbosely report processing
   -d, --debug     don't remove temporary files
   -f, --force     consider every files are obsolete
+  -i, --install   copy missing auxiliary files
+      --symlink   instead of copying, install symbolic links
+
+The option \`--install' is similar to the option \`--add-missing' in
+other tools.
 
 Library directories:
   -m, --macrodir=ACDIR  Autoconf's macro files location (rarely needed)
@@ -89,9 +94,13 @@ if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 debug=false
 dir=`echo "$0" | sed -e 's/[^/]*$//'`
 force=false
+# --install -- as --add-missing in other tools.
+install=false
 localdir=.
 # m4dir -- local Autoconf extensions.  Typically `m4'.
 m4dir=
+# symlink -- when --install, use symlinks instead.
+symlink=false
 verbose=:
 
 # Looking for autoconf.
@@ -161,6 +170,11 @@ while test $# -gt 0; do
      --force | -f )
        force=:; shift ;;
 
+     --install | -i )
+       install=:; shift ;;
+     --symlink )
+       symlink=:; shift ;;
+
      # Options of Automake.
      --cygnus | --foreign | --gnits | --gnu | --include-deps | -i )
        automake="$automake $1"; shift ;;
@@ -186,12 +200,23 @@ if test $# -ne 0; then
 fi
 
 # Dispatch autoreconf's option to the tools.
-autoconf="$autoconf -l $localdir `$verbose --verbose`"
-autoheader="$autoheader -l $localdir `$verbose --verbose`"
+# --localdir
+autoconf="$autoconf -l $localdir"
+autoheader="$autoheader -l $localdir"
+# --force
 $force || automake="$automake --no-force"
+# --verbose
+autoconf="$autoconf `$verbose --verbose`"
+autoheader="$autoheader `$verbose --verbose`"
 automake="$automake `$verbose --verbose`"
 aclocal="$aclocal `$verbose --verbose`"
+# --macrodir
 export AC_MACRODIR
+# --install and --symlink
+if $install; then
+  automake="$automake --add-missing `$symlink || echo --copy`"
+fi
+
 
 # Trap on 0 to stop playing with `rm'.
 $debug ||
@@ -292,7 +317,7 @@ while read dir; do
   test -f "Makefile.am" &&
     uses_automake=:
   if $uses_automake &&
-     { $force || $update Makefile.in Makefile.am; } then
+     { $force || $install || $update Makefile.in Makefile.am; } then
     $verbose running $automake in $dir >&2
     $automake
   fi