Changeset 2166
- Timestamp:
- Apr 3, 2011 8:07:35 AM (10 years ago)
- Location:
- stable/0.6
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/0.6
- Property svn:mergeinfo changed
/trunk merged: 2136,2139,2145,2155,2165
- Property svn:mergeinfo changed
-
stable/0.6/coin.m4
r2112 r2166 342 342 if test "x$have_svnversion" = xyes && test "x$1" != x; then 343 343 AC_SUBST(m4_toupper($1_SVN_REV)) 344 svn_rev_tmp=`cd $srcdir/$m4_tolower(coin_has_$1) ; svnversion` 345 m4_toupper($1_SVN_REV)=`echo $svn_rev_tmp | sed -n -e 's/^@<:@0-9@:>@*://' -e 's/\(@<:@0-9@:>@\)@<:@^0-9@:>@*$/\1/p'` 346 if test $m4_toupper($1_SVN_REV) != exported; then 347 AC_DEFINE_UNQUOTED(m4_toupper($1_SVN_REV), $m4_toupper($1_SVN_REV), 348 [SVN revision number of project]) 344 svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null` 345 if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x; then 346 m4_toupper($1_SVN_REV)=`echo $svn_rev_tmp | sed -n -e 's/^@<:@0-9@:>@*://' -e 's/\(@<:@0-9@:>@\)@<:@^0-9@:>@*$/\1/p'` 347 AC_DEFINE_UNQUOTED(m4_toupper($1_SVN_REV), $m4_toupper($1_SVN_REV), [SVN revision number of project]) 349 348 fi 350 349 fi … … 948 947 fi 949 948 950 # add automake conditional so we can recognize cl compiler in makefile951 coin_cc_is_cl=false952 if test x"$CXX" != x; then953 case "$CXX" in954 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)955 coin_cc_is_cl=true956 ;;957 esac958 fi959 AM_CONDITIONAL(COIN_CC_IS_CL, [test $coin_cc_is_cl = true])960 961 949 AC_ARG_VAR(CDEFS,[Additional -D flags to be used when compiling C code.]) 962 950 AC_ARG_VAR(ADD_CFLAGS,[Additional C compiler options]) … … 1010 998 esac 1011 999 CFLAGS="$save_cflags" 1000 1001 # add automake conditional so we can recognize cl compiler in makefile 1002 coin_cc_is_cl=false 1003 case "$CC" in 1004 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 1005 coin_cc_is_cl=true 1006 ;; 1007 esac 1008 AM_CONDITIONAL(COIN_CC_IS_CL, [test $coin_cc_is_cl = true]) 1012 1009 1013 1010 # Check if a project specific CFLAGS variable has been set … … 1417 1414 ########################################################################### 1418 1415 1419 # Calls autoconfs AC_F77_WRAPPERS and does additional corrections to FLIBS 1420 1421 AC_DEFUN([AC_COIN_F77_WRAPPERS], 1422 [AC_BEFORE([AC_COIN_PROG_F77],[$0])dnl 1423 AC_BEFORE([AC_PROG_F77],[$0])dnl 1424 1425 AC_LANG_PUSH([Fortran 77]) 1426 1427 AC_F77_WRAPPERS 1416 # Calls autoconfs AC_F77_LIBRARY_LDFLAGS and does additional corrections to FLIBS. 1417 # Then calls AC_F77_WRAPPERS to get Fortran namemangling scheme. 1418 # 1419 # To ensure that the FLIBS are determined and corrected before linking against 1420 # Fortran compilers is attempted by other macros, we put it into an extra macro 1421 # and call it via AC_REQUIRE. This way it seems to be called before the macros 1422 # required by AC_F77_WRAPPERS. 1423 1424 AC_DEFUN([_AC_COIN_F77_LIBRARY_LDFLAGS], 1425 [AC_BEFORE([AC_PROG_F77],[$0])dnl 1426 1427 # get FLIBS 1428 AC_F77_LIBRARY_LDFLAGS 1429 orig_FLIBS="$FLIBS" 1428 1430 1429 1431 # If FLIBS has been set by the user, we just restore its value here … … 1450 1452 # This is seem to be unnecessary, libifcorert(d).lib has been removed from the link line. 1451 1453 # Further, excluding libc.lib from the default libs seemed to be necessary only for VS < 8. 1452 # Since the corresponding flag seems to make more trouble tha t it avoid, it has been removed now.1454 # Since the corresponding flag seems to make more trouble than it avoids, it has been removed now. 1453 1455 *-cygwin* | *-mingw*) 1454 1456 case "$F77" in … … 1479 1481 fi 1480 1482 1483 if test "x$orig_FLIBS" != "x$FLIBS" ; then 1484 AC_MSG_NOTICE([Corrected Fortran libraries: $FLIBS]) 1485 fi 1486 ]) # _AC_COIN_F77_LIBRARY_LDFLAGS 1487 1488 AC_DEFUN([AC_COIN_F77_WRAPPERS], 1489 [AC_BEFORE([AC_COIN_PROG_F77],[$0])dnl 1490 AC_REQUIRE([_AC_COIN_F77_LIBRARY_LDFLAGS])dnl 1491 1492 AC_LANG_PUSH([Fortran 77]) 1493 AC_F77_WRAPPERS 1481 1494 AC_LANG_POP([Fortran 77]) 1482 1495 -
stable/0.6/compile_f2c
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.