configure.in (haifa configury): Fix typo.

	* configure.in (haifa configury): Fix typo.
	* configure: Regenerate.

From-SVN: r14783

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8884777..926bbe5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 13 01:03:37 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+       * configure.in (haifa configury): Fix typo.
+       * configure: Regenerate.
+
 Tue Aug 12 10:20:36 1997  Jeffrey A Law  (law@cygnus.com)
 
        * version.c: Bump version to "gcc-3.0.0 970802 experimental".

diff --git a/gcc/configure b/gcc/configure
index 74dd86e..6b2f3a9 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -4219,13 +4219,13 @@ if [ -f ../gas/Makefile ]; then
 fi
 
 # If we have ld in the build tree, make a link to it.
-#if [ -f ../ld/Makefile ]; then
-#      if [ x$use_collect2 = x ]; then
+if [ -f ../ld/Makefile ]; then
+#      if [[ x$use_collect2 = x ]]; then
 #              rm -f ld; $symbolic_link ../ld/ld.new ld 2>/dev/null
 #      else
-#              rm -f collect-ld; $symbolic_link ../ld/ld.new collect-ld 2>/dev/null
+               rm -f collect-ld; $symbolic_link ../ld/ld.new collect-ld 2>/dev/null
 #      fi
-#fi
+fi
 
 # Figure out what language subdirectories are present.
 subdirs=
@@ -4364,14 +4364,14 @@ fi
 # Override SCHED_OBJ and SCHED_CFLAGS to enable the Haifa scheduler.
 sched_prefix=
 sched_cflags=
-if [[ x$enable_haifa = xyes ]]; then
+if [ x$enable_haifa = xyes ]; then
     echo "Using the Haifa scheduler."
     sched_prefix=haifa-
     sched_cflags=-DHAIFA
 fi
 
 
-if [[ x$enable_haifa != x ]]; then
+if [ x$enable_haifa != x ]; then
     # Explicitly remove files that need to be recompiled for the Haifa scheduler.
     for x in genattrtab.o toplev.o loop.o unroll.o *sched.o; do
        if [ -f $x ]; then
@@ -4622,9 +4622,9 @@ s%@CC@%$CC%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CPP@%$CPP%g
 s%@manext@%$manext%g
+s%@objext@%$objext%g
 s%@sched_prefix@%$sched_prefix%g
 s%@sched_cflags@%$sched_cflags%g
-s%@objext@%$objext%g
 s%@subdirs@%$subdirs%g
 s%@all_languages@%$all_languages%g
 s%@all_boot_languages@%$all_boot_languages%g

diff --git a/gcc/configure.in b/gcc/configure.in
index 17ac2f4..16db044 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -3040,7 +3040,7 @@ AC_SUBST(sched_cflags)
 if [[ x$enable_haifa != x ]]; then
     # Explicitly remove files that need to be recompiled for the Haifa scheduler.
     for x in genattrtab.o toplev.o loop.o unroll.o *sched.o; do
-       if [ -f $x ]; then
+       if [[ -f $x ]]; then
            echo "Removing $x"
            rm -f $x
        fi