Changeset 1688 for trunk


Ignore:
Timestamp:
Mar 1, 2011 9:58:10 AM (9 years ago)
Author:
stefan
Message:

add -Wno-long-long in case someone compiles with AMD UFL; rerun autotools

Location:
trunk/Clp
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Clp/configure

    r1687 r1688  
    17221722coin_projectdir=yes
    17231723
    1724 # Set the project's version number
     1724# Set the project's version numbers
    17251725
    17261726
    17271727cat >>confdefs.h <<_ACEOF
    17281728#define CLP_VERSION "$PACKAGE_VERSION"
     1729_ACEOF
     1730
     1731
     1732  coin_majorver=`echo $PACKAGE_VERSION | sed -n -e 's/^\([0-9]*\).*/\1/gp'`
     1733  coin_minorver=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.\([0-9]*\).*/\1/gp'`
     1734  coin_releasever=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/gp'`
     1735  if test "x$coin_majorver" = x ; then coin_majorver=-1 ; fi
     1736  if test "x$coin_minorver" = x ; then coin_minorver=-1 ; fi
     1737  if test "x$coin_releasever" = x ; then coin_releasever=-1 ; fi
     1738
     1739cat >>confdefs.h <<_ACEOF
     1740#define CLP_VERSION_MAJOR $coin_majorver
     1741_ACEOF
     1742
     1743
     1744cat >>confdefs.h <<_ACEOF
     1745#define CLP_VERSION_MINOR $coin_minorver
     1746_ACEOF
     1747
     1748
     1749cat >>confdefs.h <<_ACEOF
     1750#define CLP_VERSION_RELEASE $coin_releasever
    17291751_ACEOF
    17301752
    … …  
    59155937*-*-irix6*)
    59165938  # Find out which ABI we are using.
    5917   echo '#line 5917 "configure"' > conftest.$ac_ext
     5939  echo '#line 5939 "configure"' > conftest.$ac_ext
    59185940  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59195941  (eval $ac_compile) 2>&5
    … …  
    70497071
    70507072# Provide some information about the compiler.
    7051 echo "$as_me:7051:" \
     7073echo "$as_me:7073:" \
    70527074     "checking for Fortran 77 compiler version" >&5
    70537075ac_compiler=`set X $ac_compile; echo $2`
    … …  
    81168138   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81178139   -e 's:$: $lt_compiler_flag:'`
    8118    (eval echo "\"\$as_me:8118: $lt_compile\"" >&5)
     8140   (eval echo "\"\$as_me:8140: $lt_compile\"" >&5)
    81198141   (eval "$lt_compile" 2>conftest.err)
    81208142   ac_status=$?
    81218143   cat conftest.err >&5
    8122    echo "$as_me:8122: \$? = $ac_status" >&5
     8144   echo "$as_me:8144: \$? = $ac_status" >&5
    81238145   if (exit $ac_status) && test -s "$ac_outfile"; then
    81248146     # The compiler can only warn and ignore the option if not recognized
    … …  
    83848406   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83858407   -e 's:$: $lt_compiler_flag:'`
    8386    (eval echo "\"\$as_me:8386: $lt_compile\"" >&5)
     8408   (eval echo "\"\$as_me:8408: $lt_compile\"" >&5)
    83878409   (eval "$lt_compile" 2>conftest.err)
    83888410   ac_status=$?
    83898411   cat conftest.err >&5
    8390    echo "$as_me:8390: \$? = $ac_status" >&5
     8412   echo "$as_me:8412: \$? = $ac_status" >&5
    83918413   if (exit $ac_status) && test -s "$ac_outfile"; then
    83928414     # The compiler can only warn and ignore the option if not recognized
    … …  
    84888510   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84898511   -e 's:$: $lt_compiler_flag:'`
    8490    (eval echo "\"\$as_me:8490: $lt_compile\"" >&5)
     8512   (eval echo "\"\$as_me:8512: $lt_compile\"" >&5)
    84918513   (eval "$lt_compile" 2>out/conftest.err)
    84928514   ac_status=$?
    84938515   cat out/conftest.err >&5
    8494    echo "$as_me:8494: \$? = $ac_status" >&5
     8516   echo "$as_me:8516: \$? = $ac_status" >&5
    84958517   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84968518   then
    … …  
    1083310855  lt_status=$lt_dlunknown
    1083410856  cat > conftest.$ac_ext <<EOF
    10835 #line 10835 "configure"
     10857#line 10857 "configure"
    1083610858#include "confdefs.h"
    1083710859
    … …  
    1093310955  lt_status=$lt_dlunknown
    1093410956  cat > conftest.$ac_ext <<EOF
    10935 #line 10935 "configure"
     10957#line 10957 "configure"
    1093610958#include "confdefs.h"
    1093710959
    … …  
    1327713299   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1327813300   -e 's:$: $lt_compiler_flag:'`
    13279    (eval echo "\"\$as_me:13279: $lt_compile\"" >&5)
     13301   (eval echo "\"\$as_me:13301: $lt_compile\"" >&5)
    1328013302   (eval "$lt_compile" 2>conftest.err)
    1328113303   ac_status=$?
    1328213304   cat conftest.err >&5
    13283    echo "$as_me:13283: \$? = $ac_status" >&5
     13305   echo "$as_me:13305: \$? = $ac_status" >&5
    1328413306   if (exit $ac_status) && test -s "$ac_outfile"; then
    1328513307     # The compiler can only warn and ignore the option if not recognized
    … …  
    1338113403   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1338213404   -e 's:$: $lt_compiler_flag:'`
    13383    (eval echo "\"\$as_me:13383: $lt_compile\"" >&5)
     13405   (eval echo "\"\$as_me:13405: $lt_compile\"" >&5)
    1338413406   (eval "$lt_compile" 2>out/conftest.err)
    1338513407   ac_status=$?
    1338613408   cat out/conftest.err >&5
    13387    echo "$as_me:13387: \$? = $ac_status" >&5
     13409   echo "$as_me:13409: \$? = $ac_status" >&5
    1338813410   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1338913411   then
    … …  
    1495114973   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1495214974   -e 's:$: $lt_compiler_flag:'`
    14953    (eval echo "\"\$as_me:14953: $lt_compile\"" >&5)
     14975   (eval echo "\"\$as_me:14975: $lt_compile\"" >&5)
    1495414976   (eval "$lt_compile" 2>conftest.err)
    1495514977   ac_status=$?
    1495614978   cat conftest.err >&5
    14957    echo "$as_me:14957: \$? = $ac_status" >&5
     14979   echo "$as_me:14979: \$? = $ac_status" >&5
    1495814980   if (exit $ac_status) && test -s "$ac_outfile"; then
    1495914981     # The compiler can only warn and ignore the option if not recognized
    … …  
    1505515077   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1505615078   -e 's:$: $lt_compiler_flag:'`
    15057    (eval echo "\"\$as_me:15057: $lt_compile\"" >&5)
     15079   (eval echo "\"\$as_me:15079: $lt_compile\"" >&5)
    1505815080   (eval "$lt_compile" 2>out/conftest.err)
    1505915081   ac_status=$?
    1506015082   cat out/conftest.err >&5
    15061    echo "$as_me:15061: \$? = $ac_status" >&5
     15083   echo "$as_me:15083: \$? = $ac_status" >&5
    1506215084   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1506315085   then
    … …  
    1726217284   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1726317285   -e 's:$: $lt_compiler_flag:'`
    17264    (eval echo "\"\$as_me:17264: $lt_compile\"" >&5)
     17286   (eval echo "\"\$as_me:17286: $lt_compile\"" >&5)
    1726517287   (eval "$lt_compile" 2>conftest.err)
    1726617288   ac_status=$?
    1726717289   cat conftest.err >&5
    17268    echo "$as_me:17268: \$? = $ac_status" >&5
     17290   echo "$as_me:17290: \$? = $ac_status" >&5
    1726917291   if (exit $ac_status) && test -s "$ac_outfile"; then
    1727017292     # The compiler can only warn and ignore the option if not recognized
    … …  
    1753017552   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1753117553   -e 's:$: $lt_compiler_flag:'`
    17532    (eval echo "\"\$as_me:17532: $lt_compile\"" >&5)
     17554   (eval echo "\"\$as_me:17554: $lt_compile\"" >&5)
    1753317555   (eval "$lt_compile" 2>conftest.err)
    1753417556   ac_status=$?
    1753517557   cat conftest.err >&5
    17536    echo "$as_me:17536: \$? = $ac_status" >&5
     17558   echo "$as_me:17558: \$? = $ac_status" >&5
    1753717559   if (exit $ac_status) && test -s "$ac_outfile"; then
    1753817560     # The compiler can only warn and ignore the option if not recognized
    … …  
    1763417656   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1763517657   -e 's:$: $lt_compiler_flag:'`
    17636    (eval echo "\"\$as_me:17636: $lt_compile\"" >&5)
     17658   (eval echo "\"\$as_me:17658: $lt_compile\"" >&5)
    1763717659   (eval "$lt_compile" 2>out/conftest.err)
    1763817660   ac_status=$?
    1763917661   cat out/conftest.err >&5
    17640    echo "$as_me:17640: \$? = $ac_status" >&5
     17662   echo "$as_me:17662: \$? = $ac_status" >&5
    1764117663   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1764217664   then
    … …  
    2053520557#END
    2053620558}
     20559
     20560if test "$GXX" = "yes" ; then
     20561case "$CXX" in
     20562   icpc* | */icpc* | icc )
     20563      ;;
     20564   *)
     20565      CXXFLAGS="$CXXFLAGS -Wno-long-long"
     20566      ;;
     20567esac
     20568fi
    2053720569
    2053820570#############################################################################

  • trunk/Clp/configure.ac

    r1670 r1688  
    5252# Initialize automake and libtool
    5353AC_COIN_INIT_AUTO_TOOLS
     54
     55if test "$GXX" = "yes" ; then
     56case "$CXX" in
     57   icpc* | */icpc* | icc )
     58      ;;
     59   *)
     60      CXXFLAGS="$CXXFLAGS -Wno-long-long"
     61      ;;
     62esac
     63fi
    5464
    5565#############################################################################

  • trunk/Clp/inc/config_clp.h.in

    r1603 r1688  
    66/* Version number of project */
    77#undef CLP_VERSION
     8
     9/* Major Version number of project */
     10#undef CLP_VERSION_MAJOR
     11
     12/* Minor Version number of project */
     13#undef CLP_VERSION_MINOR
     14
     15/* Release Version number of project */
     16#undef CLP_VERSION_RELEASE
    817
    918/* Define to the debug sanity check level (0 is no test) */
Note: See TracChangeset for help on using the changeset viewer.