From e2b911005edd3c54b317d0ecba8c35655ba697fa Mon Sep 17 00:00:00 2001 From: kanschat Date: Sun, 6 Aug 2006 21:57:53 +0000 Subject: [PATCH] find gfortran compiler if installed git-svn-id: https://svn.dealii.org/trunk@13608 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 16 +++++++++++++--- deal.II/configure | 18 +++++++++++++++--- deal.II/configure.in | 2 +- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 8167820dbf..4cfbdbb1bc 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -1371,9 +1371,19 @@ AC_DEFUN(DEAL_II_SET_F77_FLAGS, dnl F77FLAGSPIC="-fPIC" ;; esac - - F77LIBS="$F77LIBS -lg2c" - + + case "$F77$" in + *gfortran* ) + F77LIBS="$F77LIBS -lgfortran" + ;; + *g77* ) + F77LIBS="$F77LIBS -lg2c" + ;; + * ) + AC_MSG_ERROR([Error in configure script, please report a bug]) + ;; + esac + ;; AIXF77) diff --git a/deal.II/configure b/deal.II/configure index e939418d02..fb83880a42 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.233 . +# From configure.in Revision: 13353 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for deal.II 5.3.pre. # @@ -9924,7 +9924,7 @@ echo "${ECHO_T}" >&6 echo "$as_me:$LINENO: result: ----------------- configuring F77 compilers -----------------" >&5 echo "${ECHO_T}----------------- configuring F77 compilers -----------------" >&6 -for ac_prog in f77 g77 +for ac_prog in f77 gfortran g77 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -10121,7 +10121,19 @@ echo "${ECHO_T}F77 compiler is unkown. no flags set!" >&6 ;; esac - F77LIBS="$F77LIBS -lg2c" + case "$F77$" in + *gfortran* ) + F77LIBS="$F77LIBS -lgfortran" + ;; + *g77* ) + F77LIBS="$F77LIBS -lg2c" + ;; + * ) + { { echo "$as_me:$LINENO: error: Error in configure script, please report a bug" >&5 +echo "$as_me: error: Error in configure script, please report a bug" >&2;} + { (exit 1); exit 1; }; } + ;; + esac ;; diff --git a/deal.II/configure.in b/deal.II/configure.in index 5d2ee1bfcc..56a42377cc 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -237,7 +237,7 @@ dnl dnl It is possible that no Fortran 77 compiler was found. Don't care, dnl it may be that we don't need one (but we check below, when we must dnl have it). -AC_PATH_PROGS(F77, [f77 g77]) +AC_PATH_PROGS(F77, [f77 gfortran g77]) dnl Next determine which f77 compiler we have here and set compilation dnl flags accordingly. Only do that if we have an F77 compiler at all. -- 2.39.5