Changeset 1063


Ignore:
Timestamp:
Aug 8, 2007 10:55:18 PM (12 years ago)
Author:
andreasw
Message:

reran autotools for latest BuildTools?/trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/configure

    r1019 r1063  
    17051705  case "${enableval}" in
    17061706   yes) coin_debug_compile=true
    1707         enable_shared=no
     1707        if test "${enable_shared+set}" = set; then :; else
     1708          enable_shared=no
     1709        fi
    17081710        ;;
    17091711   no)  coin_debug_compile=false
     
    27002702          cl* | */cl* | CL* | */CL*)
    27012703            coin_opt_cflags='-MT -O2'
    2702             coin_add_cflags='-nologo -wd4996'
     2704            coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    27032705            coin_dbg_cflags='-MTd'
    27042706            ;;
     
    34333435fi
    34343436
     3437# It seems that we need to cleanup something here for the Windows
     3438case "$CXX" in
     3439  cl* | */cl* | CL* | */CL* )
     3440    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     3441    mv confdefs.hh confdefs.h
     3442    ;;
     3443esac
     3444
    34353445# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    34363446case "$CXX" in
     
    35333543            # The MT and MTd options are mutually exclusive
    35343544            coin_opt_cxxflags='-MT -O2'
    3535             coin_add_cxxflags='-nologo -EHsc -GR -wd4996'
     3545            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    35363546            coin_dbg_cxxflags='-MTd'
    35373547            ;;
     
    48734883    correct_version='1.5.22'
    48744884    grep_version=`echo  $correct_version | sed -e 's/\\./\\\\\\./g'`
    4875     as_ac_File=`echo "ac_cv_file_$want_dir/libtool/ltmain.sh" | $as_tr_sh`
    4876 echo "$as_me:$LINENO: checking for $want_dir/libtool/ltmain.sh" >&5
    4877 echo $ECHO_N "checking for $want_dir/libtool/ltmain.sh... $ECHO_C" >&6
    4878 if eval "test \"\${$as_ac_File+set}\" = set"; then
    4879   echo $ECHO_N "(cached) $ECHO_C" >&6
    4880 else
    4881   test "$cross_compiling" = yes &&
    4882   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
    4883 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    4884    { (exit 1); exit 1; }; }
    4885 if test -r "$want_dir/libtool/ltmain.sh"; then
    4886   eval "$as_ac_File=yes"
    4887 else
    4888   eval "$as_ac_File=no"
    4889 fi
    4890 fi
    4891 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
    4892 echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
    4893 if test `eval echo '${'$as_ac_File'}'` = yes; then
     4885    if test -r $want_dir/libtool/ltmain.sh; then
    48944886  have_ltmain=yes
     4887  :
    48954888else
    48964889  have_ltmain=no
     4890  :
    48974891fi
    48984892
     
    49254919    want_dir=$AUTOTOOLS_DIR/share
    49264920  fi
    4927   as_ac_File=`echo "ac_cv_file_$want_dir/aclocal/libtool.m4" | $as_tr_sh`
    4928 echo "$as_me:$LINENO: checking for $want_dir/aclocal/libtool.m4" >&5
    4929 echo $ECHO_N "checking for $want_dir/aclocal/libtool.m4... $ECHO_C" >&6
    4930 if eval "test \"\${$as_ac_File+set}\" = set"; then
    4931   echo $ECHO_N "(cached) $ECHO_C" >&6
    4932 else
    4933   test "$cross_compiling" = yes &&
    4934   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
    4935 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    4936    { (exit 1); exit 1; }; }
    4937 if test -r "$want_dir/aclocal/libtool.m4"; then
    4938   eval "$as_ac_File=yes"
    4939 else
    4940   eval "$as_ac_File=no"
    4941 fi
    4942 fi
    4943 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
    4944 echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
    4945 if test `eval echo '${'$as_ac_File'}'` = yes; then
     4921  if test -r $want_dir/aclocal/libtool.m4; then
    49464922  LIBTOOLM4="$want_dir/aclocal/libtool.m4"
     4923  :
    49474924else
    49484925  { { echo "$as_me:$LINENO: error: I cannot find the libtool.m4 file." >&5
    49494926echo "$as_me: error: I cannot find the libtool.m4 file." >&2;}
    49504927   { (exit 1); exit 1; }; }
     4928  :
    49514929fi
    49524930
     
    56345612*-*-irix6*)
    56355613  # Find out which ABI we are using.
    5636   echo '#line 5636 "configure"' > conftest.$ac_ext
     5614  echo '#line 5614 "configure"' > conftest.$ac_ext
    56375615  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    56385616  (eval $ac_compile) 2>&5
     
    67686746
    67696747# Provide some information about the compiler.
    6770 echo "$as_me:6770:" \
     6748echo "$as_me:6748:" \
    67716749     "checking for Fortran 77 compiler version" >&5
    67726750ac_compiler=`set X $ac_compile; echo $2`
     
    78357813   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78367814   -e 's:$: $lt_compiler_flag:'`
    7837    (eval echo "\"\$as_me:7837: $lt_compile\"" >&5)
     7815   (eval echo "\"\$as_me:7815: $lt_compile\"" >&5)
    78387816   (eval "$lt_compile" 2>conftest.err)
    78397817   ac_status=$?
    78407818   cat conftest.err >&5
    7841    echo "$as_me:7841: \$? = $ac_status" >&5
     7819   echo "$as_me:7819: \$? = $ac_status" >&5
    78427820   if (exit $ac_status) && test -s "$ac_outfile"; then
    78437821     # The compiler can only warn and ignore the option if not recognized
     
    81038081   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81048082   -e 's:$: $lt_compiler_flag:'`
    8105    (eval echo "\"\$as_me:8105: $lt_compile\"" >&5)
     8083   (eval echo "\"\$as_me:8083: $lt_compile\"" >&5)
    81068084   (eval "$lt_compile" 2>conftest.err)
    81078085   ac_status=$?
    81088086   cat conftest.err >&5
    8109    echo "$as_me:8109: \$? = $ac_status" >&5
     8087   echo "$as_me:8087: \$? = $ac_status" >&5
    81108088   if (exit $ac_status) && test -s "$ac_outfile"; then
    81118089     # The compiler can only warn and ignore the option if not recognized
     
    82078185   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82088186   -e 's:$: $lt_compiler_flag:'`
    8209    (eval echo "\"\$as_me:8209: $lt_compile\"" >&5)
     8187   (eval echo "\"\$as_me:8187: $lt_compile\"" >&5)
    82108188   (eval "$lt_compile" 2>out/conftest.err)
    82118189   ac_status=$?
    82128190   cat out/conftest.err >&5
    8213    echo "$as_me:8213: \$? = $ac_status" >&5
     8191   echo "$as_me:8191: \$? = $ac_status" >&5
    82148192   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    82158193   then
     
    1055210530  lt_status=$lt_dlunknown
    1055310531  cat > conftest.$ac_ext <<EOF
    10554 #line 10554 "configure"
     10532#line 10532 "configure"
    1055510533#include "confdefs.h"
    1055610534
     
    1065210630  lt_status=$lt_dlunknown
    1065310631  cat > conftest.$ac_ext <<EOF
    10654 #line 10654 "configure"
     10632#line 10632 "configure"
    1065510633#include "confdefs.h"
    1065610634
     
    1299612974   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1299712975   -e 's:$: $lt_compiler_flag:'`
    12998    (eval echo "\"\$as_me:12998: $lt_compile\"" >&5)
     12976   (eval echo "\"\$as_me:12976: $lt_compile\"" >&5)
    1299912977   (eval "$lt_compile" 2>conftest.err)
    1300012978   ac_status=$?
    1300112979   cat conftest.err >&5
    13002    echo "$as_me:13002: \$? = $ac_status" >&5
     12980   echo "$as_me:12980: \$? = $ac_status" >&5
    1300312981   if (exit $ac_status) && test -s "$ac_outfile"; then
    1300412982     # The compiler can only warn and ignore the option if not recognized
     
    1310013078   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1310113079   -e 's:$: $lt_compiler_flag:'`
    13102    (eval echo "\"\$as_me:13102: $lt_compile\"" >&5)
     13080   (eval echo "\"\$as_me:13080: $lt_compile\"" >&5)
    1310313081   (eval "$lt_compile" 2>out/conftest.err)
    1310413082   ac_status=$?
    1310513083   cat out/conftest.err >&5
    13106    echo "$as_me:13106: \$? = $ac_status" >&5
     13084   echo "$as_me:13084: \$? = $ac_status" >&5
    1310713085   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1310813086   then
     
    1467014648   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1467114649   -e 's:$: $lt_compiler_flag:'`
    14672    (eval echo "\"\$as_me:14672: $lt_compile\"" >&5)
     14650   (eval echo "\"\$as_me:14650: $lt_compile\"" >&5)
    1467314651   (eval "$lt_compile" 2>conftest.err)
    1467414652   ac_status=$?
    1467514653   cat conftest.err >&5
    14676    echo "$as_me:14676: \$? = $ac_status" >&5
     14654   echo "$as_me:14654: \$? = $ac_status" >&5
    1467714655   if (exit $ac_status) && test -s "$ac_outfile"; then
    1467814656     # The compiler can only warn and ignore the option if not recognized
     
    1477414752   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1477514753   -e 's:$: $lt_compiler_flag:'`
    14776    (eval echo "\"\$as_me:14776: $lt_compile\"" >&5)
     14754   (eval echo "\"\$as_me:14754: $lt_compile\"" >&5)
    1477714755   (eval "$lt_compile" 2>out/conftest.err)
    1477814756   ac_status=$?
    1477914757   cat out/conftest.err >&5
    14780    echo "$as_me:14780: \$? = $ac_status" >&5
     14758   echo "$as_me:14758: \$? = $ac_status" >&5
    1478114759   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1478214760   then
     
    1698116959   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1698216960   -e 's:$: $lt_compiler_flag:'`
    16983    (eval echo "\"\$as_me:16983: $lt_compile\"" >&5)
     16961   (eval echo "\"\$as_me:16961: $lt_compile\"" >&5)
    1698416962   (eval "$lt_compile" 2>conftest.err)
    1698516963   ac_status=$?
    1698616964   cat conftest.err >&5
    16987    echo "$as_me:16987: \$? = $ac_status" >&5
     16965   echo "$as_me:16965: \$? = $ac_status" >&5
    1698816966   if (exit $ac_status) && test -s "$ac_outfile"; then
    1698916967     # The compiler can only warn and ignore the option if not recognized
     
    1724917227   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1725017228   -e 's:$: $lt_compiler_flag:'`
    17251    (eval echo "\"\$as_me:17251: $lt_compile\"" >&5)
     17229   (eval echo "\"\$as_me:17229: $lt_compile\"" >&5)
    1725217230   (eval "$lt_compile" 2>conftest.err)
    1725317231   ac_status=$?
    1725417232   cat conftest.err >&5
    17255    echo "$as_me:17255: \$? = $ac_status" >&5
     17233   echo "$as_me:17233: \$? = $ac_status" >&5
    1725617234   if (exit $ac_status) && test -s "$ac_outfile"; then
    1725717235     # The compiler can only warn and ignore the option if not recognized
     
    1735317331   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1735417332   -e 's:$: $lt_compiler_flag:'`
    17355    (eval echo "\"\$as_me:17355: $lt_compile\"" >&5)
     17333   (eval echo "\"\$as_me:17333: $lt_compile\"" >&5)
    1735617334   (eval "$lt_compile" 2>out/conftest.err)
    1735717335   ac_status=$?
    1735817336   cat out/conftest.err >&5
    17359    echo "$as_me:17359: \$? = $ac_status" >&5
     17337   echo "$as_me:17337: \$? = $ac_status" >&5
    1736017338   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1736117339   then
     
    2050220480coin_has_readline=no
    2050320481if test $coin_enable_gnu = yes; then
    20504   if test x"#include <stdio.h>" = x; then
    20505   hdr="#include <readline/readline.h>"
    20506 else
    20507   hdr="#include <stdio.h>"
    20508 fi
     20482  #if test x"#include <stdio.h>" = x; then
     20483#  hdr="#include <readline/readline.h>"
     20484#else
     20485#  hdr="#include <stdio.h>"
     20486#fi
     20487#AC_CHECK_HEADERS([readline/readline.h],[coin_has_readline=yes],[],[$hdr])
    2050920488
    2051020489for ac_header in readline/readline.h
     
    2052220501cat >>conftest.$ac_ext <<_ACEOF
    2052320502/* end confdefs.h.  */
    20524 $hdr
     20503#include <stdio.h>
    2052520504
    2052620505#include <$ac_header>
     
    2083220811
    2083320812# Finally, we let configure write all the output...
     20813
     20814
     20815
     20816
     20817echo "$as_me:$LINENO: checking which command should be used to link input files" >&5
     20818echo $ECHO_N "checking which command should be used to link input files... $ECHO_C" >&6
     20819coin_link_input_cmd="$LN_S"
     20820if test "$enable_doscompile" = mingw; then
     20821  coin_link_input_cmd=cp
     20822fi
     20823case "$CC" in
     20824  cl* | */cl* | CL* | */CL*)
     20825    coin_link_input_cmd=cp ;;
     20826esac
     20827echo "$as_me:$LINENO: result: $coin_link_input_cmd" >&5
     20828echo "${ECHO_T}$coin_link_input_cmd" >&6
     20829
     20830
    2083420831
    2083520832if test x$coin_skip_ac_output != xyes; then
     
    2238122378
    2238222379  if test x"$coin_vpath_link_files" = x; then : ; else
    22383     lnkcmd=
    22384     if test "$enable_doscompile" = mingw; then
    22385       lnkcmd=cp
    22386     fi
    22387     case "$CC" in
    22388       cl* | */cl* | CL* | */CL*)
    22389         lnkcmd=cp ;;
    22390     esac
     22380    lnkcmd="$coin_link_input_cmd"
    2239122381    if test "$lnkcmd" = cp; then
    2239222382      { echo "$as_me:$LINENO: Copying data files for VPATH configuration" >&5
    2239322383echo "$as_me: Copying data files for VPATH configuration" >&6;}
    2239422384    else
    22395       echo "$as_me:$LINENO: checking whether ln -s works" >&5
    22396 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
    22397 LN_S=$as_ln_s
    22398 if test "$LN_S" = "ln -s"; then
    22399   echo "$as_me:$LINENO: result: yes" >&5
    22400 echo "${ECHO_T}yes" >&6
    22401 else
    22402   echo "$as_me:$LINENO: result: no, using $LN_S" >&5
    22403 echo "${ECHO_T}no, using $LN_S" >&6
    22404 fi
    22405 
    2240622385      { echo "$as_me:$LINENO: Creating VPATH links for data files" >&5
    2240722386echo "$as_me: Creating VPATH links for data files" >&6;}
    22408       lnkcmd="$LN_S"
    2240922387    fi
    2241022388    for file in $coin_vpath_link_files; do
Note: See TracChangeset for help on using the changeset viewer.