Changeset 2113 for stable


Ignore:
Timestamp:
Feb 27, 2011 12:52:24 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2112

Location:
stable/0.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r2109 r2113  
    12571257       coin_f77_comps="ifort fl32 compile_f2c"
    12581258     else
    1259        coin_f77_comps="gfortran g77 ifort fl32 compile_f2c"
     1259       coin_f77_comps="gfortran ifort g95 g77 fl32 compile_f2c"
    12601260     fi ;;
    12611261  *-*-solaris*)
    1262      coin_f77_comps="f95 f90 f77 xlf_r fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;
     1262     coin_f77_comps="f95 f90 g95 f77 xlf_r fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;
    12631263  *-linux-gnu*)
    1264      coin_f77_comps="gfortran fort77 f77 g77 pgf90 pgf77 ifort ifc frt af77 xlf_r" ;;
    1265   *) coin_f77_comps="xlf_r fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;;
     1264     coin_f77_comps="gfortran ifort g95 fort77 f77 g77 pgf90 pgf77 ifc frt af77 xlf_r" ;;
     1265  *) coin_f77_comps="xlf_r fort77 gfortran ifort g95 f77 g77 pgf90 pgf77 ifc frt af77" ;;
    12661266 esac
    12671267])
     
    12871287AC_DEFUN([AC_COIN_INIT_AUTOMAKE],
    12881288[AC_REQUIRE([AC_PROG_EGREP])
     1289AC_REQUIRE([AC_PROG_LN_S])
    12891290
    12901291# AC_MSG_NOTICE([Beginning automake initialisation.])
     
    14511452        BUILDTOOLSDIR=$srcdir/../../BuildTools
    14521453      else
    1453         AC_MSG_ERROR(Cannot find the BuildTools directory)
     1454        AC_MSG_ERROR(Cannot find the BuildTools directory, better disable maintainer mode.)
    14541455      fi
    14551456    fi
    14561457  fi
    14571458  AC_SUBST(BUILDTOOLSDIR)
     1459 
     1460  # for running automake by make, we need to have Makemain.inc available at the place where it usually can be found during run_autotools
     1461  if test "$BUILDTOOLSDIR" != "$srcdir/BuildTools" ; then
     1462    $LN_S `cd $BUILDTOOLSDIR; pwd` "$srcdir/BuildTools"
     1463  fi
    14581464
    14591465  # The following variable is set to the name of the directory where
  • stable/0.7/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.