Changeset 857


Ignore:
Timestamp:
Jul 6, 2007 3:47:02 PM (11 years ago)
Author:
tkr
Message:

Updating externals and configure

Location:
Alps/trunk
Files:
1 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • Alps/trunk/Alps/configure

    r808 r857  
    11061106  --with-tags[=TAGS]
    11071107                          include additional configurations [automatic]
    1108   --with-mpi-incdir specify the directory with the header files for library
    1109                           Mpi
    1110   --with-mpi-lib specify the flags to link with the library Mpi
     1108  --with-mpi-incdir specify the header file directory for library Mpi
     1109  --with-mpi-lib specify the flags used to link with the library Mpi
    11111110
    11121111Some influential environment variables:
     
    27032702          cl* | */cl* | CL* | */CL*)
    27042703            coin_opt_cflags='-MT -O2'
    2705             coin_add_cflags='-nologo -wd4996'
     2704            coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    27062705            coin_dbg_cflags='-MTd'
    27072706            ;;
     
    34363435fi
    34373436
     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
    34383445# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    34393446case "$CXX" in
     
    35363543            # The MT and MTd options are mutually exclusive
    35373544            coin_opt_cxxflags='-MT -O2'
    3538             coin_add_cxxflags='-nologo -EHsc -GR -wd4996'
     3545            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    35393546            coin_dbg_cxxflags='-MTd'
    35403547            ;;
     
    56455652*-*-irix6*)
    56465653  # Find out which ABI we are using.
    5647   echo '#line 5647 "configure"' > conftest.$ac_ext
     5654  echo '#line 5654 "configure"' > conftest.$ac_ext
    56485655  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    56495656  (eval $ac_compile) 2>&5
     
    67796786
    67806787# Provide some information about the compiler.
    6781 echo "$as_me:6781:" \
     6788echo "$as_me:6788:" \
    67826789     "checking for Fortran 77 compiler version" >&5
    67836790ac_compiler=`set X $ac_compile; echo $2`
     
    78467853   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78477854   -e 's:$: $lt_compiler_flag:'`
    7848    (eval echo "\"\$as_me:7848: $lt_compile\"" >&5)
     7855   (eval echo "\"\$as_me:7855: $lt_compile\"" >&5)
    78497856   (eval "$lt_compile" 2>conftest.err)
    78507857   ac_status=$?
    78517858   cat conftest.err >&5
    7852    echo "$as_me:7852: \$? = $ac_status" >&5
     7859   echo "$as_me:7859: \$? = $ac_status" >&5
    78537860   if (exit $ac_status) && test -s "$ac_outfile"; then
    78547861     # The compiler can only warn and ignore the option if not recognized
     
    81148121   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81158122   -e 's:$: $lt_compiler_flag:'`
    8116    (eval echo "\"\$as_me:8116: $lt_compile\"" >&5)
     8123   (eval echo "\"\$as_me:8123: $lt_compile\"" >&5)
    81178124   (eval "$lt_compile" 2>conftest.err)
    81188125   ac_status=$?
    81198126   cat conftest.err >&5
    8120    echo "$as_me:8120: \$? = $ac_status" >&5
     8127   echo "$as_me:8127: \$? = $ac_status" >&5
    81218128   if (exit $ac_status) && test -s "$ac_outfile"; then
    81228129     # The compiler can only warn and ignore the option if not recognized
     
    82188225   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82198226   -e 's:$: $lt_compiler_flag:'`
    8220    (eval echo "\"\$as_me:8220: $lt_compile\"" >&5)
     8227   (eval echo "\"\$as_me:8227: $lt_compile\"" >&5)
    82218228   (eval "$lt_compile" 2>out/conftest.err)
    82228229   ac_status=$?
    82238230   cat out/conftest.err >&5
    8224    echo "$as_me:8224: \$? = $ac_status" >&5
     8231   echo "$as_me:8231: \$? = $ac_status" >&5
    82258232   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    82268233   then
     
    1056310570  lt_status=$lt_dlunknown
    1056410571  cat > conftest.$ac_ext <<EOF
    10565 #line 10565 "configure"
     10572#line 10572 "configure"
    1056610573#include "confdefs.h"
    1056710574
     
    1066310670  lt_status=$lt_dlunknown
    1066410671  cat > conftest.$ac_ext <<EOF
    10665 #line 10665 "configure"
     10672#line 10672 "configure"
    1066610673#include "confdefs.h"
    1066710674
     
    1300713014   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1300813015   -e 's:$: $lt_compiler_flag:'`
    13009    (eval echo "\"\$as_me:13009: $lt_compile\"" >&5)
     13016   (eval echo "\"\$as_me:13016: $lt_compile\"" >&5)
    1301013017   (eval "$lt_compile" 2>conftest.err)
    1301113018   ac_status=$?
    1301213019   cat conftest.err >&5
    13013    echo "$as_me:13013: \$? = $ac_status" >&5
     13020   echo "$as_me:13020: \$? = $ac_status" >&5
    1301413021   if (exit $ac_status) && test -s "$ac_outfile"; then
    1301513022     # The compiler can only warn and ignore the option if not recognized
     
    1311113118   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1311213119   -e 's:$: $lt_compiler_flag:'`
    13113    (eval echo "\"\$as_me:13113: $lt_compile\"" >&5)
     13120   (eval echo "\"\$as_me:13120: $lt_compile\"" >&5)
    1311413121   (eval "$lt_compile" 2>out/conftest.err)
    1311513122   ac_status=$?
    1311613123   cat out/conftest.err >&5
    13117    echo "$as_me:13117: \$? = $ac_status" >&5
     13124   echo "$as_me:13124: \$? = $ac_status" >&5
    1311813125   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1311913126   then
     
    1468114688   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1468214689   -e 's:$: $lt_compiler_flag:'`
    14683    (eval echo "\"\$as_me:14683: $lt_compile\"" >&5)
     14690   (eval echo "\"\$as_me:14690: $lt_compile\"" >&5)
    1468414691   (eval "$lt_compile" 2>conftest.err)
    1468514692   ac_status=$?
    1468614693   cat conftest.err >&5
    14687    echo "$as_me:14687: \$? = $ac_status" >&5
     14694   echo "$as_me:14694: \$? = $ac_status" >&5
    1468814695   if (exit $ac_status) && test -s "$ac_outfile"; then
    1468914696     # The compiler can only warn and ignore the option if not recognized
     
    1478514792   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1478614793   -e 's:$: $lt_compiler_flag:'`
    14787    (eval echo "\"\$as_me:14787: $lt_compile\"" >&5)
     14794   (eval echo "\"\$as_me:14794: $lt_compile\"" >&5)
    1478814795   (eval "$lt_compile" 2>out/conftest.err)
    1478914796   ac_status=$?
    1479014797   cat out/conftest.err >&5
    14791    echo "$as_me:14791: \$? = $ac_status" >&5
     14798   echo "$as_me:14798: \$? = $ac_status" >&5
    1479214799   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1479314800   then
     
    1699216999   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1699317000   -e 's:$: $lt_compiler_flag:'`
    16994    (eval echo "\"\$as_me:16994: $lt_compile\"" >&5)
     17001   (eval echo "\"\$as_me:17001: $lt_compile\"" >&5)
    1699517002   (eval "$lt_compile" 2>conftest.err)
    1699617003   ac_status=$?
    1699717004   cat conftest.err >&5
    16998    echo "$as_me:16998: \$? = $ac_status" >&5
     17005   echo "$as_me:17005: \$? = $ac_status" >&5
    1699917006   if (exit $ac_status) && test -s "$ac_outfile"; then
    1700017007     # The compiler can only warn and ignore the option if not recognized
     
    1726017267   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1726117268   -e 's:$: $lt_compiler_flag:'`
    17262    (eval echo "\"\$as_me:17262: $lt_compile\"" >&5)
     17269   (eval echo "\"\$as_me:17269: $lt_compile\"" >&5)
    1726317270   (eval "$lt_compile" 2>conftest.err)
    1726417271   ac_status=$?
    1726517272   cat conftest.err >&5
    17266    echo "$as_me:17266: \$? = $ac_status" >&5
     17273   echo "$as_me:17273: \$? = $ac_status" >&5
    1726717274   if (exit $ac_status) && test -s "$ac_outfile"; then
    1726817275     # The compiler can only warn and ignore the option if not recognized
     
    1736417371   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1736517372   -e 's:$: $lt_compiler_flag:'`
    17366    (eval echo "\"\$as_me:17366: $lt_compile\"" >&5)
     17373   (eval echo "\"\$as_me:17373: $lt_compile\"" >&5)
    1736717374   (eval "$lt_compile" 2>out/conftest.err)
    1736817375   ac_status=$?
    1736917376   cat out/conftest.err >&5
    17370    echo "$as_me:17370: \$? = $ac_status" >&5
     17377   echo "$as_me:17377: \$? = $ac_status" >&5
    1737117378   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1737217379   then
     
    2007120078  { echo "$as_me:$LINENO: Build is \"$build\"." >&5
    2007220079echo "$as_me: Build is \"$build\"." >&6;}
     20080  mydos2unix='| dos2unix'
    2007320081  case $build in
    2007420082    *-mingw*)
    2007520083      CYGPATH_W=echo
     20084      mydos2unix=
    2007620085      ;;
    2007720086  esac
     
    2009920108            -e 's%lib /OUT:%lib -OUT:%' \
    2010020109            -e "s%cygpath -w%$CYGPATH_W%" \
    20101             -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
     20110            -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
    2010220111            -e 's/$AR t/lib -nologo -list/' \
    2010320112            -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
     
    2052820537
    2052920538
    20530 echo "$as_me:$LINENO: checking if user provides library for Mpi" >&5
     20539  echo "$as_me:$LINENO: checking if user provides library for Mpi" >&5
    2053120540echo $ECHO_N "checking if user provides library for Mpi... $ECHO_C" >&6
    2053220541
    2053320542# Check for header file directory
     20543
    2053420544
    2053520545# Check whether --with-mpi-incdir or --without-mpi-incdir was given.
     
    2053820548  MPIINCDIR=`cd $withval; pwd`
    2053920549fi;
     20550
    2054020551# Check for library directory
     20552
    2054120553
    2054220554# Check whether --with-mpi-lib or --without-mpi-lib was given.
     
    2054520557  MPILIB=$withval
    2054620558fi;
     20559
    2054720560# Switch to disable library check if requested
    20548 # Check whether --enable-mpi-libcheck or --disable-mpi-libcheck was given.
     20561
     20562  # Check whether --enable-mpi-libcheck or --disable-mpi-libcheck was given.
    2054920563if test "${enable_mpi_libcheck+set}" = set; then
    2055020564  enableval="$enable_mpi_libcheck"
     
    2055420568fi;
    2055520569
    20556 if test x"$MPIINCDIR" != x || test x"$MPILIB" != x; then
    20557   coin_has_mpi=true
    20558 else
    20559   coin_has_mpi=false
    20560 fi
    20561 
    20562 if test $coin_has_mpi = true; then
    20563 # Check either both arguments or none are given
    20564   if test x"$MPIINCDIR" = x || test x"$MPILIB" = x; then
    20565     { { echo "$as_me:$LINENO: error: You need to specify both --with-mpi-incdir and --with-mpi-lib if you want to use library Mpi" >&5
    20566 echo "$as_me: error: You need to specify both --with-mpi-incdir and --with-mpi-lib if you want to use library Mpi" >&2;}
     20570# At this point, if we're going to use the library, both LBRYINCDIR and
     20571# LBRYLIB must be defined and not empty.
     20572
     20573  if test x"$MPIINCDIR" != x || test x"$MPILIB" != x; then
     20574    if test x"$MPIINCDIR" = x || test x"$MPILIB" = x; then
     20575      { { echo "$as_me:$LINENO: error: You need to specify both an include directory and link flags to use library Mpi. Use --with-mpi-incdir of environment variable $MPIINCDIR to specify the include directory. Use --with-mpi-lib or environment variable $MPILIB to specify link flags." >&5
     20576echo "$as_me: error: You need to specify both an include directory and link flags to use library Mpi. Use --with-mpi-incdir of environment variable $MPIINCDIR to specify the include directory. Use --with-mpi-lib or environment variable $MPILIB to specify link flags." >&2;}
    2056720577   { (exit 1); exit 1; }; }
     20578    fi
     20579    coin_has_mpi=true
     20580    echo "$as_me:$LINENO: result: yes" >&5
     20581echo "${ECHO_T}yes" >&6
     20582  else
     20583    coin_has_mpi=false
     20584    echo "$as_me:$LINENO: result: no" >&5
     20585echo "${ECHO_T}no" >&6
    2056820586  fi
    20569   echo "$as_me:$LINENO: result: yes" >&5
    20570 echo "${ECHO_T}yes" >&6
    20571   # Check if the given header file is there
    20572   as_ac_File=`echo "ac_cv_file_$MPIINCDIR/mpi.h" | $as_tr_sh`
     20587
     20588# If we have instructions for use, consider header and link checks.
     20589
     20590  if test $coin_has_mpi = true; then
     20591
     20592# If argument 3 (file) is given, check for the file. Typically this will be a
     20593# header file, but that's not assumed.
     20594
     20595    as_ac_File=`echo "ac_cv_file_$MPIINCDIR/mpi.h" | $as_tr_sh`
    2057320596echo "$as_me:$LINENO: checking for $MPIINCDIR/mpi.h" >&5
    2057420597echo $ECHO_N "checking for $MPIINCDIR/mpi.h... $ECHO_C" >&6
     
    2059720620
    2059820621
    20599   # Check if the symbol is provided in the library
    20600   # ToDo: FOR NOW WE ASSUME THAT WE ARE USING THE C++ COMPILER
    20601   if test x"$mpi_libcheck" != xno; then
    20602                     coin_save_LIBS="$LIBS"
    20603                     LIBS="$MPILIB $ADDLIBS"
    20604                     echo "$as_me:$LINENO: checking whether symbol MPI_Irecv is available with MPI" >&5
    20605 echo $ECHO_N "checking whether symbol MPI_Irecv is available with MPI... $ECHO_C" >&6
    20606                     ac_ext=c
     20622# Now see if we can link the function. There are arguments for and against
     20623# assuming argument 3 is a header file declaring the function. A correct
     20624# function declaration is the main argument in favour. Having to cope with
     20625# possible dependencies or other oddities are the main arguments against.
     20626# Force the use of C as the best single choice amongst C++, C, and Fortran.
     20627# Obviously, this has limits.
     20628
     20629    if test x"$mpi_libcheck" != xno; then
     20630           coin_save_LIBS="$LIBS"
     20631           LIBS="$MPILIB $ADDLIBS"
     20632           coin_MPI_link=no
     20633           ac_ext=c
    2060720634ac_cpp='$CPP $CPPFLAGS'
    2060820635ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     
    2061020637ac_compiler_gnu=$ac_cv_c_compiler_gnu
    2061120638
    20612 # ToDo find out what to do about extern "C"
    20613 #                    AC_TRY_LINK([extern "C" {void MPI_Irecv();}],[MPI_Irecv()],
    20614                     cat >conftest.$ac_ext <<_ACEOF
     20639           for fnm in MPI_Irecv ; do
     20640             echo "$as_me:$LINENO: checking whether symbol $fnm is available with MPI" >&5
     20641echo $ECHO_N "checking whether symbol $fnm is available with MPI... $ECHO_C" >&6
     20642             cat >conftest.$ac_ext <<_ACEOF
    2061520643/* confdefs.h.  */
    2061620644_ACEOF
     
    2061820646cat >>conftest.$ac_ext <<_ACEOF
    2061920647/* end confdefs.h.  */
    20620 void MPI_Irecv();
     20648
    2062120649int
    2062220650main ()
    2062320651{
    20624 MPI_Irecv()
     20652$fnm()
    2062520653  ;
    2062620654  return 0;
     
    2065120679  echo "$as_me:$LINENO: result: yes" >&5
    2065220680echo "${ECHO_T}yes" >&6
     20681                  coin_MPI_link=yes
     20682                  break
    2065320683else
    2065420684  echo "$as_me: failed program was:" >&5
     
    2065720687echo "$as_me:$LINENO: result: no" >&5
    2065820688echo "${ECHO_T}no" >&6
    20659                                  { { echo "$as_me:$LINENO: error: Cannot find symbol MPI_Irecv with MPI" >&5
    20660 echo "$as_me: error: Cannot find symbol MPI_Irecv with MPI" >&2;}
    20661    { (exit 1); exit 1; }; }
    2066220689fi
    2066320690rm -f conftest.err conftest.$ac_objext \
    2066420691      conftest$ac_exeext conftest.$ac_ext
    20665                     ac_ext=c
     20692           done
     20693           ac_ext=c
    2066620694ac_cpp='$CPP $CPPFLAGS'
    2066720695ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     
    2066920697ac_compiler_gnu=$ac_cv_c_compiler_gnu
    2067020698
    20671                     LIBS="$coin_save_LIBS"
    20672                   fi
    20673 
    20674   ADDLIBS="$MPILIB $ADDLIBS"
     20699           if test x"$coin_MPI_link" = xyes ; then
     20700             LIBS="$coin_save_LIBS"
     20701           else
     20702             { { echo "$as_me:$LINENO: error: Cannot find symbol(s) MPI_Irecv with MPI" >&5
     20703echo "$as_me: error: Cannot find symbol(s) MPI_Irecv with MPI" >&2;}
     20704   { (exit 1); exit 1; }; }
     20705           fi
     20706         fi
     20707
     20708
     20709# If we make it this far, we've verified the file and linked the function. Add
     20710# the necessary link flags to ADDLIBS and define the preprocessor symbol
     20711# COIN_HAS_LBRY.
     20712
     20713    ADDLIBS="$MPILIB $ADDLIBS"
    2067520714
    2067620715cat >>confdefs.h <<\_ACEOF
     
    2067820717_ACEOF
    2067920718
    20680 else
    20681   echo "$as_me:$LINENO: result: no" >&5
    20682 echo "${ECHO_T}no" >&6
    20683 fi
     20719  fi
     20720
     20721# Arrange for configure to substitute LBRYINCDIR and LBRYLIB and create the
     20722# automake conditional. These actions must occur unconditionally.
    2068420723
    2068520724
     
    2248622525  if test x"$coin_vpath_link_files" = x; then : ; else
    2248722526    lnkcmd=
    22488     if test "$enable_doscompile" = yes; then
     22527    if test "$enable_doscompile" = mingw; then
    2248922528      lnkcmd=cp
    2249022529    fi
  • Alps/trunk/config.guess

    r277 r857  
    55#   Inc.
    66
    7 timestamp='2006-05-13'
     7timestamp='2007-05-17'
    88
    99# This file is free software; you can redistribute it and/or modify it
     
    162162            sh3el) machine=shl-unknown ;;
    163163            sh3eb) machine=sh-unknown ;;
     164            sh5el) machine=sh5le-unknown ;;
    164165            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
    165166        esac
     
    212213        exit ;;
    213214    macppc:MirBSD:*:*)
    214         echo powerppc-unknown-mirbsd${UNAME_RELEASE}
     215        echo powerpc-unknown-mirbsd${UNAME_RELEASE}
    215216        exit ;;
    216217    *:MirBSD:*:*)
     
    330331        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    331332        exit ;;
    332     i86pc:SunOS:5.*:*)
     333    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
    333334        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    334335        exit ;;
     
    781782        echo ${UNAME_MACHINE}-pc-cygwin
    782783        exit ;;
    783     i*:MINGW*:*)
     784    *:MINGW*:*)
    784785        echo ${UNAME_MACHINE}-pc-mingw32
    785786        exit ;;
     
    791792        echo ${UNAME_MACHINE}-pc-pw32
    792793        exit ;;
    793     x86:Interix*:[345]*)
    794         echo i586-pc-interix${UNAME_RELEASE}
    795         exit ;;
    796     EM64T:Interix*:[345]*)
    797         echo x86_64-unknown-interix${UNAME_RELEASE}
    798         exit ;;
     794    *:Interix*:[3456]*)
     795        case ${UNAME_MACHINE} in
     796            x86)
     797                echo i586-pc-interix${UNAME_RELEASE}
     798                exit ;;
     799            EM64T | authenticamd)
     800                echo x86_64-unknown-interix${UNAME_RELEASE}
     801                exit ;;
     802        esac ;;
    799803    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
    800804        echo i${UNAME_MACHINE}-pc-mks
     
    830834        exit ;;
    831835    arm*:Linux:*:*)
     836        echo ${UNAME_MACHINE}-unknown-linux-gnu
     837        exit ;;
     838    avr32*:Linux:*:*)
    832839        echo ${UNAME_MACHINE}-unknown-linux-gnu
    833840        exit ;;
     
    947954    x86_64:Linux:*:*)
    948955        echo x86_64-unknown-linux-gnu
     956        exit ;;
     957    xtensa:Linux:*:*)
     958        echo xtensa-unknown-linux-gnu
    949959        exit ;;
    950960    i*86:Linux:*:*)
     
    12061216        echo sx6-nec-superux${UNAME_RELEASE}
    12071217        exit ;;
     1218    SX-7:SUPER-UX:*:*)
     1219        echo sx7-nec-superux${UNAME_RELEASE}
     1220        exit ;;
     1221    SX-8:SUPER-UX:*:*)
     1222        echo sx8-nec-superux${UNAME_RELEASE}
     1223        exit ;;
     1224    SX-8R:SUPER-UX:*:*)
     1225        echo sx8r-nec-superux${UNAME_RELEASE}
     1226        exit ;;
    12081227    Power*:Rhapsody:*:*)
    12091228        echo powerpc-apple-rhapsody${UNAME_RELEASE}
  • Alps/trunk/config.sub

    r277 r857  
    55#   Inc.
    66
    7 timestamp='2006-05-13'
     7timestamp='2007-04-29'
    88
    99# This file is (in principle) common to ALL GNU software.
     
    242242        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
    243243        | am33_2.0 \
    244         | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
     244        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
    245245        | bfin \
    246246        | c4x | clipper \
    247247        | d10v | d30v | dlx | dsp16xx \
    248         | fr30 | frv \
     248        | fido | fr30 | frv \
    249249        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
    250250        | i370 | i860 | i960 | ia64 \
    251251        | ip2k | iq2000 \
    252252        | m32c | m32r | m32rle | m68000 | m68k | m88k \
    253         | maxq | mb | microblaze | mcore \
     253        | maxq | mb | microblaze | mcore | mep \
    254254        | mips | mipsbe | mipseb | mipsel | mipsle \
    255255        | mips16 \
     
    277277        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
    278278        | pyramid \
     279        | score \
    279280        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
    280281        | sh64 | sh64le \
     
    285286        | v850 | v850e \
    286287        | we32k \
    287         | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
     288        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
    288289        | z8k)
    289290                basic_machine=$basic_machine-unknown
     
    318319        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
    319320        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
    320         | avr-* \
     321        | avr-* | avr32-* \
    321322        | bfin-* | bs2000-* \
    322323        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
     
    324325        | d10v-* | d30v-* | dlx-* \
    325326        | elxsi-* \
    326         | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
     327        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
    327328        | h8300-* | h8500-* \
    328329        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
     
    368369        | v850-* | v850e-* | vax-* \
    369370        | we32k-* \
    370         | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
     371        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
    371372        | xstormy16-* | xtensa-* \
    372373        | ymp-* \
     
    682683                basic_machine=i386-pc
    683684                os=-mingw32
     685                ;;
     686        mingw32ce)
     687                basic_machine=arm-unknown
     688                os=-mingw32ce
    684689                ;;
    685690        miniframe)
     
    910915                basic_machine=mipsisa64sb1el-unknown
    911916                ;;
     917        sde)
     918                basic_machine=mipsisa32-sde
     919                os=-elf
     920                ;;
    912921        sei)
    913922                basic_machine=mips-sei
     
    920929                basic_machine=sh-hitachi
    921930                os=-hms
     931                ;;
     932        sh5el)
     933                basic_machine=sh5le-unknown
    922934                ;;
    923935        sh64)
     
    12151227              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
    12161228              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
    1217               | -skyos* | -haiku* | -rdos*)
     1229              | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
    12181230        # Remember, each alternative MUST END IN *, to match a version number.
    12191231                ;;
     
    13671379
    13681380case $basic_machine in
     1381        score-*)
     1382                os=-elf
     1383                ;;
    13691384        spu-*)
    13701385                os=-elf
     
    14061421        m68*-cisco)
    14071422                os=-aout
     1423                ;;
     1424        mep-*)
     1425                os=-elf
    14081426                ;;
    14091427        mips*-cisco)
  • Alps/trunk/configure

    r808 r857  
    26432643          cl* | */cl* | CL* | */CL*)
    26442644            coin_opt_cflags='-MT -O2'
    2645             coin_add_cflags='-nologo -wd4996'
     2645            coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    26462646            coin_dbg_cflags='-MTd'
    26472647            ;;
     
    33783378fi
    33793379
     3380# It seems that we need to cleanup something here for the Windows
     3381case "$CXX" in
     3382  cl* | */cl* | CL* | */CL* )
     3383    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     3384    mv confdefs.hh confdefs.h
     3385    ;;
     3386esac
     3387
    33803388# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    33813389case "$CXX" in
     
    34783486            # The MT and MTd options are mutually exclusive
    34793487            coin_opt_cxxflags='-MT -O2'
    3480             coin_add_cxxflags='-nologo -EHsc -GR -wd4996'
     3488            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    34813489            coin_dbg_cxxflags='-MTd'
    34823490            ;;
     
    38233831  *-cygwin* | *-mingw*)
    38243832     if test "$enable_doscompile" = msvc ; then
    3825        coin_f77_comps="ifort fl32"
     3833       coin_f77_comps="ifort fl32 compile_f2c"
    38263834     else
    3827        coin_f77_comps="gfortran g77 ifort fl32"
     3835       coin_f77_comps="gfortran g77 ifort fl32 compile_f2c"
    38283836     fi ;;
    38293837  sparc-sun-solaris*)
     
    40004008
    40014009# Provide some information about the compiler.
    4002 echo "$as_me:4002:" \
     4010echo "$as_me:4010:" \
    40034011     "checking for Fortran 77 compiler version" >&5
    40044012ac_compiler=`set X $ac_compile; echo $2`
     
    42184226            coin_add_fflags='-fpp -nologo -MT'
    42194227            coin_dbg_fflags='-debug'
     4228          ;;
     4229          compile_f2c*)
     4230            coin_opt_fflags='-MT -O2'
     4231            coin_add_fflags='-nologo -wd4996'
     4232            coin_dbg_fflags='-MTd'
    42204233          ;;
    42214234        esac
     
    62726285*-*-irix6*)
    62736286  # Find out which ABI we are using.
    6274   echo '#line 6274 "configure"' > conftest.$ac_ext
     6287  echo '#line 6287 "configure"' > conftest.$ac_ext
    62756288  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    62766289  (eval $ac_compile) 2>&5
     
    82368249   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82378250   -e 's:$: $lt_compiler_flag:'`
    8238    (eval echo "\"\$as_me:8238: $lt_compile\"" >&5)
     8251   (eval echo "\"\$as_me:8251: $lt_compile\"" >&5)
    82398252   (eval "$lt_compile" 2>conftest.err)
    82408253   ac_status=$?
    82418254   cat conftest.err >&5
    8242    echo "$as_me:8242: \$? = $ac_status" >&5
     8255   echo "$as_me:8255: \$? = $ac_status" >&5
    82438256   if (exit $ac_status) && test -s "$ac_outfile"; then
    82448257     # The compiler can only warn and ignore the option if not recognized
     
    85048517   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    85058518   -e 's:$: $lt_compiler_flag:'`
    8506    (eval echo "\"\$as_me:8506: $lt_compile\"" >&5)
     8519   (eval echo "\"\$as_me:8519: $lt_compile\"" >&5)
    85078520   (eval "$lt_compile" 2>conftest.err)
    85088521   ac_status=$?
    85098522   cat conftest.err >&5
    8510    echo "$as_me:8510: \$? = $ac_status" >&5
     8523   echo "$as_me:8523: \$? = $ac_status" >&5
    85118524   if (exit $ac_status) && test -s "$ac_outfile"; then
    85128525     # The compiler can only warn and ignore the option if not recognized
     
    86088621   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86098622   -e 's:$: $lt_compiler_flag:'`
    8610    (eval echo "\"\$as_me:8610: $lt_compile\"" >&5)
     8623   (eval echo "\"\$as_me:8623: $lt_compile\"" >&5)
    86118624   (eval "$lt_compile" 2>out/conftest.err)
    86128625   ac_status=$?
    86138626   cat out/conftest.err >&5
    8614    echo "$as_me:8614: \$? = $ac_status" >&5
     8627   echo "$as_me:8627: \$? = $ac_status" >&5
    86158628   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    86168629   then
     
    1095310966  lt_status=$lt_dlunknown
    1095410967  cat > conftest.$ac_ext <<EOF
    10955 #line 10955 "configure"
     10968#line 10968 "configure"
    1095610969#include "confdefs.h"
    1095710970
     
    1105311066  lt_status=$lt_dlunknown
    1105411067  cat > conftest.$ac_ext <<EOF
    11055 #line 11055 "configure"
     11068#line 11068 "configure"
    1105611069#include "confdefs.h"
    1105711070
     
    1339713410   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1339813411   -e 's:$: $lt_compiler_flag:'`
    13399    (eval echo "\"\$as_me:13399: $lt_compile\"" >&5)
     13412   (eval echo "\"\$as_me:13412: $lt_compile\"" >&5)
    1340013413   (eval "$lt_compile" 2>conftest.err)
    1340113414   ac_status=$?
    1340213415   cat conftest.err >&5
    13403    echo "$as_me:13403: \$? = $ac_status" >&5
     13416   echo "$as_me:13416: \$? = $ac_status" >&5
    1340413417   if (exit $ac_status) && test -s "$ac_outfile"; then
    1340513418     # The compiler can only warn and ignore the option if not recognized
     
    1350113514   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1350213515   -e 's:$: $lt_compiler_flag:'`
    13503    (eval echo "\"\$as_me:13503: $lt_compile\"" >&5)
     13516   (eval echo "\"\$as_me:13516: $lt_compile\"" >&5)
    1350413517   (eval "$lt_compile" 2>out/conftest.err)
    1350513518   ac_status=$?
    1350613519   cat out/conftest.err >&5
    13507    echo "$as_me:13507: \$? = $ac_status" >&5
     13520   echo "$as_me:13520: \$? = $ac_status" >&5
    1350813521   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1350913522   then
     
    1507115084   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1507215085   -e 's:$: $lt_compiler_flag:'`
    15073    (eval echo "\"\$as_me:15073: $lt_compile\"" >&5)
     15086   (eval echo "\"\$as_me:15086: $lt_compile\"" >&5)
    1507415087   (eval "$lt_compile" 2>conftest.err)
    1507515088   ac_status=$?
    1507615089   cat conftest.err >&5
    15077    echo "$as_me:15077: \$? = $ac_status" >&5
     15090   echo "$as_me:15090: \$? = $ac_status" >&5
    1507815091   if (exit $ac_status) && test -s "$ac_outfile"; then
    1507915092     # The compiler can only warn and ignore the option if not recognized
     
    1517515188   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1517615189   -e 's:$: $lt_compiler_flag:'`
    15177    (eval echo "\"\$as_me:15177: $lt_compile\"" >&5)
     15190   (eval echo "\"\$as_me:15190: $lt_compile\"" >&5)
    1517815191   (eval "$lt_compile" 2>out/conftest.err)
    1517915192   ac_status=$?
    1518015193   cat out/conftest.err >&5
    15181    echo "$as_me:15181: \$? = $ac_status" >&5
     15194   echo "$as_me:15194: \$? = $ac_status" >&5
    1518215195   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1518315196   then
     
    1738217395   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1738317396   -e 's:$: $lt_compiler_flag:'`
    17384    (eval echo "\"\$as_me:17384: $lt_compile\"" >&5)
     17397   (eval echo "\"\$as_me:17397: $lt_compile\"" >&5)
    1738517398   (eval "$lt_compile" 2>conftest.err)
    1738617399   ac_status=$?
    1738717400   cat conftest.err >&5
    17388    echo "$as_me:17388: \$? = $ac_status" >&5
     17401   echo "$as_me:17401: \$? = $ac_status" >&5
    1738917402   if (exit $ac_status) && test -s "$ac_outfile"; then
    1739017403     # The compiler can only warn and ignore the option if not recognized
     
    1765017663   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1765117664   -e 's:$: $lt_compiler_flag:'`
    17652    (eval echo "\"\$as_me:17652: $lt_compile\"" >&5)
     17665   (eval echo "\"\$as_me:17665: $lt_compile\"" >&5)
    1765317666   (eval "$lt_compile" 2>conftest.err)
    1765417667   ac_status=$?
    1765517668   cat conftest.err >&5
    17656    echo "$as_me:17656: \$? = $ac_status" >&5
     17669   echo "$as_me:17669: \$? = $ac_status" >&5
    1765717670   if (exit $ac_status) && test -s "$ac_outfile"; then
    1765817671     # The compiler can only warn and ignore the option if not recognized
     
    1775417767   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1775517768   -e 's:$: $lt_compiler_flag:'`
    17756    (eval echo "\"\$as_me:17756: $lt_compile\"" >&5)
     17769   (eval echo "\"\$as_me:17769: $lt_compile\"" >&5)
    1775717770   (eval "$lt_compile" 2>out/conftest.err)
    1775817771   ac_status=$?
    1775917772   cat out/conftest.err >&5
    17760    echo "$as_me:17760: \$? = $ac_status" >&5
     17773   echo "$as_me:17773: \$? = $ac_status" >&5
    1776117774   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1776217775   then
     
    2046120474  { echo "$as_me:$LINENO: Build is \"$build\"." >&5
    2046220475echo "$as_me: Build is \"$build\"." >&6;}
     20476  mydos2unix='| dos2unix'
    2046320477  case $build in
    2046420478    *-mingw*)
    2046520479      CYGPATH_W=echo
     20480      mydos2unix=
    2046620481      ;;
    2046720482  esac
     
    2048920504            -e 's%lib /OUT:%lib -OUT:%' \
    2049020505            -e "s%cygpath -w%$CYGPATH_W%" \
    20491             -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
     20506            -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo '"$mydos2unix"'\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
    2049220507            -e 's/$AR t/lib -nologo -list/' \
    2049320508            -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
     
    2231122326  if test x"$coin_vpath_link_files" = x; then : ; else
    2231222327    lnkcmd=
    22313     if test "$enable_doscompile" = yes; then
     22328    if test "$enable_doscompile" = mingw; then
    2231422329      lnkcmd=cp
    2231522330    fi
Note: See TracChangeset for help on using the changeset viewer.