configure.in: Recognize f95 in the --enable-languages option...

* configure.in: Recognize f95 in the --enable-languages option, and substitute it for fortran, issuing a warning. * configure: Regenerate. * Make-lang.in: Change targets prefixes from f95 to fortran. * config-lang.in: Change language name to "fortran". * lang.opt: Change language name to "fortran". * options.c: Change CL_F95 to CL_Fortran. From-SVN: r104215
2005-09-13 08:24:18 +02:00 · 2005-09-13 08:24:18 +02:00 · 7f26dfa379
parent 31a7113e7a
commit 7f26dfa379
8 changed files with 157 additions and 126 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+2005-09-14  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+	* configure.in: Recognize f95 in the --enable-languages option,
+	and substitute it for fortran, issuing a warning.
+	* configure: Regenerate.
+
 2005-08-30  Phil Edwards  <phil@codesourcery.com>

 	* configure.in (*-*-vxworks*):  Add target-libstdc++-v3 to noconfigdirs.
--- a/117
+++ b/117
@ -1298,15 +1298,15 @@ case "${target}" in
    unsupported_languages="$unsupported_languages java"
    case "${target}" in
      *-*-aout)
-	unsupported_languages="$unsupported_languages f95"
+	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
      *-*-elf)
-	unsupported_languages="$unsupported_languages f95"
+	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs target-boehm-gc";;
      *-*-linux*)
 	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
      *)
-	unsupported_languages="$unsupported_languages f95"
+	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
    esac
    ;;
@ -1457,7 +1457,7 @@ case "${target}" in
    ;;
  mmix-*-*)
    noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb libgloss"
-    unsupported_languages="$unsupported_languages f95 java"
+    unsupported_languages="$unsupported_languages fortran java"
    ;;
  mn10200-*-*)
    noconfigdirs="$noconfigdirs ${libgcj}"
@ -2345,6 +2345,15 @@ if test -d ${srcdir}/gcc; then
  fi
  enable_languages=`echo "${enable_languages}" | sed -e 's/[ 	,][ 	,]*/,/g' -e 's/,$//'`

+  # 'f95' is the old name for the 'fortran' language. We issue a warning
+  # and make the substitution.
+  case ,${enable_languages}, in
+    *,f95,*)
+      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
+      enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
+      ;;
+  esac
+
  # First scan to see if an enabled language requires some other language.
  # We assume that a given config-lang.in will list all the language
  # front ends it requires, even if some are required indirectly.
@ -2806,7 +2815,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2810: checking for $ac_word" >&5
+echo "configure:2819: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_BISON'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -2841,7 +2850,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2845: checking for $ac_word" >&5
+echo "configure:2854: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_YACC'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -2876,7 +2885,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2880: checking for $ac_word" >&5
+echo "configure:2889: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_M4'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -2911,7 +2920,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2915: checking for $ac_word" >&5
+echo "configure:2924: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_FLEX'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -2946,7 +2955,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2950: checking for $ac_word" >&5
+echo "configure:2959: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LEX'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -2981,7 +2990,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2985: checking for $ac_word" >&5
+echo "configure:2994: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_MAKEINFO'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3506,7 +3515,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3510: checking for $ac_word" >&5
+echo "configure:3519: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3537,7 +3546,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3541: checking for $ac_word" >&5
+echo "configure:3550: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3581,7 +3590,7 @@ fi
    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3585: checking for $ac_word" >&5
+echo "configure:3594: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3612,7 +3621,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3616: checking for $ac_word" >&5
+echo "configure:3625: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3656,7 +3665,7 @@ fi
    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3660: checking for $ac_word" >&5
+echo "configure:3669: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3687,7 +3696,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3691: checking for $ac_word" >&5
+echo "configure:3700: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3731,7 +3740,7 @@ fi
    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3735: checking for $ac_word" >&5
+echo "configure:3744: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3762,7 +3771,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3766: checking for $ac_word" >&5
+echo "configure:3775: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3806,7 +3815,7 @@ fi
    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3810: checking for $ac_word" >&5
+echo "configure:3819: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3837,7 +3846,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3841: checking for $ac_word" >&5
+echo "configure:3850: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3881,7 +3890,7 @@ fi
    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3885: checking for $ac_word" >&5
+echo "configure:3894: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3912,7 +3921,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3916: checking for $ac_word" >&5
+echo "configure:3925: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3951,7 +3960,7 @@ fi
    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3955: checking for $ac_word" >&5
+echo "configure:3964: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -3982,7 +3991,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3986: checking for $ac_word" >&5
+echo "configure:3995: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4026,7 +4035,7 @@ fi
    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4030: checking for $ac_word" >&5
+echo "configure:4039: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4057,7 +4066,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4061: checking for $ac_word" >&5
+echo "configure:4070: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4101,7 +4110,7 @@ fi
    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4105: checking for $ac_word" >&5
+echo "configure:4114: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4132,7 +4141,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4136: checking for $ac_word" >&5
+echo "configure:4145: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4184,7 +4193,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4188: checking for $ac_word" >&5
+echo "configure:4197: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4215,7 +4224,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4219: checking for $ac_word" >&5
+echo "configure:4228: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4259,7 +4268,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4263: checking for $ac_word" >&5
+echo "configure:4272: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4290,7 +4299,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4294: checking for $ac_word" >&5
+echo "configure:4303: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4334,7 +4343,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4338: checking for $ac_word" >&5
+echo "configure:4347: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4365,7 +4374,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4369: checking for $ac_word" >&5
+echo "configure:4378: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4409,7 +4418,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4413: checking for $ac_word" >&5
+echo "configure:4422: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4440,7 +4449,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4444: checking for $ac_word" >&5
+echo "configure:4453: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4484,7 +4493,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4488: checking for $ac_word" >&5
+echo "configure:4497: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4515,7 +4524,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4519: checking for $ac_word" >&5
+echo "configure:4528: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4559,7 +4568,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4563: checking for $ac_word" >&5
+echo "configure:4572: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4590,7 +4599,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4594: checking for $ac_word" >&5
+echo "configure:4603: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4629,7 +4638,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4633: checking for $ac_word" >&5
+echo "configure:4642: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4660,7 +4669,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4664: checking for $ac_word" >&5
+echo "configure:4673: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4704,7 +4713,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4708: checking for $ac_word" >&5
+echo "configure:4717: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4735,7 +4744,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4739: checking for $ac_word" >&5
+echo "configure:4748: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4779,7 +4788,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4783: checking for $ac_word" >&5
+echo "configure:4792: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4810,7 +4819,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4814: checking for $ac_word" >&5
+echo "configure:4823: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4854,7 +4863,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4858: checking for $ac_word" >&5
+echo "configure:4867: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4885,7 +4894,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4889: checking for $ac_word" >&5
+echo "configure:4898: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4929,7 +4938,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4933: checking for $ac_word" >&5
+echo "configure:4942: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4960,7 +4969,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4964: checking for $ac_word" >&5
+echo "configure:4973: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -4999,7 +5008,7 @@ fi
    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5003: checking for $ac_word" >&5
+echo "configure:5012: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -5030,7 +5039,7 @@ fi
    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
 set dummy ${ncn_progname}; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5034: checking for $ac_word" >&5
+echo "configure:5043: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -5131,7 +5140,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
 NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}

 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:5135: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:5144: checking whether to enable maintainer-specific portions of Makefiles" >&5
 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
  enableval="$enable_maintainer_mode"
@ -5178,7 +5187,7 @@ esac
 # gcc for stageN-gcc and stagePREV-gcc for stage(N-1).  In case this is not
 # possible, however, we can resort to mv.
 echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
-echo "configure:5182: checking if symbolic links between directories work" >&5
+echo "configure:5191: checking if symbolic links between directories work" >&5
 if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
--- a/configure.in
+++ b/configure.in
@ -506,15 +506,15 @@ case "${target}" in
    unsupported_languages="$unsupported_languages java"
    case "${target}" in
      *-*-aout)
-	unsupported_languages="$unsupported_languages f95"
+	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
      *-*-elf)
-	unsupported_languages="$unsupported_languages f95"
+	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs target-boehm-gc";;
      *-*-linux*)
 	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
      *)
-	unsupported_languages="$unsupported_languages f95"
+	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
    esac
    ;;
@ -665,7 +665,7 @@ case "${target}" in
    ;;
  mmix-*-*)
    noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb libgloss"
-    unsupported_languages="$unsupported_languages f95 java"
+    unsupported_languages="$unsupported_languages fortran java"
    ;;
  mn10200-*-*)
    noconfigdirs="$noconfigdirs ${libgcj}"
@ -1143,6 +1143,15 @@ if test -d ${srcdir}/gcc; then
  fi
  enable_languages=`echo "${enable_languages}" | sed -e 's/[[ 	,]][[ 	,]]*/,/g' -e 's/,$//'`

+  # 'f95' is the old name for the 'fortran' language. We issue a warning
+  # and make the substitution.
+  case ,${enable_languages}, in
+    *,f95,*)
+      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
+      enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
+      ;;
+  esac
+
  # First scan to see if an enabled language requires some other language.
  # We assume that a given config-lang.in will list all the language
  # front ends it requires, even if some are required indirectly.
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@ -1,3 +1,10 @@
+2005-09-14  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+	* Make-lang.in: Change targets prefixes from f95 to fortran.
+	* config-lang.in: Change language name to "fortran".
+	* lang.opt: Change language name to "fortran".
+	* options.c: Change CL_F95 to CL_Fortran.
+
 2005-09-09  Thomas Koenig  <Thomas.Koenig@online.de>

 	gfortran.texi:  Document IOSTAT= specifier.
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@ -82,7 +82,7 @@ F95_LIBS = $(GMPLIBS) $(LIBS)

 #
 # Define the names for selecting gfortran in LANGUAGES.
-F95 f95: f951$(exeext)
+FORTRAN fortran: f951$(exeext)

 # Tell GNU make to ignore files by these names if they exist.
 .PHONY: F95 f95
@ -118,31 +118,31 @@ gt-fortran-trans-intrinsic.h		      : s-gtype; @true
 #
 # Build hooks:

-f95.all.build: gfortran$(exeext)
-f95.all.cross: gfortran-cross$(exeext)
+fortran.all.build: gfortran$(exeext)
+fortran.all.cross: gfortran-cross$(exeext)

-f95.start.encap: gfortran$(exeext)
-f95.rest.encap:
+fortran.start.encap: gfortran$(exeext)
+fortran.rest.encap:

-f95.srcinfo: doc/gfortran.info
+fortran.srcinfo: doc/gfortran.info
 	-cp -p $^ $(srcdir)/fortran

-f95.tags: force
+fortran.tags: force
 	cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \
 	etags --include TAGS.sub --include ../TAGS.sub

-f95.info: doc/gfortran.info
+fortran.info: doc/gfortran.info
 dvi:: doc/gfortran.dvi
 html:: $(htmldir)/gfortran/index.html

 F95_MANFILES = doc/gfortran.1

-f95.man: $(F95_MANFILES)
+fortran.man: $(F95_MANFILES)

-f95.srcman: $(F95_MANFILES)
+fortran.srcman: $(F95_MANFILES)
 	-cp -p $^ $(srcdir)/doc

-f95.srcextra:
+fortran.srcextra:

 check-f95 : check-gfortran
 lang_checks += check-gfortran
@ -182,11 +182,11 @@ gfortran.pod: $(GFORTRAN_TEXI)
 # f951 is installed elsewhere as part of $(COMPILERS).

 # Nothing to do here.
-f95.install-normal:
+fortran.install-normal:

 # Install the driver program as $(target)-gfortran
 # and also as either gfortran (if native) or $(tooldir)/bin/gfortran.
-f95.install-common: installdirs
+fortran.install-common: installdirs
 	-if [ -f f951$(exeext) ] ; then \
 	  if [ -f gfortran-cross$(exeext) ] ; then \
 	    rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_CROSS_NAME)$(exeext); \
@ -207,7 +207,7 @@ f95.install-common: installdirs

 install-info:: $(DESTDIR)$(infodir)/gfortran.info

-f95.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext)
+fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext)

 $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext): doc/gfortran.1 \
 		installdirs
@ -215,7 +215,7 @@ $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext): doc/gfortran.1 \
 	-$(INSTALL_DATA) $< $@
 	-chmod a-x $@

-f95.uninstall:
+fortran.uninstall:
 	if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
 	  echo " install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gfortran.info"; \
 	  install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gfortran.info || : ; \
@ -230,16 +230,16 @@ f95.uninstall:
 # A lot of the ancillary files are deleted by the main makefile.
 # We just have to delete files specific to us.

-f95.mostlyclean:
+fortran.mostlyclean:
 	-rm -f f951$(exeext)
 	-rm -f fortran/*.o

-f95.clean:
-f95.distclean:
+fortran.clean:
+fortran.distclean:
 	-rm -f fortran/config.status fortran/Makefile

-f95.extraclean:
-f95.maintainer-clean:
+fortran.extraclean:
+fortran.maintainer-clean:
 	-rm -f doc/gfortran.info* fortran/gfortran.*aux
 	-rm -f $(docobjdir)/gfortran.1

@ -247,17 +247,17 @@ f95.maintainer-clean:
 # Stage hooks:
 # The toplevel makefile has already created stage?/fortran at this point.

-f95.stage1: stage1-start
+fortran.stage1: stage1-start
 	-mv fortran/*$(objext) stage1/fortran
-f95.stage2: stage2-start
+fortran.stage2: stage2-start
 	-mv fortran/*$(objext) stage2/fortran
-f95.stage3: stage3-start
+fortran.stage3: stage3-start
 	-mv fortran/*$(objext) stage3/fortran
-f95.stage4: stage4-start
+fortran.stage4: stage4-start
 	-mv fortran/*$(objext) stage4/fortran
-f95.stageprofile: stageprofile-start
+fortran.stageprofile: stageprofile-start
 	-mv fortran/*$(objext) stageprofile/fortran
-f95.stagefeedback: stageprofile-start
+fortran.stagefeedback: stageprofile-start
 	-mv fortran/*$(objext) stagefeedback/fortran

 #
--- a/gcc/fortran/config-lang.in
+++ b/gcc/fortran/config-lang.in
@ -6,7 +6,7 @@
 # stagestuff	- files to add to $(STAGESTUFF)
 # diff_excludes	- files to ignore when building diffs between two versions.

-language="f95"
+language="fortran"

 compilers="f951\$(exeext)"

--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
@ -23,162 +23,162 @@
 ; Please try to keep this file in ASCII collating order.

 Language
-F95
+Fortran

 I
-F95 Joined
+Fortran Joined
 -I<directory>	Add a directory for INCLUDE and MODULE searching

 J
-F95 Joined
+Fortran Joined
 -J<directory>	Put MODULE files in 'directory'

 Wall
-F95 RejectNegative
+Fortran RejectNegative
 ; Documented in C

 Waliasing
-F95
+Fortran
 Warn about possible aliasing of dummy arguments

 Wconversion
-F95
+Fortran
 Warn about implicit conversion

 Wimplicit-interface
-F95
+Fortran
 Warn about calls with implicit interface

 Wline-truncation
-F95
+Fortran
 Warn about truncated source lines

 Wnonstd-intrinsics
-F95
+Fortran
 Warn about usage of non-standard intrinsics

 Wsurprising
-F95
+Fortran
 Warn about \"suspicious\" constructs

 Wunderflow
-F95
+Fortran
 Warn about underflow of numerical constant expressions

 Wunused-labels
-F95
+Fortran
 Warn when a label is unused

 fautomatic
-F95
+Fortran
 Do not treat local variables and COMMON blocks as if they were named in SAVE statements

 fbackslash
-F95
+Fortran
 Specify that backslash in string introduces an escape character

 fdefault-double-8
-F95
+Fortran
 Set the default double precision kind to an 8 byte wide type

 fdefault-integer-8
-F95
+Fortran
 Set the default integer kind to an 8 byte wide type

 fdefault-real-8
-F95
+Fortran
 Set the default real kind to an 8 byte wide type

 fd-lines-as-code
-F95 RejectNegative
+Fortran RejectNegative
 Ignore 'D' in column one in fixed form

 fd-lines-as-comments
-F95 RejectNegative
+Fortran RejectNegative
 Treat lines with 'D' in column one as comments

 fdollar-ok
-F95
+Fortran
 Allow dollar signs in entity names

 fdump-parse-tree
-F95
+Fortran
 Display the code tree after parsing

 ff2c
-F95
+Fortran
 Use f2c calling convention

 ffixed-form
-F95
+Fortran
 Assume that the source file is fixed form

 ffree-form
-F95
+Fortran
 Assume that the source file is free form

 funderscoring
-F95
+Fortran
 Append underscores to externally visible names

 fsecond-underscore
-F95
+Fortran
 Append a second underscore if the name already contains an underscore

 fimplicit-none
-F95
+Fortran
 Specify that no implicit typing is allowed, unless overridden by explicit IMPLICIT statements

 ffixed-line-length-none
-F95 RejectNegative
+Fortran RejectNegative
 Allow arbitrary character line width in fixed mode

 ffixed-line-length-
-F95 RejectNegative Joined UInteger
+Fortran RejectNegative Joined UInteger
 -ffixed-line-length-<n>		Use n as character line width in fixed mode

 fmax-identifier-length=
-F95 RejectNegative Joined UInteger
+Fortran RejectNegative Joined UInteger
 -fmax-identifier-length=<n>	Maximum identifier length

 fmax-stack-var-size=
-F95 RejectNegative Joined UInteger
+Fortran RejectNegative Joined UInteger
 -fmax-stack-var-size=<n>	Size in bytes of the largest array that will be put on the stack

 fmodule-private
-F95
+Fortran
 Set default accessibility of module entities to PRIVATE

 fno-backend
-F95 RejectNegative
+Fortran RejectNegative
 Don't generate code, just do syntax and semantics checking

 fpack-derived
-F95
+Fortran
 Try to layout derived types as compact as possible

 frepack-arrays
-F95
+Fortran
 Copy array sections into a contiguous block on procedure entry

 qkind=
-F95 RejectNegative Joined UInteger
+Fortran RejectNegative Joined UInteger
 -qkind=<n>	Set the kind for a real with the 'q' exponent to 'n'

 std=f95
-F95
+Fortran
 Conform to the ISO Fortran 95 standard

 std=f2003
-F95
+Fortran
 Conform to the ISO Fortran 2003 standard

 std=gnu
-F95
+Fortran
 Conform nothing in particular

 std=legacy
-F95
+Fortran
 Accept extensions to support legacy code

 ; This comment is to ensure we retain the blank line above.
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@ -87,7 +87,7 @@ gfc_init_options (unsigned int argc ATTRIBUTE_UNUSED,

  gfc_option.warn_nonstd_intrinsics = 0;

-  return CL_F95;
+  return CL_Fortran;
 }