Changeset 41


Ignore:
Timestamp:
Jun 12, 2006 1:23:26 PM (14 years ago)
Author:
andreasw
Message:

some BuildTools? fixes to make things work on MinGW

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r40 r41  
    141141# We set the following variable so that we know later in AC_COIN_FINALIZE
    142142# that we are in a project main directory
    143 coin_projectdir=yes
     143
    144144]) # AC_COIN_PROJECTDIR_INIT
    145145
     
    187187]) # AC_COIN_DEBUG_COMPILE
    188188
     189###########################################################################
     190#                          COIN_MINGW_LD_FIX                              #
     191###########################################################################
     192
     193# This macro is included by any PROG_compiler macro, to set the LD
     194# environment variable on MinWG to the correct value (link)
     195
     196AC_DEFUN([AC_COIN_MINGW_LD_FIX],
     197[case $build in
     198  *-mingw*)
     199    if test "${LD+set}" = set; then :; else
     200      LD=link
     201    fi
     202    ;;
     203esac
     204])
    189205
    190206###########################################################################
     
    198214
    199215AC_DEFUN([AC_COIN_PROG_CXX],
    200 [AC_REQUIRE([AC_COIN_PROG_CC]) #Let's try if that overcomes configuration problem with VC++ 6.0
     216[AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
     217AC_REQUIRE([AC_COIN_PROG_CC]) #Let's try if that overcomes configuration problem with VC++ 6.0
    201218AC_LANG_PUSH(C++)
    202219
     
    443460
    444461AC_DEFUN([AC_COIN_PROG_CC],
    445 [AC_LANG_PUSH(C)
     462[AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
     463AC_LANG_PUSH(C)
    446464
    447465# For consistency, we set the C compiler to the same value of the C++
     
    610628
    611629AC_DEFUN([AC_COIN_PROG_F77],
    612 [AC_LANG_PUSH([Fortran 77])
     630[AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
     631AC_LANG_PUSH([Fortran 77])
    613632
    614633coin_has_f77=yes
     
    9871006  ;;
    9881007  *-mingw*)
    989     case $CXX in
     1008    case "$CXX" in
    9901009      cl*)
    9911010        coin_disable_shared=yes
     
    9991018    AC_MSG_WARN([On $platform, shared objects are not supported. I'm disabling your choice.])
    10001019  fi
    1001 #  enable_shared=no
     1020  enable_shared=no
    10021021fi
    10031022# By default, we only want the shared objects to be compiled
Note: See TracChangeset for help on using the changeset viewer.