[Emacs-diffs] /srv/bzr/emacs/trunk r110081: * Makefile.in: Run autogen/copy_autogen if autogen.sh fails,

[Paul Eggert]

------------------------------------------------------------
revno: 110081
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2012-09-17 15:35:28 -0700
message:
  * Makefile.in: Run autogen/copy_autogen if autogen.sh fails,
  
  to create 'configure'; problem reported by Andreas Schwab in
  <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00438.html>.
  * autogen.sh: Exit with status 1 when failing due to missing tools,
  reverting the 2012-09-10 change to this file.
  * autogen/copy_autogen: Fail if one of the subsidiary actions fail.
  Use 'cp -f' for the build-aux files, since the destinations are
  typically read-only.
modified:
  ChangeLog
  Makefile.in
  autogen.sh
  autogen/copy_autogen

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-17 21:33:14 +0000
+++ b/ChangeLog 2012-09-17 22:35:28 +0000
@@ -8,6 +8,14 @@
        This undoes part of the 2012-09-10 patch.
        (bootstrap): Run ./configure, rather than trying to run config.status
        if it exists.  That builds src/epaths.h more reliably.
+       Run autogen/copy_autogen if autogen.sh fails,
+       to create 'configure'; problem reported by Andreas Schwab in
+       <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00438.html>.
+       * autogen.sh: Exit with status 1 when failing due to missing tools,
+       reverting the 2012-09-10 change to this file.
+       * autogen/copy_autogen: Fail if one of the subsidiary actions fail.
+       Use 'cp -f' for the build-aux files, since the destinations are
+       typically read-only.
 
        Remove no-longer-needed Solaris 2.4 vfork bug workaround.
        * configure.ac (ac_cv_func_vfork_works): Default to 'no' on

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-09-17 21:33:14 +0000
+++ b/Makefile.in       2012-09-17 22:35:28 +0000
@@ -890,11 +890,11 @@
 
 # Bootstrapping does the following:
 #  * Remove files to start from a clean slate.
-#  * Run autogen.sh, but don't worry about exit status 101 (missing tools).
+#  * Run autogen.sh, falling back on copy_autogen if autogen.sh fails.
 #  * Build Makefile, to build the build procedure itself.
 #  * Do the actual build.
 bootstrap: bootstrap-clean FRC
-       cd $(srcdir) && { ./autogen.sh || test $$? -eq 101; }
+       cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; }
        ./configure $(CONFIGURE_FLAGS)
        $(MAKE) $(MFLAGS) info all
 

=== modified file 'autogen.sh'
--- a/autogen.sh        2012-09-10 01:03:27 +0000
+++ b/autogen.sh        2012-09-17 22:35:28 +0000
@@ -201,7 +201,7 @@
 Please report any problems with this script to address@hidden .
 EOF
 
-    exit 101 # Exit status 101 means tools were missing.
+    exit 1
 fi
 
 echo "Your system has the required tools, running autoreconf..."

=== modified file 'autogen/copy_autogen'
--- a/autogen/copy_autogen      2012-07-09 04:52:49 +0000
+++ b/autogen/copy_autogen      2012-09-17 22:35:28 +0000
@@ -8,7 +8,7 @@
 ## regenerate configure and will fail if you do not have the required
 ## tools.  You will have to run this script again.
 
-test -d autogen && cd autogen
+test ! -d autogen || cd autogen || exit
 
 if test ! -e config.in; then
     echo "Cannot find autogen/ directory."
@@ -16,11 +16,12 @@
 fi
 
 ## Order implied by top-level Makefile's rules, for time-stamps.
-cp compile config.guess config.sub depcomp install-sh missing ../build-aux
-cp aclocal.m4 ../
-cp configure ../
-touch ../src/stamp-h.in
-cp config.in ../src/
-cp Makefile.in ../lib/
+cp -f compile config.guess config.sub depcomp install-sh missing \
+  ../build-aux &&
+cp aclocal.m4 ../ &&
+cp configure ../ &&
+touch ../src/stamp-h.in &&
+cp config.in ../src/ &&
+cp Makefile.in ../lib/ &&
 
 echo "You can now run configure"