Changeset 2480 for ThirdParty/ASL


Ignore:
Timestamp:
Nov 13, 2011 12:59:59 PM (8 years ago)
Author:
stefan
Message:

try to workaround issue in recent ASL with unavailability of strtoull on 64bit windows

Location:
ThirdParty/ASL/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/trunk/configure

    r2336 r2480  
    19531953if test x"$CXX" != x; then
    19541954  case "$CXX" in
     1955    clang* ) ;;
    19551956    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    19561957      if test x"$CC" = x; then
     
    27722773# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    27732774case "$CC" in
     2775  clang* ) ;;
    27742776  cl* | */cl* | CL* | */CL* )
    27752777    if test "$ac_cv_prog_cc_g" = yes ; then
     
    27842786coin_cc_is_cl=false
    27852787case "$CC" in
     2788  clang* ) ;;
    27862789  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    27872790    coin_cc_is_cl=true
     
    28872890      *-cygwin* | *-mingw*)
    28882891        case "$CC" in
     2892          clang* ) ;;
    28892893          cl* | */cl* | CL* | */CL*)
    28902894            coin_opt_cflags='-MT -O2'
     
    32083212# Correct the LD variable if we are using the MS or Intel-windows compiler
    32093213case "$CC" in
     3214  clang* ) ;;
    32103215  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    32113216    case $build in
     
    48484853*-*-irix6*)
    48494854  # Find out which ABI we are using.
    4850   echo '#line 4850 "configure"' > conftest.$ac_ext
     4855  echo '#line 4855 "configure"' > conftest.$ac_ext
    48514856  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    48524857  (eval $ac_compile) 2>&5
     
    64476452
    64486453# Provide some information about the compiler.
    6449 echo "$as_me:6449:" \
     6454echo "$as_me:6454:" \
    64506455     "checking for Fortran 77 compiler version" >&5
    64516456ac_compiler=`set X $ac_compile; echo $2`
     
    75147519   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    75157520   -e 's:$: $lt_compiler_flag:'`
    7516    (eval echo "\"\$as_me:7516: $lt_compile\"" >&5)
     7521   (eval echo "\"\$as_me:7521: $lt_compile\"" >&5)
    75177522   (eval "$lt_compile" 2>conftest.err)
    75187523   ac_status=$?
    75197524   cat conftest.err >&5
    7520    echo "$as_me:7520: \$? = $ac_status" >&5
     7525   echo "$as_me:7525: \$? = $ac_status" >&5
    75217526   if (exit $ac_status) && test -s "$ac_outfile"; then
    75227527     # The compiler can only warn and ignore the option if not recognized
     
    77827787   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77837788   -e 's:$: $lt_compiler_flag:'`
    7784    (eval echo "\"\$as_me:7784: $lt_compile\"" >&5)
     7789   (eval echo "\"\$as_me:7789: $lt_compile\"" >&5)
    77857790   (eval "$lt_compile" 2>conftest.err)
    77867791   ac_status=$?
    77877792   cat conftest.err >&5
    7788    echo "$as_me:7788: \$? = $ac_status" >&5
     7793   echo "$as_me:7793: \$? = $ac_status" >&5
    77897794   if (exit $ac_status) && test -s "$ac_outfile"; then
    77907795     # The compiler can only warn and ignore the option if not recognized
     
    78867891   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78877892   -e 's:$: $lt_compiler_flag:'`
    7888    (eval echo "\"\$as_me:7888: $lt_compile\"" >&5)
     7893   (eval echo "\"\$as_me:7893: $lt_compile\"" >&5)
    78897894   (eval "$lt_compile" 2>out/conftest.err)
    78907895   ac_status=$?
    78917896   cat out/conftest.err >&5
    7892    echo "$as_me:7892: \$? = $ac_status" >&5
     7897   echo "$as_me:7897: \$? = $ac_status" >&5
    78937898   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    78947899   then
     
    1023110236  lt_status=$lt_dlunknown
    1023210237  cat > conftest.$ac_ext <<EOF
    10233 #line 10233 "configure"
     10238#line 10238 "configure"
    1023410239#include "confdefs.h"
    1023510240
     
    1033110336  lt_status=$lt_dlunknown
    1033210337  cat > conftest.$ac_ext <<EOF
    10333 #line 10333 "configure"
     10338#line 10338 "configure"
    1033410339#include "confdefs.h"
    1033510340
     
    1267512680   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1267612681   -e 's:$: $lt_compiler_flag:'`
    12677    (eval echo "\"\$as_me:12677: $lt_compile\"" >&5)
     12682   (eval echo "\"\$as_me:12682: $lt_compile\"" >&5)
    1267812683   (eval "$lt_compile" 2>conftest.err)
    1267912684   ac_status=$?
    1268012685   cat conftest.err >&5
    12681    echo "$as_me:12681: \$? = $ac_status" >&5
     12686   echo "$as_me:12686: \$? = $ac_status" >&5
    1268212687   if (exit $ac_status) && test -s "$ac_outfile"; then
    1268312688     # The compiler can only warn and ignore the option if not recognized
     
    1277912784   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1278012785   -e 's:$: $lt_compiler_flag:'`
    12781    (eval echo "\"\$as_me:12781: $lt_compile\"" >&5)
     12786   (eval echo "\"\$as_me:12786: $lt_compile\"" >&5)
    1278212787   (eval "$lt_compile" 2>out/conftest.err)
    1278312788   ac_status=$?
    1278412789   cat out/conftest.err >&5
    12785    echo "$as_me:12785: \$? = $ac_status" >&5
     12790   echo "$as_me:12790: \$? = $ac_status" >&5
    1278612791   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1278712792   then
     
    1434914354   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1435014355   -e 's:$: $lt_compiler_flag:'`
    14351    (eval echo "\"\$as_me:14351: $lt_compile\"" >&5)
     14356   (eval echo "\"\$as_me:14356: $lt_compile\"" >&5)
    1435214357   (eval "$lt_compile" 2>conftest.err)
    1435314358   ac_status=$?
    1435414359   cat conftest.err >&5
    14355    echo "$as_me:14355: \$? = $ac_status" >&5
     14360   echo "$as_me:14360: \$? = $ac_status" >&5
    1435614361   if (exit $ac_status) && test -s "$ac_outfile"; then
    1435714362     # The compiler can only warn and ignore the option if not recognized
     
    1445314458   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1445414459   -e 's:$: $lt_compiler_flag:'`
    14455    (eval echo "\"\$as_me:14455: $lt_compile\"" >&5)
     14460   (eval echo "\"\$as_me:14460: $lt_compile\"" >&5)
    1445614461   (eval "$lt_compile" 2>out/conftest.err)
    1445714462   ac_status=$?
    1445814463   cat out/conftest.err >&5
    14459    echo "$as_me:14459: \$? = $ac_status" >&5
     14464   echo "$as_me:14464: \$? = $ac_status" >&5
    1446014465   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1446114466   then
     
    1666016665   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1666116666   -e 's:$: $lt_compiler_flag:'`
    16662    (eval echo "\"\$as_me:16662: $lt_compile\"" >&5)
     16667   (eval echo "\"\$as_me:16667: $lt_compile\"" >&5)
    1666316668   (eval "$lt_compile" 2>conftest.err)
    1666416669   ac_status=$?
    1666516670   cat conftest.err >&5
    16666    echo "$as_me:16666: \$? = $ac_status" >&5
     16671   echo "$as_me:16671: \$? = $ac_status" >&5
    1666716672   if (exit $ac_status) && test -s "$ac_outfile"; then
    1666816673     # The compiler can only warn and ignore the option if not recognized
     
    1692816933   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1692916934   -e 's:$: $lt_compiler_flag:'`
    16930    (eval echo "\"\$as_me:16930: $lt_compile\"" >&5)
     16935   (eval echo "\"\$as_me:16935: $lt_compile\"" >&5)
    1693116936   (eval "$lt_compile" 2>conftest.err)
    1693216937   ac_status=$?
    1693316938   cat conftest.err >&5
    16934    echo "$as_me:16934: \$? = $ac_status" >&5
     16939   echo "$as_me:16939: \$? = $ac_status" >&5
    1693516940   if (exit $ac_status) && test -s "$ac_outfile"; then
    1693616941     # The compiler can only warn and ignore the option if not recognized
     
    1703217037   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1703317038   -e 's:$: $lt_compiler_flag:'`
    17034    (eval echo "\"\$as_me:17034: $lt_compile\"" >&5)
     17039   (eval echo "\"\$as_me:17039: $lt_compile\"" >&5)
    1703517040   (eval "$lt_compile" 2>out/conftest.err)
    1703617041   ac_status=$?
    1703717042   cat out/conftest.err >&5
    17038    echo "$as_me:17038: \$? = $ac_status" >&5
     17043   echo "$as_me:17043: \$? = $ac_status" >&5
    1703917044   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1704017045   then
     
    1977219777    *-cygwin* | *-mingw*)
    1977319778       case "$CXX" in
     19779    clang* )
     19780      # we assume that libtool patches for CLANG are the same as for GNU compiler - correct???
     19781      { echo "$as_me:$LINENO: Applying patches to libtool for CLANG compiler" >&5
     19782echo "$as_me: Applying patches to libtool for CLANG compiler" >&6;}
     19783      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     19784          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     19785          -e 's|libext="lib"|libext="a"|' \
     19786      libtool > conftest.bla
     19787      ;;
    1977419788    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    1977519789      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
     
    1978719801          -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
    1978819802      libtool > conftest.bla
    19789 
    19790       mv conftest.bla libtool
    19791       chmod 755 libtool
    1979219803      ;;
    1979319804    *)
     
    1979819809          -e 's|libext="lib"|libext="a"|' \
    1979919810      libtool > conftest.bla
    19800 
    19801       mv conftest.bla libtool
    19802       chmod 755 libtool
    1980319811      ;;
    1980419812  esac
     19813  mv conftest.bla libtool
     19814  chmod 755 libtool
     19815
    1980519816      ;;
    1980619817    *-darwin*)
     
    2023620247# this check. It's hardly likely that long long is missing on any modern
    2023720248# system, but it's easy to check.
     20249# Also, if it's present, then ASL uses strtoull, which is not supported on Windows systems.
     20250# Instead, there should be a _strtoui64.
    2023820251
    2023920252  echo "$as_me:$LINENO: checking for long long" >&5
     
    2029420307echo "${ECHO_T}$ac_cv_type_long_long" >&6
    2029520308if test $ac_cv_type_long_long = yes; then
    20296   :
     20309
     20310     if test "x$coin_cc_is_cl" = xtrue ; then
     20311       asladdcflags="$asladdcflags -Dstrtoull=_strtoui64"
     20312     fi
    2029720313else
    2029820314  asladdcflags="$asladdcflags -DNO_LONG_LONG"
    2029920315fi
     20316
    2030020317
    2030120318
     
    2044820465
    2044920466
    20450 case "$CC" in
    20451   cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    20452     ;;
    20453   *)
    20454 
    20455       ASL_LIBS="-lm $ASL_LIBS"
    20456       ASL_PCLIBS="-lm $ASL_PCLIBS"
    20457       ASL_LIBS_INSTALLED="-lm $ASL_LIBS_INSTALLED"
    20458 
    20459   ;;
    20460 esac
     20467if test $coin_cc_is_cl != true ; then
     20468
     20469    ASL_LIBS="-lm $ASL_LIBS"
     20470    ASL_PCLIBS="-lm $ASL_PCLIBS"
     20471    ASL_LIBS_INSTALLED="-lm $ASL_LIBS_INSTALLED"
     20472
     20473fi
    2046120474
    2046220475
     
    2047420487fi
    2047520488case "$CC" in
     20489  clang* ) ;;
    2047620490  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2047720491    coin_link_input_cmd=cp ;;
     
    2048720501
    2048820502  case "$CC" in
     20503    clang* )
     20504         LIBEXT=a ;;
    2048920505    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2049020506         LIBEXT=lib ;;
  • ThirdParty/ASL/trunk/configure.ac

    r2336 r2480  
    112112# this check. It's hardly likely that long long is missing on any modern
    113113# system, but it's easy to check.
     114# Also, if it's present, then ASL uses strtoull, which is not supported on Windows systems.
     115# Instead, there should be a _strtoui64.
    114116
    115   AC_CHECK_TYPE([long long],[],
     117  AC_CHECK_TYPE([long long],[
     118     if test "x$coin_cc_is_cl" = xtrue ; then
     119       asladdcflags="$asladdcflags -Dstrtoull=_strtoui64"
     120     fi],
    116121    [asladdcflags="$asladdcflags -DNO_LONG_LONG"],[])
     122
    117123
    118124# Check for dlopen, ASL uses it to load userdefined function libraries
Note: See TracChangeset for help on using the changeset viewer.