# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1241728983 14400
# Node ID a3237ae32c0d1b6133b8188abc37dbfcd2ae7e8f
# Parent  49a0c58a7dcff88456468915e300d35fce106257
eliminate last remnants of F2C variables

diff -r 49a0c58a7dcf -r a3237ae32c0d ChangeLog
--- a/ChangeLog	Thu May 07 16:28:44 2009 -0400
+++ b/ChangeLog	Thu May 07 16:43:03 2009 -0400
@@ -1,3 +1,8 @@
+2009-05-07  John W. Eaton  <jwe@octave.org>
+
+	* configure.in, mkoctfile.in, mkoctfile.cc.in, octave-bug.in,
+	octave-bug.cc.in: Eliminate last remnants of f2c goop.
+
 2009-05-07  Marco Atzeri  <marco_atzeri@yahoo.it>
 
 	* configure.in, Makeconf.in: (SHLPRE): Rename from SHLLIBPRE.
diff -r 49a0c58a7dcf -r a3237ae32c0d Makeconf.in
--- a/Makeconf.in	Thu May 07 16:28:44 2009 -0400
+++ b/Makeconf.in	Thu May 07 16:43:03 2009 -0400
@@ -104,11 +104,6 @@
 SHLPRE = @SHLPRE@
 SHLBINPRE = @SHLBINPRE@
 
-# Fortran to C translator and associated flags.
-
-F2C = @F2C@
-F2CFLAGS = @F2CFLAGS@
-
 # Fortran compiler flags.
 
 FC = @FC@
@@ -499,8 +494,6 @@
   -e "s|%OCTAVE_CONF_DL_LD%|\"${DL_LD}\"|" \
   -e "s|%OCTAVE_CONF_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_EXEEXT%|\"${EXEEXT}\"|" \
-  -e "s|%OCTAVE_CONF_F2C%|\"${F2C}\"|" \
-  -e "s|%OCTAVE_CONF_F2CFLAGS%|\"${F2CFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \
   -e "s|%OCTAVE_CONF_F77_FLOAT_STORE_FLAG%|\"${F77_FLOAT_STORE_FLAG}\"|" \
   -e "s|%OCTAVE_CONF_FC%|\"${FC}\"|" \
diff -r 49a0c58a7dcf -r a3237ae32c0d configure.in
--- a/configure.in	Thu May 07 16:28:44 2009 -0400
+++ b/configure.in	Thu May 07 16:43:03 2009 -0400
@@ -2058,11 +2058,6 @@
 #define FCN_PTR_CAST(T, E) reinterpret_cast<T> (E)
 #endif
 
-#if defined(HAVE_F2C) && !defined(F77_FUNC)
-#  define F77_FUNC(x,X) x ## _
-#  define F77_FUNC_(x,X) x ## __
-#endif
-
 #if !defined(HAVE_DEV_T)
 typedef short dev_t;
 #endif
@@ -2175,12 +2170,6 @@
 
 ### Print a summary so that important information isn't missed.
 
-if test -z "$F77"; then
-  FORT="$F2C $F2CFLAGS"
-else
-  FORT="$F77 $FFLAGS"
-fi
-
 AC_MSG_NOTICE([
 
 Octave is now configured for $canonical_host_type
@@ -2189,7 +2178,7 @@
   Installation prefix:  $prefix
   C compiler:           $CC $XTRA_CFLAGS $WARN_CFLAGS $CFLAGS
   C++ compiler:         $CXX $XTRA_CXXFLAGS $WARN_CXXFLAGS $CXXFLAGS
-  Fortran compiler:     $FORT
+  Fortran compiler:     $F77 $FFLAGS
   Fortran libraries:    $FLIBS
   BLAS libraries:       $BLAS_LIBS
   FFTW libraries:       $FFTW_LIBS
diff -r 49a0c58a7dcf -r a3237ae32c0d mkoctfile.cc.in
--- a/mkoctfile.cc.in	Thu May 07 16:28:44 2009 -0400
+++ b/mkoctfile.cc.in	Thu May 07 16:43:03 2009 -0400
@@ -199,8 +199,6 @@
 
   vars["CPPFLAGS"] = get_variable ("CPPFLAGS", %OCTAVE_CONF_CPPFLAGS%);
   vars["INCFLAGS"] = get_variable ("INCFLAGS", DEFAULT_INCFLAGS);
-  vars["F2C"] = get_variable ("F2C", %OCTAVE_CONF_F2C%);
-  vars["F2CFLAGS"] = get_variable ("F2CFLAGS", %OCTAVE_CONF_F2CFLAGS%);
   vars["F77"] = get_variable ("F77", %OCTAVE_CONF_F77%);
   vars["FFLAGS"] = get_variable ("FFLAGS", %OCTAVE_CONF_FFLAGS%);
   vars["FPICFLAG"] = get_variable ("FPICFLAG", %OCTAVE_CONF_FPICFLAG%);
@@ -288,26 +286,25 @@
 "  -p VAR, --print VAR     Print configuration variable VAR.  Recognized\n"
 "                          variables are:\n"
 "\n"
-"			    ALL_CFLAGS                FFTW_LIBS     \n"
-"			    ALL_CXXFLAGS              FLIBS       \n"
-"			    ALL_FFLAGS                FPICFLAG      \n"
-"			    ALL_LDFLAGS               INCFLAGS      \n"
-"			    BLAS_LIBS                 LDFLAGS             \n"
-"			    CC                        LD_CXX              \n"
-"			    CFLAGS                    LD_STATIC_FLAG\n"
-"			    CPICFLAG                  LFLAGS              \n"
-"			    CPPFLAGS                  LIBCRUFT      \n"
-"			    CXX                       LIBOCTAVE     \n"
-"			    CXXFLAGS                  LIBOCTINTERP  \n"
-"			    CXXPICFLAG                LIBREADLINE   \n"
-"			    DEPEND_EXTRA_SED_PATTERN  LIBS        \n"
-"			    DEPEND_FLAGS              OCTAVE_LIBS   \n"
-"			    DL_LD                     RDYNAMIC_FLAG \n"
-"			    DL_LDFLAGS                RLD_FLAG      \n"
-"			    F2C                       SED         \n"
-"			    F2CFLAGS                  XTRA_CFLAGS   \n"
-"			    F77                       XTRA_CXXFLAGS \n"
-"			    FFLAGS\n"
+"			    ALL_CFLAGS                FLIBS\n"
+"			    ALL_CXXFLAGS              FPICFLAG\n"
+"			    ALL_FFLAGS                INCFLAGS\n"
+"			    ALL_LDFLAGS               LDFLAGS\n"
+"			    BLAS_LIBS                 LD_CXX\n"
+"			    CC                        LD_STATIC_FLAG\n"
+"			    CFLAGS                    LFLAGS\n"
+"			    CPICFLAG                  LIBCRUFT\n"
+"			    CPPFLAGS                  LIBOCTAVE\n"
+"			    CXX                       LIBOCTINTERP\n"
+"			    CXXFLAGS                  LIBREADLINE\n"
+"			    CXXPICFLAG                LIBS\n"
+"			    DEPEND_EXTRA_SED_PATTERN  OCTAVE_LIBS\n"
+"			    DEPEND_FLAGS              RDYNAMIC_FLAG\n"
+"			    DL_LD                     RLD_FLAG\n"
+"			    DL_LDFLAGS                SED\n"
+"			    F77                       XTRA_CFLAGS\n"
+"			    FFLAGS                    XTRA_CXXFLAGS\n"
+"			    FFTW_LIBS\n"
 "\n"
 "  --link-stand-alone      Link a stand-alone executable file.\n"
 "\n"
@@ -632,15 +629,7 @@
   for (it = f77files.begin (); it != f77files.end (); ++it)
     {
       string f = *it, b = basename (f);
-      if (!vars["F2C"].empty () && vars["F2C"] != "@F2C@")
-	{
-	  string c = b + ".c";
-	  cfiles.push_back (c);
-	  string cmd = vars["F2C"] + " " + vars["F2CFLAGS"]
-	    + " < " + f + " > " + c;
-	  result = run_command (cmd);
-	}
-      else if (!vars["F77"].empty ())
+      if (!vars["F77"].empty ())
 	{
 	  string o;
 	  if (!outputfile.empty ())
diff -r 49a0c58a7dcf -r a3237ae32c0d mkoctfile.in
--- a/mkoctfile.in	Thu May 07 16:28:44 2009 -0400
+++ b/mkoctfile.in	Thu May 07 16:43:03 2009 -0400
@@ -7,17 +7,17 @@
 ##               2006, 2007 John W. Eaton
 ##
 ## This file is part of Octave.
-## 
+##
 ## Octave is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by the
 ## Free Software Foundation; either version 3 of the License, or (at
 ## your option) any later version.
-## 
+##
 ## Octave is distributed in the hope that it will be useful, but WITHOUT
 ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 ## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 ## for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## along with Octave; see the file COPYING.  If not, see
 ## <http://www.gnu.org/licenses/>.
@@ -62,14 +62,12 @@
 fi
 
 # Default values for these variables are filled in when Octave is
-# compiled. 
+# compiled.
 
 : ${EXEEXT=%OCTAVE_CONF_EXEEXT%}
 
 : ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%}
 : ${INCFLAGS=$DEFAULT_INCFLAGS}
-: ${F2C=%OCTAVE_CONF_F2C%}
-: ${F2CFLAGS=%OCTAVE_CONF_F2CFLAGS%}
 : ${F77=%OCTAVE_CONF_F77%}
 : ${FFLAGS=%OCTAVE_CONF_FFLAGS%}
 : ${FPICFLAG=%OCTAVE_CONF_FPICFLAG%}
@@ -218,26 +216,25 @@
   -p VAR, --print VAR     Print configuration variable VAR.  Recognized
                           variables are:
 
-			    ALL_CFLAGS                FFTW_LIBS     
-			    ALL_CXXFLAGS              FLIBS       
-			    ALL_FFLAGS                FPICFLAG      
-			    ALL_LDFLAGS               INCFLAGS      
-			    BLAS_LIBS                 LDFLAGS             
-			    CC                        LD_CXX              
-			    CFLAGS                    LD_STATIC_FLAG
-			    CPICFLAG                  LFLAGS              
-			    CPPFLAGS                  LIBCRUFT      
-			    CXX                       LIBOCTAVE     
-			    CXXFLAGS                  LIBOCTINTERP  
-			    CXXPICFLAG                LIBREADLINE   
-			    DEPEND_EXTRA_SED_PATTERN  LIBS        
-			    DEPEND_FLAGS              OCTAVE_LIBS   
-			    DL_LD                     RDYNAMIC_FLAG 
-			    DL_LDFLAGS                RLD_FLAG      
-			    F2C                       SED         
-			    F2CFLAGS                  XTRA_CFLAGS   
-			    F77                       XTRA_CXXFLAGS 
-			    FFLAGS
+			    ALL_CFLAGS                FLIBS
+			    ALL_CXXFLAGS              FPICFLAG
+			    ALL_FFLAGS                INCFLAGS
+			    ALL_LDFLAGS               LDFLAGS
+			    BLAS_LIBS                 LD_CXX
+			    CC                        LD_STATIC_FLAG
+			    CFLAGS                    LFLAGS
+			    CPICFLAG                  LIBCRUFT
+			    CPPFLAGS                  LIBOCTAVE
+			    CXX                       LIBOCTINTERP
+			    CXXFLAGS                  LIBREADLINE
+			    CXXPICFLAG                LIBS
+			    DEPEND_EXTRA_SED_PATTERN  OCTAVE_LIBS
+			    DEPEND_FLAGS              RDYNAMIC_FLAG
+			    DL_LD                     RLD_FLAG
+			    DL_LDFLAGS                SED
+			    F77                       XTRA_CFLAGS
+			    FFLAGS                    XTRA_CXXFLAGS
+			    FFTW_LIBS
 
   --link-stand-alone      Link a stand-alone executable file.
 
@@ -417,7 +414,7 @@
     esac
     if [ -n "$F77" ]; then
       if [ -n "$outputfile" ]; then
-	if $link; then 
+	if $link; then
 	  o=$b.o
 	else
 	  o=$outputfile
@@ -429,12 +426,6 @@
       cmd="$F77 -c $FPICFLAG $ALL_FFLAGS $incflags $defs $pass_on_options $f -o $o"
       $dbg $cmd
       eval $cmd
-    elif [ -n "$F2C" ]; then
-      c=$b.c
-      cfiles="$cfiles $c"
-      cmd="$F2C $F2CFLAGS < $f > $c"
-      $dbg $cmd
-      eval $cmd
     else
       echo "mkoctfile: no way to compile Fortran file $f" 1>&2
     fi
diff -r 49a0c58a7dcf -r a3237ae32c0d octave-bug.cc.in
--- a/octave-bug.cc.in	Thu May 07 16:28:44 2009 -0400
+++ b/octave-bug.cc.in	Thu May 07 16:43:03 2009 -0400
@@ -83,8 +83,6 @@
   vars["FFLAGS"] = %OCTAVE_CONF_FFLAGS%;
   vars["FPICFLAG"] = %OCTAVE_CONF_FPICFLAG%;
   vars["FLIBS"] = %OCTAVE_CONF_FLIBS%;
-  vars["F2C"] = %OCTAVE_CONF_F2C%;
-  vars["F2CFLAGS"] = %OCTAVE_CONF_F2CFLAGS%;
   vars["CPPFLAGS"] = %OCTAVE_CONF_CPPFLAGS%;
   vars["INCFLAGS"] = %OCTAVE_CONF_INCFLAGS%;
   vars["CC"] = %OCTAVE_CONF_CC%;
@@ -168,8 +166,6 @@
   os << "configure opts:   " << vars["config_opts"] << endl;
   os << "Fortran compiler: " << vars["F77"] << endl;
   os << "FFLAGS:           " << vars["FFLAGS"] << endl;
-  os << "F2C:              " << vars["F2C"] << endl;
-  os << "F2CFLAGS:         " << vars["F2CFLAGS"] << endl;
   os << "FLIBS:            " << vars["FLIBS"] << endl;
   os << "CPPFLAGS:         " << vars["CPPFLAGS"] << endl;
   os << "INCFLAGS:         " << vars["INCFLAGS"] << endl;
diff -r 49a0c58a7dcf -r a3237ae32c0d octave-bug.in
--- a/octave-bug.in	Thu May 07 16:28:44 2009 -0400
+++ b/octave-bug.in	Thu May 07 16:43:03 2009 -0400
@@ -35,8 +35,6 @@
 FFLAGS=%OCTAVE_CONF_FFLAGS%
 FPICFLAG=%OCTAVE_CONF_FPICFLAG%
 FLIBS=%OCTAVE_CONF_FLIBS%
-F2C=%OCTAVE_CONF_F2C%
-F2CFLAGS=%OCTAVE_CONF_F2CFLAGS%
 CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%
 INCFLAGS=%OCTAVE_CONF_INCFLAGS%
 CC=%OCTAVE_CONF_CC%
@@ -231,8 +229,6 @@
 configure opts:   $config_opts
 Fortran compiler: $F77
 FFLAGS:           $FFLAGS
-F2C:              $F2C
-F2CFLAGS:         $F2CFLAGS
 FLIBS:            $FLIBS
 CPPFLAGS:         $CPPFLAGS
 INCFLAGS:         $INCFLAGS
diff -r 49a0c58a7dcf -r a3237ae32c0d src/ChangeLog
--- a/src/ChangeLog	Thu May 07 16:28:44 2009 -0400
+++ b/src/ChangeLog	Thu May 07 16:43:03 2009 -0400
@@ -1,3 +1,10 @@
+2009-05-07  John W. Eaton  <jwe@octave.org>
+
+	* toplev.cc (octave_config_info): Remove F2C and F2CFLAGS from the
+	config infor struct.
+	* oct-conf.h.in (OCTAVE_CONF_F2CFLAGS, OCTAVE_CONF_F2C):
+	Delete definitions.
+
 2009-05-07  Marco Atzeri  <marco_atzeri@yahoo.it>
 
         * Makefile.in: (SHLPRE): Rename from SHLLIBPRE.
diff -r 49a0c58a7dcf -r a3237ae32c0d src/oct-conf.h.in
--- a/src/oct-conf.h.in	Thu May 07 16:28:44 2009 -0400
+++ b/src/oct-conf.h.in	Thu May 07 16:43:03 2009 -0400
@@ -121,14 +121,6 @@
 #define OCTAVE_CONF_EXEEXT %OCTAVE_CONF_EXEEXT%
 #endif
 
-#ifndef OCTAVE_CONF_F2CFLAGS
-#define OCTAVE_CONF_F2CFLAGS %OCTAVE_CONF_F2CFLAGS%
-#endif
-
-#ifndef OCTAVE_CONF_F2C
-#define OCTAVE_CONF_F2C %OCTAVE_CONF_F2C%
-#endif
-
 #ifndef OCTAVE_CONF_F77
 #define OCTAVE_CONF_F77 %OCTAVE_CONF_F77%
 #endif
diff -r 49a0c58a7dcf -r a3237ae32c0d src/toplev.cc
--- a/src/toplev.cc	Thu May 07 16:28:44 2009 -0400
+++ b/src/toplev.cc	Thu May 07 16:43:03 2009 -0400
@@ -1165,8 +1165,6 @@
       { false, "DL_LDFLAGS", OCTAVE_CONF_DL_LDFLAGS },
       { false, "ENABLE_DYNAMIC_LINKING", OCTAVE_CONF_ENABLE_DYNAMIC_LINKING },
       { false, "EXEEXT", OCTAVE_CONF_EXEEXT },
-      { false, "F2C", OCTAVE_CONF_F2C },
-      { false, "F2CFLAGS", OCTAVE_CONF_F2CFLAGS },
       { false, "F77", OCTAVE_CONF_F77 },
       { false, "F77_FLOAT_STORE_FLAG", OCTAVE_CONF_F77_FLOAT_STORE_FLAG },
       { false, "FC", OCTAVE_CONF_FC },