[libgfortran] Actually use GCC_NO_EXECUTABLES

[Andreas Schwab]

Kelley Cook <kcook@gcc.gnu.org> writes:

> As a side bonus the 1.8.5->1.9.3 automake upgrade knocks more than 1400
> repetitive lines out of the generated Makefile.in.

And breaks compilation, because $(F77) now became $(FC).

/bin/sh ./libtool --mode=compile f77   -c -o selected_int_kind.lo `test -f 'intrinsics/selected_int_kind.f90' || echo '../../../libgfortran/'`intrinsics/selected_int_kind.f90
/tmp/cvs/gcc-20041105/Build/gcc/xgcc -B/tmp/cvs/gcc-20041105/Build/gcc/ -B/usr/local/ia64-suse-linux/bin/ -B/usr/local/ia64-suse-linux/lib/ -isystem /usr/local/ia64-suse-linux/include -isystem /usr/local/ia64-suse-linux/sys-include -DHAVE_CONFIG_H -I. -I../../../libgfortran -I. -I../../../libgfortran/io -O2 -O2 -g -std=gnu99 -O2 -O2 -g -c ../../../libgfortran/intrinsics/reshape_packed.c  -fPIC -DPIC -o .libs/reshape_packed.o
f77 -c ../../../libgfortran/intrinsics/selected_int_kind.f90  -fPIC -DPIC -o .libs/selected_int_kind.o
./libtool: line 1: f77: command not found
make[3]: *** [selected_int_kind.lo] Error 1

Tested on ia64-linux and committed as obvious.

Andreas.

2004-11-05  Andreas Schwab  <schwab@suse.de>

	* configure.ac: Use AC_PROG_FC, FC and FCFLAGS instead of
	AC_PROG_F77, F77 and FFLAGS.
	* Makefile.am (selected_int_kind.inc, selected_real_kind.inc): Use
	FCCOMPILE instead of F77COMPILE.
	* configure, Makefile.in: Regenerate.

Index: libgfortran/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libgfortran/Makefile.am,v
retrieving revision 1.21
diff -u -p -a -r1.21 Makefile.am
--- libgfortran/Makefile.am	5 Nov 2004 03:49:23 -0000	1.21
+++ libgfortran/Makefile.am	5 Nov 2004 12:40:11 -0000
@@ -390,10 +390,10 @@ I_M4_DEPS0=$(I_M4_DEPS) m4/iforeach.m4
 I_M4_DEPS1=$(I_M4_DEPS) m4/ifunction.m4
 
 selected_int_kind.inc: $(srcdir)/mk-sik-inc.sh
-	$(SHELL) $(srcdir)/mk-sik-inc.sh '$(F77COMPILE)' > $@
+	$(SHELL) $(srcdir)/mk-sik-inc.sh '$(FCCOMPILE)' > $@
 
 selected_real_kind.inc: $(srcdir)/mk-srk-inc.sh
-	$(SHELL) $(srcdir)/mk-srk-inc.sh '$(F77COMPILE)' > $@
+	$(SHELL) $(srcdir)/mk-srk-inc.sh '$(FCCOMPILE)' > $@
 
 ## A 'normal' build shouldn't need to regenerate these
 ## so we only include them in maintainer mode
Index: libgfortran/configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libgfortran/configure.ac,v
retrieving revision 1.12
diff -u -p -a -r1.12 configure.ac
--- libgfortran/configure.ac	30 Oct 2004 16:23:22 -0000	1.12
+++ libgfortran/configure.ac	5 Nov 2004 12:40:11 -0000
@@ -138,11 +138,11 @@ AC_SUBST(enable_static)
 #AC_MSG_NOTICE([====== Finished libtool configuration]) ; sleep 10
 
 # We need gfortran to compile parts of the library
-# We can't use AC_PROG_F77 because it expects a fully working gfortran.
-#AC_PROG_F77(gfortran)
-F77="$GFORTRAN"
-AC_PROG_F77(gfortran)
-FFLAGS="$FFLAGS -Wall -fno-repack-arrays -fno-underscoring"
+# We can't use AC_PROG_FC because it expects a fully working gfortran.
+#AC_PROG_FC(gfortran)
+FC="$GFORTRAN"
+AC_PROG_FC(gfortran)
+FCFLAGS="$FCFLAGS -Wall -fno-repack-arrays -fno-underscoring"
 
 AC_SYS_LARGEFILE
 AC_FUNC_MMAP

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."