Commit c7a35fe9 by Andreas Schwab Committed by Andreas Schwab

configure.ac: Use AC_PROG_FC, FC and FCFLAGS instead of AC_PROG_F77, F77 and FFLAGS.

	* 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.

From-SVN: r90122
parent 88c4f655
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.
2004-11-05 Kelley Cook <kcook@gcc.gnu.org> 2004-11-05 Kelley Cook <kcook@gcc.gnu.org>
* acinclude.m4: Properly quote AC_CACHE_CHECK. * acinclude.m4: Properly quote AC_CACHE_CHECK.
......
...@@ -390,10 +390,10 @@ I_M4_DEPS0=$(I_M4_DEPS) m4/iforeach.m4 ...@@ -390,10 +390,10 @@ I_M4_DEPS0=$(I_M4_DEPS) m4/iforeach.m4
I_M4_DEPS1=$(I_M4_DEPS) m4/ifunction.m4 I_M4_DEPS1=$(I_M4_DEPS) m4/ifunction.m4
selected_int_kind.inc: $(srcdir)/mk-sik-inc.sh 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 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 ## A 'normal' build shouldn't need to regenerate these
## so we only include them in maintainer mode ## so we only include them in maintainer mode
......
...@@ -214,8 +214,9 @@ ECHO_N = @ECHO_N@ ...@@ -214,8 +214,9 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
EGREP = @EGREP@ EGREP = @EGREP@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
F77 = @F77@ FC = @FC@
FFLAGS = @FFLAGS@ FCFLAGS = @FCFLAGS@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
...@@ -247,7 +248,7 @@ VERSION = @VERSION@ ...@@ -247,7 +248,7 @@ VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@ ac_ct_AR = @ac_ct_AR@
ac_ct_AS = @ac_ct_AS@ ac_ct_AS = @ac_ct_AS@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_F77 = @ac_ct_F77@ ac_ct_FC = @ac_ct_FC@
ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@ ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
...@@ -1804,10 +1805,10 @@ uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES ...@@ -1804,10 +1805,10 @@ uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES
selected_int_kind.inc: $(srcdir)/mk-sik-inc.sh 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 selected_real_kind.inc: $(srcdir)/mk-srk-inc.sh
$(SHELL) $(srcdir)/mk-srk-inc.sh '$(F77COMPILE)' > $@ $(SHELL) $(srcdir)/mk-srk-inc.sh '$(FCCOMPILE)' > $@
@MAINTAINER_MODE_TRUE@$(i_all_c): m4/all.m4 $(I_M4_DEPS1) @MAINTAINER_MODE_TRUE@$(i_all_c): m4/all.m4 $(I_M4_DEPS1)
@MAINTAINER_MODE_TRUE@ m4 -Dfile=$@ -I$(srcdir)/m4 all.m4 > $@ @MAINTAINER_MODE_TRUE@ m4 -Dfile=$@ -I$(srcdir)/m4 all.m4 > $@
......
...@@ -138,11 +138,11 @@ AC_SUBST(enable_static) ...@@ -138,11 +138,11 @@ AC_SUBST(enable_static)
#AC_MSG_NOTICE([====== Finished libtool configuration]) ; sleep 10 #AC_MSG_NOTICE([====== Finished libtool configuration]) ; sleep 10
# We need gfortran to compile parts of the library # We need gfortran to compile parts of the library
# We can't use AC_PROG_F77 because it expects a fully working gfortran. # We can't use AC_PROG_FC because it expects a fully working gfortran.
#AC_PROG_F77(gfortran) #AC_PROG_FC(gfortran)
F77="$GFORTRAN" FC="$GFORTRAN"
AC_PROG_F77(gfortran) AC_PROG_FC(gfortran)
FFLAGS="$FFLAGS -Wall -fno-repack-arrays -fno-underscoring" FCFLAGS="$FCFLAGS -Wall -fno-repack-arrays -fno-underscoring"
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
AC_FUNC_MMAP AC_FUNC_MMAP
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment