Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 291888 | Differences between
and this patch

Collapse All | Expand All

(-)a/aclocal.m4 (-42 / +44 lines)
Lines 603-649 Link Here
603
: ${BUILD_WITH_MSVC=false}
603
: ${BUILD_WITH_MSVC=false}
604
if $sim_ac_try_msvc; then
604
if $sim_ac_try_msvc; then
605
  if test -z "$CC" -a -z "$CXX"; then
605
  if test -z "$CC" -a -z "$CXX"; then
606
    sim_ac_wrapmsvc=`cd $ac_aux_dir; pwd`/wrapmsvc.exe
607
    echo "$as_me:$LINENO: sim_ac_wrapmsvc=$sim_ac_wrapmsvc" >&AS_MESSAGE_LOG_FD
608
    AC_MSG_CHECKING([setup for wrapmsvc.exe])
606
    AC_MSG_CHECKING([setup for wrapmsvc.exe])
609
    if $sim_ac_wrapmsvc >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
607
    case $host in
610
      m4_ifdef([$0_VISITED],
608
      *-cygwin)
611
        [AC_FATAL([Macro $0 invoked multiple times])])
609
        valid_system=true
612
      m4_define([$0_VISITED], 1)
613
      CC=$sim_ac_wrapmsvc
614
      CXX=$sim_ac_wrapmsvc
615
      export CC CXX
616
      BUILD_WITH_MSVC=true
617
      AC_MSG_RESULT([working])
618
619
      # Robustness: we had multiple reports of Cygwin ''link'' getting in
620
      # the way of MSVC link.exe, so do a little sanity check for that.
621
      #
622
      # FIXME: a better fix would be to call link.exe with full path from
623
      # the wrapmsvc wrapper, to avoid any trouble with this -- I believe
624
      # that should be possible, using the dirname of the full cl.exe path.
625
      # 20050714 mortene.
626
      sim_ac_check_link=`type link`
627
      AC_MSG_CHECKING([whether Cygwin's /usr/bin/link shadows MSVC link.exe])
628
      case x"$sim_ac_check_link" in
629
      x"link is /usr/bin/link"* )
630
        AC_MSG_RESULT(yes)
631
        SIM_AC_ERROR([cygwin-link])
632
        ;;
610
        ;;
633
      * )
611
      * )
634
        AC_MSG_RESULT(no)
612
        valid_system=false
635
        ;;
613
        ;;
636
      esac
614
    esac
637
615
    if $valid_system; then
638
    else
616
      sim_ac_wrapmsvc=`cd $ac_aux_dir; pwd`/wrapmsvc.exe
639
      case $host in
617
      echo "$as_me:$LINENO: sim_ac_wrapmsvc=$sim_ac_wrapmsvc" >&AS_MESSAGE_LOG_FD
640
      *-cygwin)
618
      if $sim_ac_wrapmsvc >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
619
        m4_ifdef([$0_VISITED],
620
          [AC_FATAL([Macro $0 invoked multiple times])])
621
        m4_define([$0_VISITED], 1)
622
        CC=$sim_ac_wrapmsvc
623
        CXX=$sim_ac_wrapmsvc
624
        export CC CXX
625
        BUILD_WITH_MSVC=true
626
        AC_MSG_RESULT([working])
627
628
        # Robustness: we had multiple reports of Cygwin ''link'' getting in
629
        # the way of MSVC link.exe, so do a little sanity check for that.
630
        #
631
        # FIXME: a better fix would be to call link.exe with full path from
632
        # the wrapmsvc wrapper, to avoid any trouble with this -- I believe
633
        # that should be possible, using the dirname of the full cl.exe path.
634
        # 20050714 mortene.
635
        sim_ac_check_link=`type link`
636
        AC_MSG_CHECKING([whether Cygwin's /usr/bin/link shadows MSVC link.exe])
637
        case x"$sim_ac_check_link" in
638
        x"link is /usr/bin/link"* )
639
          AC_MSG_RESULT(yes)
640
          SIM_AC_ERROR([cygwin-link])
641
          ;;
642
        * )
643
          AC_MSG_RESULT(no)
644
          ;;
645
        esac
646
647
      else
641
        AC_MSG_RESULT([not working])
648
        AC_MSG_RESULT([not working])
642
        SIM_AC_ERROR([no-msvc++]) ;;
649
        SIM_AC_ERROR([no-msvc++])
643
      *)
650
      fi
644
        AC_MSG_RESULT([not working (as expected)])
651
    else
645
        ;;
652
      AC_MSG_RESULT([not a cygwin host])
646
      esac
647
    fi
653
    fi
648
  fi
654
  fi
649
fi
655
fi
Lines 9159-9164 Link Here
9159
      AC_MSG_WARN([--enable-exceptions only has effect when using GNU g++])
9165
      AC_MSG_WARN([--enable-exceptions only has effect when using GNU g++])
9160
    fi
9166
    fi
9161
  fi
9167
  fi
9168
  AC_DEFINE([USE_EXCEPTIONS], 1, [Define to make Coin use/catch exceptions at some particular places.])
9162
fi
9169
fi
9163
])
9170
])
9164
9171
Lines 9374-9385 Link Here
9374
      # warning level 3
9381
      # warning level 3
9375
      SIM_AC_CC_COMPILER_OPTION([/W3], [sim_ac_compiler_CFLAGS="$sim_ac_compiler_CFLAGS /W3"])
9382
      SIM_AC_CC_COMPILER_OPTION([/W3], [sim_ac_compiler_CFLAGS="$sim_ac_compiler_CFLAGS /W3"])
9376
      SIM_AC_CXX_COMPILER_OPTION([/W3], [sim_ac_compiler_CXXFLAGS="$sim_ac_compiler_CXXFLAGS /W3"])
9383
      SIM_AC_CXX_COMPILER_OPTION([/W3], [sim_ac_compiler_CXXFLAGS="$sim_ac_compiler_CXXFLAGS /W3"])
9377
9384
      
9378
      if test ${sim_ac_msvc_version-0} -gt 6; then
9379
        # 64-bit porting warnings
9380
        SIM_AC_CC_COMPILER_OPTION([/Wp64], [sim_ac_compiler_CFLAGS="$sim_ac_compiler_CFLAGS /Wp64"])
9381
        SIM_AC_CXX_COMPILER_OPTION([/Wp64], [sim_ac_compiler_CXXFLAGS="$sim_ac_compiler_CXXFLAGS /Wp64"])
9382
      fi
9383
      ;;
9385
      ;;
9384
    esac
9386
    esac
9385
  fi
9387
  fi
(-)a/configure (-217 / +73 lines)
Lines 1817-1849 Link Here
1817
: ${BUILD_WITH_MSVC=false}
1817
: ${BUILD_WITH_MSVC=false}
1818
if $sim_ac_try_msvc; then
1818
if $sim_ac_try_msvc; then
1819
  if test -z "$CC" -a -z "$CXX"; then
1819
  if test -z "$CC" -a -z "$CXX"; then
1820
    sim_ac_wrapmsvc=`cd $ac_aux_dir; pwd`/wrapmsvc.exe
1821
    echo "$as_me:$LINENO: sim_ac_wrapmsvc=$sim_ac_wrapmsvc" >&5
1822
    echo "$as_me:$LINENO: checking setup for wrapmsvc.exe" >&5
1820
    echo "$as_me:$LINENO: checking setup for wrapmsvc.exe" >&5
1823
echo $ECHO_N "checking setup for wrapmsvc.exe... $ECHO_C" >&6
1821
echo $ECHO_N "checking setup for wrapmsvc.exe... $ECHO_C" >&6
1824
    if $sim_ac_wrapmsvc >&5 2>&5; then
1822
    case $host in
1825
1823
      *-cygwin)
1826
1824
        valid_system=true
1827
      CC=$sim_ac_wrapmsvc
1825
        ;;
1828
      CXX=$sim_ac_wrapmsvc
1826
      * )
1829
      export CC CXX
1827
        valid_system=false
1830
      BUILD_WITH_MSVC=true
1828
        ;;
1831
      echo "$as_me:$LINENO: result: working" >&5
1829
    esac
1830
    if $valid_system; then
1831
      sim_ac_wrapmsvc=`cd $ac_aux_dir; pwd`/wrapmsvc.exe
1832
      echo "$as_me:$LINENO: sim_ac_wrapmsvc=$sim_ac_wrapmsvc" >&5
1833
      if $sim_ac_wrapmsvc >&5 2>&5; then
1834
1835
1836
        CC=$sim_ac_wrapmsvc
1837
        CXX=$sim_ac_wrapmsvc
1838
        export CC CXX
1839
        BUILD_WITH_MSVC=true
1840
        echo "$as_me:$LINENO: result: working" >&5
1832
echo "${ECHO_T}working" >&6
1841
echo "${ECHO_T}working" >&6
1833
1842
1834
      # Robustness: we had multiple reports of Cygwin ''link'' getting in
1843
        # Robustness: we had multiple reports of Cygwin ''link'' getting in
1835
      # the way of MSVC link.exe, so do a little sanity check for that.
1844
        # the way of MSVC link.exe, so do a little sanity check for that.
1836
      #
1845
        #
1837
      # FIXME: a better fix would be to call link.exe with full path from
1846
        # FIXME: a better fix would be to call link.exe with full path from
1838
      # the wrapmsvc wrapper, to avoid any trouble with this -- I believe
1847
        # the wrapmsvc wrapper, to avoid any trouble with this -- I believe
1839
      # that should be possible, using the dirname of the full cl.exe path.
1848
        # that should be possible, using the dirname of the full cl.exe path.
1840
      # 20050714 mortene.
1849
        # 20050714 mortene.
1841
      sim_ac_check_link=`type link`
1850
        sim_ac_check_link=`type link`
1842
      echo "$as_me:$LINENO: checking whether Cygwin's /usr/bin/link shadows MSVC link.exe" >&5
1851
        echo "$as_me:$LINENO: checking whether Cygwin's /usr/bin/link shadows MSVC link.exe" >&5
1843
echo $ECHO_N "checking whether Cygwin's /usr/bin/link shadows MSVC link.exe... $ECHO_C" >&6
1852
echo $ECHO_N "checking whether Cygwin's /usr/bin/link shadows MSVC link.exe... $ECHO_C" >&6
1844
      case x"$sim_ac_check_link" in
1853
        case x"$sim_ac_check_link" in
1845
      x"link is /usr/bin/link"* )
1854
        x"link is /usr/bin/link"* )
1846
        echo "$as_me:$LINENO: result: yes" >&5
1855
          echo "$as_me:$LINENO: result: yes" >&5
1847
echo "${ECHO_T}yes" >&6
1856
echo "${ECHO_T}yes" >&6
1848
1857
1849
echo >&2 ""
1858
echo >&2 ""
Lines 1872-1887 Link Here
1872
echo "$as_me: error: aborting" >&2;}
1881
echo "$as_me: error: aborting" >&2;}
1873
   { (exit 1); exit 1; }; }
1882
   { (exit 1); exit 1; }; }
1874
1883
1875
        ;;
1884
          ;;
1876
      * )
1885
        * )
1877
        echo "$as_me:$LINENO: result: no" >&5
1886
          echo "$as_me:$LINENO: result: no" >&5
1878
echo "${ECHO_T}no" >&6
1887
echo "${ECHO_T}no" >&6
1879
        ;;
1888
          ;;
1880
      esac
1889
        esac
1881
1890
1882
    else
1891
      else
1883
      case $host in
1884
      *-cygwin)
1885
        echo "$as_me:$LINENO: result: not working" >&5
1892
        echo "$as_me:$LINENO: result: not working" >&5
1886
echo "${ECHO_T}not working" >&6
1893
echo "${ECHO_T}not working" >&6
1887
1894
Lines 1910-1921 Link Here
1910
{ { echo "$as_me:$LINENO: error: aborting" >&5
1917
{ { echo "$as_me:$LINENO: error: aborting" >&5
1911
echo "$as_me: error: aborting" >&2;}
1918
echo "$as_me: error: aborting" >&2;}
1912
   { (exit 1); exit 1; }; }
1919
   { (exit 1); exit 1; }; }
1913
 ;;
1920
1914
      *)
1921
      fi
1915
        echo "$as_me:$LINENO: result: not working (as expected)" >&5
1922
    else
1916
echo "${ECHO_T}not working (as expected)" >&6
1923
      echo "$as_me:$LINENO: result: not a cygwin host" >&5
1917
        ;;
1924
echo "${ECHO_T}not a cygwin host" >&6
1918
      esac
1919
    fi
1925
    fi
1920
  fi
1926
  fi
1921
fi
1927
fi
Lines 5272-5278 Link Here
5272
  ;;
5278
  ;;
5273
*-*-irix6*)
5279
*-*-irix6*)
5274
  # Find out which ABI we are using.
5280
  # Find out which ABI we are using.
5275
  echo '#line 5275 "configure"' > conftest.$ac_ext
5281
  echo '#line 5281 "configure"' > conftest.$ac_ext
5276
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5282
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5277
  (eval $ac_compile) 2>&5
5283
  (eval $ac_compile) 2>&5
5278
  ac_status=$?
5284
  ac_status=$?
Lines 6407-6413 Link Here
6407
6413
6408
6414
6409
# Provide some information about the compiler.
6415
# Provide some information about the compiler.
6410
echo "$as_me:6410:" \
6416
echo "$as_me:6416:" \
6411
     "checking for Fortran 77 compiler version" >&5
6417
     "checking for Fortran 77 compiler version" >&5
6412
ac_compiler=`set X $ac_compile; echo $2`
6418
ac_compiler=`set X $ac_compile; echo $2`
6413
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
6419
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
Lines 7470-7480 Link Here
7470
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7476
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7471
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7477
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7472
   -e 's:$: $lt_compiler_flag:'`
7478
   -e 's:$: $lt_compiler_flag:'`
7473
   (eval echo "\"\$as_me:7473: $lt_compile\"" >&5)
7479
   (eval echo "\"\$as_me:7479: $lt_compile\"" >&5)
7474
   (eval "$lt_compile" 2>conftest.err)
7480
   (eval "$lt_compile" 2>conftest.err)
7475
   ac_status=$?
7481
   ac_status=$?
7476
   cat conftest.err >&5
7482
   cat conftest.err >&5
7477
   echo "$as_me:7477: \$? = $ac_status" >&5
7483
   echo "$as_me:7483: \$? = $ac_status" >&5
7478
   if (exit $ac_status) && test -s "$ac_outfile"; then
7484
   if (exit $ac_status) && test -s "$ac_outfile"; then
7479
     # The compiler can only warn and ignore the option if not recognized
7485
     # The compiler can only warn and ignore the option if not recognized
7480
     # So say no if there are warnings other than the usual output.
7486
     # So say no if there are warnings other than the usual output.
Lines 7738-7748 Link Here
7738
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7744
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7739
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7745
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7740
   -e 's:$: $lt_compiler_flag:'`
7746
   -e 's:$: $lt_compiler_flag:'`
7741
   (eval echo "\"\$as_me:7741: $lt_compile\"" >&5)
7747
   (eval echo "\"\$as_me:7747: $lt_compile\"" >&5)
7742
   (eval "$lt_compile" 2>conftest.err)
7748
   (eval "$lt_compile" 2>conftest.err)
7743
   ac_status=$?
7749
   ac_status=$?
7744
   cat conftest.err >&5
7750
   cat conftest.err >&5
7745
   echo "$as_me:7745: \$? = $ac_status" >&5
7751
   echo "$as_me:7751: \$? = $ac_status" >&5
7746
   if (exit $ac_status) && test -s "$ac_outfile"; then
7752
   if (exit $ac_status) && test -s "$ac_outfile"; then
7747
     # The compiler can only warn and ignore the option if not recognized
7753
     # The compiler can only warn and ignore the option if not recognized
7748
     # So say no if there are warnings other than the usual output.
7754
     # So say no if there are warnings other than the usual output.
Lines 7842-7852 Link Here
7842
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7848
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7843
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7849
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7844
   -e 's:$: $lt_compiler_flag:'`
7850
   -e 's:$: $lt_compiler_flag:'`
7845
   (eval echo "\"\$as_me:7845: $lt_compile\"" >&5)
7851
   (eval echo "\"\$as_me:7851: $lt_compile\"" >&5)
7846
   (eval "$lt_compile" 2>out/conftest.err)
7852
   (eval "$lt_compile" 2>out/conftest.err)
7847
   ac_status=$?
7853
   ac_status=$?
7848
   cat out/conftest.err >&5
7854
   cat out/conftest.err >&5
7849
   echo "$as_me:7849: \$? = $ac_status" >&5
7855
   echo "$as_me:7855: \$? = $ac_status" >&5
7850
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
7856
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
7851
   then
7857
   then
7852
     # The compiler can only warn and ignore the option if not recognized
7858
     # The compiler can only warn and ignore the option if not recognized
Lines 10187-10193 Link Here
10187
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10193
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10188
  lt_status=$lt_dlunknown
10194
  lt_status=$lt_dlunknown
10189
  cat > conftest.$ac_ext <<EOF
10195
  cat > conftest.$ac_ext <<EOF
10190
#line 10190 "configure"
10196
#line 10196 "configure"
10191
#include "confdefs.h"
10197
#include "confdefs.h"
10192
10198
10193
#if HAVE_DLFCN_H
10199
#if HAVE_DLFCN_H
Lines 10287-10293 Link Here
10287
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10293
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10288
  lt_status=$lt_dlunknown
10294
  lt_status=$lt_dlunknown
10289
  cat > conftest.$ac_ext <<EOF
10295
  cat > conftest.$ac_ext <<EOF
10290
#line 10290 "configure"
10296
#line 10296 "configure"
10291
#include "confdefs.h"
10297
#include "confdefs.h"
10292
10298
10293
#if HAVE_DLFCN_H
10299
#if HAVE_DLFCN_H
Lines 12627-12637 Link Here
12627
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
12633
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
12628
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
12634
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
12629
   -e 's:$: $lt_compiler_flag:'`
12635
   -e 's:$: $lt_compiler_flag:'`
12630
   (eval echo "\"\$as_me:12630: $lt_compile\"" >&5)
12636
   (eval echo "\"\$as_me:12636: $lt_compile\"" >&5)
12631
   (eval "$lt_compile" 2>conftest.err)
12637
   (eval "$lt_compile" 2>conftest.err)
12632
   ac_status=$?
12638
   ac_status=$?
12633
   cat conftest.err >&5
12639
   cat conftest.err >&5
12634
   echo "$as_me:12634: \$? = $ac_status" >&5
12640
   echo "$as_me:12640: \$? = $ac_status" >&5
12635
   if (exit $ac_status) && test -s "$ac_outfile"; then
12641
   if (exit $ac_status) && test -s "$ac_outfile"; then
12636
     # The compiler can only warn and ignore the option if not recognized
12642
     # The compiler can only warn and ignore the option if not recognized
12637
     # So say no if there are warnings other than the usual output.
12643
     # So say no if there are warnings other than the usual output.
Lines 12731-12741 Link Here
12731
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
12737
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
12732
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
12738
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
12733
   -e 's:$: $lt_compiler_flag:'`
12739
   -e 's:$: $lt_compiler_flag:'`
12734
   (eval echo "\"\$as_me:12734: $lt_compile\"" >&5)
12740
   (eval echo "\"\$as_me:12740: $lt_compile\"" >&5)
12735
   (eval "$lt_compile" 2>out/conftest.err)
12741
   (eval "$lt_compile" 2>out/conftest.err)
12736
   ac_status=$?
12742
   ac_status=$?
12737
   cat out/conftest.err >&5
12743
   cat out/conftest.err >&5
12738
   echo "$as_me:12738: \$? = $ac_status" >&5
12744
   echo "$as_me:12744: \$? = $ac_status" >&5
12739
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
12745
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
12740
   then
12746
   then
12741
     # The compiler can only warn and ignore the option if not recognized
12747
     # The compiler can only warn and ignore the option if not recognized
Lines 14301-14311 Link Here
14301
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14307
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14302
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14308
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14303
   -e 's:$: $lt_compiler_flag:'`
14309
   -e 's:$: $lt_compiler_flag:'`
14304
   (eval echo "\"\$as_me:14304: $lt_compile\"" >&5)
14310
   (eval echo "\"\$as_me:14310: $lt_compile\"" >&5)
14305
   (eval "$lt_compile" 2>conftest.err)
14311
   (eval "$lt_compile" 2>conftest.err)
14306
   ac_status=$?
14312
   ac_status=$?
14307
   cat conftest.err >&5
14313
   cat conftest.err >&5
14308
   echo "$as_me:14308: \$? = $ac_status" >&5
14314
   echo "$as_me:14314: \$? = $ac_status" >&5
14309
   if (exit $ac_status) && test -s "$ac_outfile"; then
14315
   if (exit $ac_status) && test -s "$ac_outfile"; then
14310
     # The compiler can only warn and ignore the option if not recognized
14316
     # The compiler can only warn and ignore the option if not recognized
14311
     # So say no if there are warnings other than the usual output.
14317
     # So say no if there are warnings other than the usual output.
Lines 14405-14415 Link Here
14405
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14411
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14406
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14412
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14407
   -e 's:$: $lt_compiler_flag:'`
14413
   -e 's:$: $lt_compiler_flag:'`
14408
   (eval echo "\"\$as_me:14408: $lt_compile\"" >&5)
14414
   (eval echo "\"\$as_me:14414: $lt_compile\"" >&5)
14409
   (eval "$lt_compile" 2>out/conftest.err)
14415
   (eval "$lt_compile" 2>out/conftest.err)
14410
   ac_status=$?
14416
   ac_status=$?
14411
   cat out/conftest.err >&5
14417
   cat out/conftest.err >&5
14412
   echo "$as_me:14412: \$? = $ac_status" >&5
14418
   echo "$as_me:14418: \$? = $ac_status" >&5
14413
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
14419
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
14414
   then
14420
   then
14415
     # The compiler can only warn and ignore the option if not recognized
14421
     # The compiler can only warn and ignore the option if not recognized
Lines 16608-16618 Link Here
16608
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
16614
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
16609
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16615
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16610
   -e 's:$: $lt_compiler_flag:'`
16616
   -e 's:$: $lt_compiler_flag:'`
16611
   (eval echo "\"\$as_me:16611: $lt_compile\"" >&5)
16617
   (eval echo "\"\$as_me:16617: $lt_compile\"" >&5)
16612
   (eval "$lt_compile" 2>conftest.err)
16618
   (eval "$lt_compile" 2>conftest.err)
16613
   ac_status=$?
16619
   ac_status=$?
16614
   cat conftest.err >&5
16620
   cat conftest.err >&5
16615
   echo "$as_me:16615: \$? = $ac_status" >&5
16621
   echo "$as_me:16621: \$? = $ac_status" >&5
16616
   if (exit $ac_status) && test -s "$ac_outfile"; then
16622
   if (exit $ac_status) && test -s "$ac_outfile"; then
16617
     # The compiler can only warn and ignore the option if not recognized
16623
     # The compiler can only warn and ignore the option if not recognized
16618
     # So say no if there are warnings other than the usual output.
16624
     # So say no if there are warnings other than the usual output.
Lines 16876-16886 Link Here
16876
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
16882
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
16877
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16883
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16878
   -e 's:$: $lt_compiler_flag:'`
16884
   -e 's:$: $lt_compiler_flag:'`
16879
   (eval echo "\"\$as_me:16879: $lt_compile\"" >&5)
16885
   (eval echo "\"\$as_me:16885: $lt_compile\"" >&5)
16880
   (eval "$lt_compile" 2>conftest.err)
16886
   (eval "$lt_compile" 2>conftest.err)
16881
   ac_status=$?
16887
   ac_status=$?
16882
   cat conftest.err >&5
16888
   cat conftest.err >&5
16883
   echo "$as_me:16883: \$? = $ac_status" >&5
16889
   echo "$as_me:16889: \$? = $ac_status" >&5
16884
   if (exit $ac_status) && test -s "$ac_outfile"; then
16890
   if (exit $ac_status) && test -s "$ac_outfile"; then
16885
     # The compiler can only warn and ignore the option if not recognized
16891
     # The compiler can only warn and ignore the option if not recognized
16886
     # So say no if there are warnings other than the usual output.
16892
     # So say no if there are warnings other than the usual output.
Lines 16980-16990 Link Here
16980
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
16986
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
16981
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16987
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
16982
   -e 's:$: $lt_compiler_flag:'`
16988
   -e 's:$: $lt_compiler_flag:'`
16983
   (eval echo "\"\$as_me:16983: $lt_compile\"" >&5)
16989
   (eval echo "\"\$as_me:16989: $lt_compile\"" >&5)
16984
   (eval "$lt_compile" 2>out/conftest.err)
16990
   (eval "$lt_compile" 2>out/conftest.err)
16985
   ac_status=$?
16991
   ac_status=$?
16986
   cat out/conftest.err >&5
16992
   cat out/conftest.err >&5
16987
   echo "$as_me:16987: \$? = $ac_status" >&5
16993
   echo "$as_me:16993: \$? = $ac_status" >&5
16988
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
16994
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
16989
   then
16995
   then
16990
     # The compiler can only warn and ignore the option if not recognized
16996
     # The compiler can only warn and ignore the option if not recognized
Lines 25638-25643 Link Here
25638
echo "$as_me: WARNING: --enable-exceptions only has effect when using GNU g++" >&2;}
25644
echo "$as_me: WARNING: --enable-exceptions only has effect when using GNU g++" >&2;}
25639
    fi
25645
    fi
25640
  fi
25646
  fi
25647
25648
cat >>confdefs.h <<\_ACEOF
25649
#define USE_EXCEPTIONS 1
25650
_ACEOF
25651
25641
fi
25652
fi
25642
25653
25643
25654
Lines 27886-28046 Link Here
27886
27897
27887
27898
27888
27899
27889
      if test ${sim_ac_msvc_version-0} -gt 6; then
27890
        # 64-bit porting warnings
27891
27892
27893
27894
ac_ext=c
27895
ac_cpp='$CPP $CPPFLAGS'
27896
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
27897
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
27898
ac_compiler_gnu=$ac_cv_c_compiler_gnu
27899
27900
echo "$as_me:$LINENO: checking whether $CC accepts /Wp64" >&5
27901
echo $ECHO_N "checking whether $CC accepts /Wp64... $ECHO_C" >&6
27902
27903
sim_ac_save_cppflags=$CPPFLAGS
27904
CPPFLAGS="$CPPFLAGS /Wp64"
27905
cat >conftest.$ac_ext <<_ACEOF
27906
/* confdefs.h.  */
27907
_ACEOF
27908
cat confdefs.h >>conftest.$ac_ext
27909
cat >>conftest.$ac_ext <<_ACEOF
27910
/* end confdefs.h.  */
27911
27912
int
27913
main ()
27914
{
27915
27916
  ;
27917
  return 0;
27918
}
27919
_ACEOF
27920
rm -f conftest.$ac_objext
27921
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
27922
  (eval $ac_compile) 2>conftest.er1
27923
  ac_status=$?
27924
  grep -v '^ *+' conftest.er1 >conftest.err
27925
  rm -f conftest.er1
27926
  cat conftest.err >&5
27927
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
27928
  (exit $ac_status); } &&
27929
	 { ac_try='test -z "$ac_c_werror_flag"
27930
			 || test ! -s conftest.err'
27931
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
27932
  (eval $ac_try) 2>&5
27933
  ac_status=$?
27934
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
27935
  (exit $ac_status); }; } &&
27936
	 { ac_try='test -s conftest.$ac_objext'
27937
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
27938
  (eval $ac_try) 2>&5
27939
  ac_status=$?
27940
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
27941
  (exit $ac_status); }; }; then
27942
  sim_ac_accept_result=yes
27943
else
27944
  echo "$as_me: failed program was:" >&5
27945
sed 's/^/| /' conftest.$ac_ext >&5
27946
27947
sim_ac_accept_result=no
27948
fi
27949
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
27950
echo "$as_me:$LINENO: result: $sim_ac_accept_result" >&5
27951
echo "${ECHO_T}$sim_ac_accept_result" >&6
27952
CPPFLAGS=$sim_ac_save_cppflags
27953
# This need to go last, in case CPPFLAGS is modified in arg 2 or arg 3.
27954
if test $sim_ac_accept_result = yes; then
27955
  sim_ac_compiler_CFLAGS="$sim_ac_compiler_CFLAGS /Wp64"
27956
else
27957
  :
27958
fi
27959
27960
ac_ext=cc
27961
ac_cpp='$CXXCPP $CPPFLAGS'
27962
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
27963
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
27964
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
27965
27966
27967
27968
27969
27970
ac_ext=cc
27971
ac_cpp='$CXXCPP $CPPFLAGS'
27972
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
27973
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
27974
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
27975
27976
echo "$as_me:$LINENO: checking whether $CXX accepts /Wp64" >&5
27977
echo $ECHO_N "checking whether $CXX accepts /Wp64... $ECHO_C" >&6
27978
27979
sim_ac_save_cppflags=$CPPFLAGS
27980
CPPFLAGS="$CPPFLAGS /Wp64"
27981
cat >conftest.$ac_ext <<_ACEOF
27982
/* confdefs.h.  */
27983
_ACEOF
27984
cat confdefs.h >>conftest.$ac_ext
27985
cat >>conftest.$ac_ext <<_ACEOF
27986
/* end confdefs.h.  */
27987
27988
int
27989
main ()
27990
{
27991
27992
  ;
27993
  return 0;
27994
}
27995
_ACEOF
27996
rm -f conftest.$ac_objext
27997
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
27998
  (eval $ac_compile) 2>conftest.er1
27999
  ac_status=$?
28000
  grep -v '^ *+' conftest.er1 >conftest.err
28001
  rm -f conftest.er1
28002
  cat conftest.err >&5
28003
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
28004
  (exit $ac_status); } &&
28005
	 { ac_try='test -z "$ac_cxx_werror_flag"
28006
			 || test ! -s conftest.err'
28007
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
28008
  (eval $ac_try) 2>&5
28009
  ac_status=$?
28010
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
28011
  (exit $ac_status); }; } &&
28012
	 { ac_try='test -s conftest.$ac_objext'
28013
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
28014
  (eval $ac_try) 2>&5
28015
  ac_status=$?
28016
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
28017
  (exit $ac_status); }; }; then
28018
  sim_ac_accept_result=yes
28019
else
28020
  echo "$as_me: failed program was:" >&5
28021
sed 's/^/| /' conftest.$ac_ext >&5
28022
28023
sim_ac_accept_result=no
28024
fi
28025
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
28026
echo "$as_me:$LINENO: result: $sim_ac_accept_result" >&5
28027
echo "${ECHO_T}$sim_ac_accept_result" >&6
28028
CPPFLAGS=$sim_ac_save_cppflags
28029
# This need to go last, in case CPPFLAGS is modified in arg 2 or arg 3.
28030
if test $sim_ac_accept_result = yes; then
28031
  sim_ac_compiler_CXXFLAGS="$sim_ac_compiler_CXXFLAGS /Wp64"
28032
else
28033
  :
28034
fi
28035
28036
ac_ext=cc
28037
ac_cpp='$CXXCPP $CPPFLAGS'
28038
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
28039
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
28040
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
28041
28042
28043
      fi
28044
      ;;
27900
      ;;
28045
    esac
27901
    esac
28046
  fi
27902
  fi
(-)a/src/discard.h.in (+3 lines)
Lines 480-485 Link Here
480
/* Define to 1 if you have the ANSI C header files. */
480
/* Define to 1 if you have the ANSI C header files. */
481
#undef STDC_HEADERS
481
#undef STDC_HEADERS
482
482
483
/* Define to make Coin use/catch exceptions at some particular places. */
484
#undef USE_EXCEPTIONS
485
483
/* define to use the POSIX threads API */
486
/* define to use the POSIX threads API */
484
#undef USE_PTHREAD
487
#undef USE_PTHREAD
485
488

Return to bug 291888