automake 1.7 branch & DJGPP [PATCH]

[Richard Dawe]

Hello.

I just tried the CVS branch of automake 1.7 for the first time.
I couldn't bootstrap, because:

* 'bootstrap' uses symlinks. DJGPP 2.03 doesn't support symlinks.
  (DJGPP 2.04 will.)

* 'bootstrap' doesn't substitute a Unixy shell for $SHELL
  in automake.in.

I also discovered that the build process doesn't substitute
for @SHELL@ when automake.in -> automake.

Below is a patch for all these problems. I haven't tried the patches
against the automake 1.8 branch.

If this patch is OK, could someone commit them please?

Thanks, bye, Rich =]

Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.2024.2.93
diff -p -u -3 -r1.2024.2.93 ChangeLog
--- ChangeLog   10 Feb 2003 21:48:22 -0000      1.2024.2.93
+++ ChangeLog   10 Feb 2003 22:48:59 -0000
@@ -1,3 +1,14 @@
+2003-02-10  Richard Dawe  <address@hidden>
+
+       * Makefile.am: Substitute @SHELL@ in automake.in and aclocal.in.
+       This makes the setting of SHELL work for DJGPP.
+
+       * bootstrap: Don't require support for symlinks - copy instead.
+       Override $SHELL with DJGPP's bash, if running DJGPP.  Substitute
+       @SHELL@ in automake.in and aclocal.in.  This makes the setting
+       of SHELL work for DJGPP.
+
+       
 2003-02-10  Alexandre Duret-Lutz  <address@hidden>
 
        Related to PR automake/385:
Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.205.2.4
diff -p -u -3 -r1.205.2.4 Makefile.am
--- Makefile.am 13 Jan 2003 19:20:22 -0000      1.205.2.4
+++ Makefile.am 10 Feb 2003 22:49:00 -0000
@@ -68,7 +68,8 @@ do_subst = sed -e 's,address@hidden@],$(dat
            -e 's,address@hidden@],@configure_input@,g' \
            -e 's,address@hidden@],$(PACKAGE),g' \
            -e 's,address@hidden@],$(VERSION),g' \
-           -e 's,address@hidden@],$(APIVERSION),g'
+           -e 's,address@hidden@],$(APIVERSION),g' \
+           -e 's,address@hidden@],$(SHELL),g'
 
 automake: automake.in Makefile
        $(do_subst) < $(srcdir)/automake.in > automake
Index: bootstrap
===================================================================
RCS file: /cvs/automake/automake/bootstrap,v
retrieving revision 1.2.2.1
diff -p -u -3 -r1.2.2.1 bootstrap
--- bootstrap   25 Sep 2002 20:56:47 -0000      1.2.2.1
+++ bootstrap   10 Feb 2003 22:49:00 -0000
@@ -38,6 +38,19 @@ VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[
 PACKAGE=automake
 datadir=.
 
+# Override SHELL.  This is required on DJGPP so that system() uses
+# bash, not COMMAND.COM which doesn't quote arguments properly.
+# Other systems aren't expected to use $SHELL when Automake
+# runs, but it should be safe to drop the `if DJGPP' guard if
+# it turns up other systems need the same thing.  After all,
+# if SHELL is used, ./configure's SHELL is always better than
+# the user's SHELL (which may be something like tcsh).
+if test -n $DJGPP; then
+    BOOTSTRAP_SHELL=/dev/env/DJDIR/bin/bash.exe
+else
+    BOOTSTRAP_SHELL="$SHELL"
+fi
+
 # Read the rule for calculating APIVERSION and execute it
 apiver_cmd=`sed -ne 's/\[\[/[/g;s/\]\]/]/g;/^APIVERSION=/p' configure.in`
 eval $apiver_cmd
@@ -57,7 +70,8 @@ fi
 rm -rf aclocal-$APIVERSION
 mkdir aclocal-$APIVERSION
 rm -rf automake-$APIVERSION
-ln -s lib automake-$APIVERSION
+mkdir automake-$APIVERSION
+cp -arf lib/* automake-$APIVERSION
 
 # Create temporary replacement for aclocal
 sed -e "address@hidden@%$PERL%g" \
@@ -65,6 +79,7 @@ sed -e "address@hidden@%$PERL%g" \
     -e "address@hidden@%$APIVERSION%g" \
     -e "address@hidden@%$PACKAGE%g" \
     -e "address@hidden@%$datadir%g" \
+    -e "address@hidden@%$BOOTSTRAP_SHELL%g" \
     aclocal.in >aclocal.tmp
 
 # Create temporary replacement for amversion.m4
@@ -84,6 +99,7 @@ sed -e "address@hidden@%$PERL%g" \
     -e "address@hidden@%$APIVERSION%g" \
     -e "address@hidden@%$PACKAGE%g" \
     -e "address@hidden@%$datadir%g" \
+    -e "address@hidden@%$BOOTSTRAP_SHELL%g" \
     automake.in >automake.tmp
 
 # Run automake