Changeset 2412 for branches


Ignore:
Timestamp:
Nov 2, 2018 2:18:42 PM (8 months ago)
Author:
lou
Message:

Merge trunk 2389 -- 2410. Propagate BuildTools? changes.

Location:
branches/autotools-update/Cbc
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Cbc

  • branches/autotools-update/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcproj

    r1755 r2412  
    10061006                        </File>
    10071007                        <File
     1008                                RelativePath="..\..\..\..\Cbc\src\CbcHeuristicDW.cpp"
     1009                                >
     1010                        </File>
     1011                        <File
    10081012                                RelativePath="..\..\..\..\Cbc\src\CbcHeuristicFPump.cpp"
    10091013                                >
     
    17991803                        </File>
    18001804                        <File
     1805                                RelativePath="..\..\..\..\Cbc\src\CbcHeuristicDW.hpp"
     1806                                >
     1807                        </File>
     1808                        <File
    18011809                                RelativePath="..\..\..\..\Cbc\src\CbcHeuristicFPump.hpp"
    18021810                                >
  • branches/autotools-update/Cbc/Makefile.in

    r2390 r2412  
    218218AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
    219219AR = @AR@
     220AS = @AS@
    220221AUTOCONF = @AUTOCONF@
    221222AUTOHEADER = @AUTOHEADER@
  • branches/autotools-update/Cbc/config.guess

    r2390 r2412  
    11#! /bin/sh
    22# Attempt to guess a canonical system name.
    3 #   Copyright 1992-2015 Free Software Foundation, Inc.
    4 
    5 timestamp='2015-01-01'
     3#   Copyright 1992-2016 Free Software Foundation, Inc.
     4
     5timestamp='2016-10-02'
    66
    77# This file is free software; you can redistribute it and/or modify it
     
    2828#
    2929# You can get the latest version of this script from:
    30 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
     30# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
    3131#
    3232# Please send patches to <config-patches@gnu.org>.
     
    5151
    5252Originally written by Per Bothner.
    53 Copyright 1992-2015 Free Software Foundation, Inc.
     53Copyright 1992-2016 Free Software Foundation, Inc.
    5454
    5555This is free software; see the source for copying conditions.  There is NO
     
    169169        # portion of the name.  We always set it to "unknown".
    170170        sysctl="sysctl -n hw.machine_arch"
    171         UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
    172             /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
     171        UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
     172            /sbin/$sysctl 2>/dev/null || \
     173            /usr/sbin/$sysctl 2>/dev/null || \
     174            echo unknown)`
    173175        case "${UNAME_MACHINE_ARCH}" in
    174176            armeb) machine=armeb-unknown ;;
     
    177179            sh3eb) machine=sh-unknown ;;
    178180            sh5el) machine=sh5le-unknown ;;
     181            earmv*)
     182                arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
     183                endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
     184                machine=${arch}${endian}-unknown
     185                ;;
    179186            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
    180187        esac
    181188        # The Operating System including object format, if it has switched
    182         # to ELF recently, or will in the future.
     189        # to ELF recently (or will in the future) and ABI.
    183190        case "${UNAME_MACHINE_ARCH}" in
     191            earm*)
     192                os=netbsdelf
     193                ;;
    184194            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
    185195                eval $set_cc_for_build
     
    198208                ;;
    199209        esac
     210        # Determine ABI tags.
     211        case "${UNAME_MACHINE_ARCH}" in
     212            earm*)
     213                expr='s/^earmv[0-9]/-eabi/;s/eb$//'
     214                abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
     215                ;;
     216        esac
    200217        # The OS release
    201218        # Debian GNU/NetBSD machines have a different userland, and
     
    208225                ;;
    209226            *)
    210                 release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
     227                release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
    211228                ;;
    212229        esac
     
    214231        # contains redundant information, the shorter form:
    215232        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
    216         echo "${machine}-${os}${release}"
     233        echo "${machine}-${os}${release}${abi}"
    217234        exit ;;
    218235    *:Bitrig:*:*)
     
    224241        echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
    225242        exit ;;
     243    *:LibertyBSD:*:*)
     244        UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
     245        echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
     246        exit ;;
    226247    *:ekkoBSD:*:*)
    227248        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
     
    235256    *:MirBSD:*:*)
    236257        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
     258        exit ;;
     259    *:Sortix:*:*)
     260        echo ${UNAME_MACHINE}-unknown-sortix
    237261        exit ;;
    238262    alpha:OSF1:*:*)
     
    252276        case "$ALPHA_CPU_TYPE" in
    253277            "EV4 (21064)")
    254                 UNAME_MACHINE="alpha" ;;
     278                UNAME_MACHINE=alpha ;;
    255279            "EV4.5 (21064)")
    256                 UNAME_MACHINE="alpha" ;;
     280                UNAME_MACHINE=alpha ;;
    257281            "LCA4 (21066/21068)")
    258                 UNAME_MACHINE="alpha" ;;
     282                UNAME_MACHINE=alpha ;;
    259283            "EV5 (21164)")
    260                 UNAME_MACHINE="alphaev5" ;;
     284                UNAME_MACHINE=alphaev5 ;;
    261285            "EV5.6 (21164A)")
    262                 UNAME_MACHINE="alphaev56" ;;
     286                UNAME_MACHINE=alphaev56 ;;
    263287            "EV5.6 (21164PC)")
    264                 UNAME_MACHINE="alphapca56" ;;
     288                UNAME_MACHINE=alphapca56 ;;
    265289            "EV5.7 (21164PC)")
    266                 UNAME_MACHINE="alphapca57" ;;
     290                UNAME_MACHINE=alphapca57 ;;
    267291            "EV6 (21264)")
    268                 UNAME_MACHINE="alphaev6" ;;
     292                UNAME_MACHINE=alphaev6 ;;
    269293            "EV6.7 (21264A)")
    270                 UNAME_MACHINE="alphaev67" ;;
     294                UNAME_MACHINE=alphaev67 ;;
    271295            "EV6.8CB (21264C)")
    272                 UNAME_MACHINE="alphaev68" ;;
     296                UNAME_MACHINE=alphaev68 ;;
    273297            "EV6.8AL (21264B)")
    274                 UNAME_MACHINE="alphaev68" ;;
     298                UNAME_MACHINE=alphaev68 ;;
    275299            "EV6.8CX (21264D)")
    276                 UNAME_MACHINE="alphaev68" ;;
     300                UNAME_MACHINE=alphaev68 ;;
    277301            "EV6.9A (21264/EV69A)")
    278                 UNAME_MACHINE="alphaev69" ;;
     302                UNAME_MACHINE=alphaev69 ;;
    279303            "EV7 (21364)")
    280                 UNAME_MACHINE="alphaev7" ;;
     304                UNAME_MACHINE=alphaev7 ;;
    281305            "EV7.9 (21364A)")
    282                 UNAME_MACHINE="alphaev79" ;;
     306                UNAME_MACHINE=alphaev79 ;;
    283307        esac
    284308        # A Pn.n version is a patched version.
     
    287311        # A Xn.n version is an unreleased experimental baselevel.
    288312        # 1.2 uses "1.2" for uname -r.
    289         echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
     313        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
    290314        # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
    291315        exitcode=$?
     
    360384    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
    361385        eval $set_cc_for_build
    362         SUN_ARCH="i386"
     386        SUN_ARCH=i386
    363387        # If there is a compiler, see if it is configured for 64-bit objects.
    364388        # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
    365389        # This test works for both compilers.
    366         if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
     390        if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
    367391            if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
    368                 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
     392                (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
    369393                grep IS_64BIT_ARCH >/dev/null
    370394            then
    371                 SUN_ARCH="x86_64"
     395                SUN_ARCH=x86_64
    372396            fi
    373397        fi
     
    394418    sun*:*:4.2BSD:*)
    395419        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
    396         test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
     420        test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
    397421        case "`/bin/arch`" in
    398422            sun3)
     
    619643                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
    620644                    case "${sc_cpu_version}" in
    621                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
    622                       528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
     645                      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
     646                      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
    623647                      532)                      # CPU_PA_RISC2_0
    624648                        case "${sc_kernel_bits}" in
    625                           32) HP_ARCH="hppa2.0n" ;;
    626                           64) HP_ARCH="hppa2.0w" ;;
    627                           '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
     649                          32) HP_ARCH=hppa2.0n ;;
     650                          64) HP_ARCH=hppa2.0w ;;
     651                          '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
    628652                        esac ;;
    629653                    esac
     
    664688                }
    665689EOF
    666                     (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
     690                    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
    667691                    test -z "$HP_ARCH" && HP_ARCH=hppa
    668692                fi ;;
    669693        esac
    670         if [ ${HP_ARCH} = "hppa2.0w" ]
     694        if [ ${HP_ARCH} = hppa2.0w ]
    671695        then
    672696            eval $set_cc_for_build
     
    681705            # => hppa64-hp-hpux11.23
    682706
    683             if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
     707            if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
    684708                grep -q __LP64__
    685709            then
    686                 HP_ARCH="hppa2.0w"
     710                HP_ARCH=hppa2.0w
    687711            else
    688                 HP_ARCH="hppa64"
     712                HP_ARCH=hppa64
    689713            fi
    690714        fi
     
    791815        exit ;;
    792816    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
    793         FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    794         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
     817        FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
     818        FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
    795819        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
    796820        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    797821        exit ;;
    798822    5000:UNIX_System_V:4.*:*)
    799         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
    800         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
     823        FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
     824        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
    801825        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    802826        exit ;;
     
    880904    *:GNU/*:*:*)
    881905        # other systems with GNU libc and userland
    882         echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
     906        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
    883907        exit ;;
    884908    i*86:Minix:*:*)
     
    903927        esac
    904928        objdump --private-headers /bin/sh | grep -q ld.so.1
    905         if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
     929        if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
    906930        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    907931        exit ;;
     
    934958        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
    935959        exit ;;
     960    e2k:Linux:*:*)
     961        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
     962        exit ;;
    936963    frv:Linux:*:*)
    937964        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
     
    944971        exit ;;
    945972    ia64:Linux:*:*)
     973        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
     974        exit ;;
     975    k1om:Linux:*:*)
    946976        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    947977        exit ;;
     
    9711001        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
    9721002        ;;
     1003    mips64el:Linux:*:*)
     1004        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
     1005        exit ;;
    9731006    openrisc*:Linux:*:*)
    9741007        echo or1k-unknown-linux-${LIBC}
     
    10031036        echo powerpcle-unknown-linux-${LIBC}
    10041037        exit ;;
     1038    riscv32:Linux:*:* | riscv64:Linux:*:*)
     1039        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
     1040        exit ;;
    10051041    s390:Linux:*:* | s390x:Linux:*:*)
    10061042        echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
     
    10221058        exit ;;
    10231059    x86_64:Linux:*:*)
    1024         echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
     1060        echo ${UNAME_MACHINE}-pc-linux-${LIBC}
    10251061        exit ;;
    10261062    xtensa*:Linux:*:*)
     
    11011137        # the processor, so we play safe by assuming i586.
    11021138        # Note: whatever this is, it MUST be the same as what config.sub
    1103         # prints for the "djgpp" host, or else GDB configury will decide that
     1139        # prints for the "djgpp" host, or else GDB configure will decide that
    11041140        # this is a cross-build.
    11051141        echo i586-pc-msdosdjgpp
     
    12501286        echo sx8r-nec-superux${UNAME_RELEASE}
    12511287        exit ;;
     1288    SX-ACE:SUPER-UX:*:*)
     1289        echo sxace-nec-superux${UNAME_RELEASE}
     1290        exit ;;
    12521291    Power*:Rhapsody:*:*)
    12531292        echo powerpc-apple-rhapsody${UNAME_RELEASE}
     
    12631302        fi
    12641303        if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
    1265             if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
     1304            if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
    12661305                if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
    1267                     (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
     1306                    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
    12681307                    grep IS_64BIT_ARCH >/dev/null
    12691308                then
     
    12871326    *:procnto*:*:* | *:QNX:[0123456789]*:*)
    12881327        UNAME_PROCESSOR=`uname -p`
    1289         if test "$UNAME_PROCESSOR" = "x86"; then
     1328        if test "$UNAME_PROCESSOR" = x86; then
    12901329                UNAME_PROCESSOR=i386
    12911330                UNAME_MACHINE=pc
     
    13181357        # is converted to i386 for consistency with other x86
    13191358        # operating systems.
    1320         if test "$cputype" = "386"; then
     1359        if test "$cputype" = 386; then
    13211360            UNAME_MACHINE=i386
    13221361        else
     
    13601399        exit ;;
    13611400    i*86:skyos:*:*)
    1362         echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
     1401        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
    13631402        exit ;;
    13641403    i*86:rdos:*:*)
     
    13711410        echo ${UNAME_MACHINE}-unknown-esx
    13721411        exit ;;
     1412    amd64:Isilon\ OneFS:*:*)
     1413        echo x86_64-unknown-onefs
     1414        exit ;;
    13731415esac
    13741416
     
    13761418$0: unable to guess system type
    13771419
    1378 This script, last modified $timestamp, has failed to recognize
    1379 the operating system you are using. It is advised that you
    1380 download the most up to date version of the config scripts from
    1381 
    1382   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
     1420This script (version $timestamp), has failed to recognize the
     1421operating system you are using. If your script is old, overwrite
     1422config.guess and config.sub with the latest versions from:
     1423
     1424  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
    13831425and
    1384   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
    1385 
    1386 If the version you run ($0) is already up to date, please
    1387 send the following data and any information you think might be
    1388 pertinent to <config-patches@gnu.org> in order to provide the needed
    1389 information to handle your system.
     1426  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
     1427
     1428If $0 has already been updated, send the following data and any
     1429information you think might be pertinent to config-patches@gnu.org to
     1430provide the necessary information to handle your system.
    13901431
    13911432config.guess timestamp = $timestamp
  • branches/autotools-update/Cbc/config.sub

    r2390 r2412  
    11#! /bin/sh
    22# Configuration validation subroutine script.
    3 #   Copyright 1992-2015 Free Software Foundation, Inc.
    4 
    5 timestamp='2015-01-01'
     3#   Copyright 1992-2016 Free Software Foundation, Inc.
     4
     5timestamp='2016-09-05'
    66
    77# This file is free software; you can redistribute it and/or modify it
     
    3434
    3535# You can get the latest version of this script from:
    36 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
     36# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
    3737
    3838# This file is supposed to be the same for all GNU packages
     
    5454
    5555usage="\
    56 Usage: $0 [OPTION] CPU-MFR-OPSYS
    57        $0 [OPTION] ALIAS
     56Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
    5857
    5958Canonicalize a configuration name.
     
    6968GNU config.sub ($timestamp)
    7069
    71 Copyright 1992-2015 Free Software Foundation, Inc.
     70Copyright 1992-2016 Free Software Foundation, Inc.
    7271
    7372This is free software; see the source for copying conditions.  There is NO
     
    118117  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
    119118  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
    120   knetbsd*-gnu* | netbsd*-gnu* | \
    121   kopensolaris*-gnu* | \
     119  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
     120  kopensolaris*-gnu* | cloudabi*-eabi* | \
    122121  storm-chaos* | os2-emx* | rtmk-nova*)
    123122    os=-$maybe_os
     
    256255        | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
    257256        | avr | avr32 \
     257        | ba \
    258258        | be32 | be64 \
    259259        | bfin \
    260260        | c4x | c8051 | clipper \
    261261        | d10v | d30v | dlx | dsp16xx \
    262         | epiphany \
     262        | e2k | epiphany \
    263263        | fido | fr30 | frv | ft32 \
    264264        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
     
    306306        | rl78 | rx \
    307307        | score \
    308         | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
     308        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
    309309        | sh64 | sh64le \
    310310        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
     
    377377        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
    378378        | avr-* | avr32-* \
     379        | ba-* \
    379380        | be32-* | be64-* \
    380381        | bfin-* | bs2000-* \
     
    382383        | c8051-* | clipper-* | craynv-* | cydra-* \
    383384        | d10v-* | d30v-* | dlx-* \
    384         | elxsi-* \
     385        | e2k-* | elxsi-* \
    385386        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
    386387        | h8300-* | h8500-* \
     
    429430        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
    430431        | pyramid-* \
     432        | riscv32-* | riscv64-* \
    431433        | rl78-* | romp-* | rs6000-* | rx-* \
    432434        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
     
    434436        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
    435437        | sparclite-* \
    436         | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
     438        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
    437439        | tahoe-* \
    438440        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
     
    519521                os=-aros
    520522                ;;
     523        asmjs)
     524                basic_machine=asmjs-unknown
     525                ;;
    521526        aux)
    522527                basic_machine=m68k-apple
     
    638643                basic_machine=m68k-bull
    639644                os=-sysv3
     645                ;;
     646        e500v[12])
     647                basic_machine=powerpc-unknown
     648                os=$os"spe"
     649                ;;
     650        e500v[12]-*)
     651                basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
     652                os=$os"spe"
    640653                ;;
    641654        ebmon29k)
     
    10181031                basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
    10191032                ;;
    1020         ppcle | powerpclittle | ppc-le | powerpc-little)
     1033        ppcle | powerpclittle)
    10211034                basic_machine=powerpcle-unknown
    10221035                ;;
     
    10281041        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
    10291042                ;;
    1030         ppc64le | powerpc64little | ppc64-le | powerpc64-little)
     1043        ppc64le | powerpc64little)
    10311044                basic_machine=powerpc64le-unknown
    10321045                ;;
     
    13741387              | -sym* | -kopensolaris* | -plan9* \
    13751388              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
    1376               | -aos* | -aros* \
     1389              | -aos* | -aros* | -cloudabi* | -sortix* \
    13771390              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
    13781391              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
    13791392              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
    1380               | -bitrig* | -openbsd* | -solidbsd* \
     1393              | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
    13811394              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
    13821395              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
     
    13851398              | -chorusos* | -chorusrdb* | -cegcc* \
    13861399              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
    1387               | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
     1400              | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
    13881401              | -linux-newlib* | -linux-musl* | -linux-uclibc* \
    13891402              | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
     
    13941407              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
    13951408              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
    1396               | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
     1409              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
     1410              | -onefs* | -tirtos* | -phoenix*)
    13971411        # Remember, each alternative MUST END IN *, to match a version number.
    13981412                ;;
     
    15261540        -nacl*)
    15271541                ;;
     1542        -ios)
     1543                ;;
    15281544        -none)
    15291545                ;;
  • branches/autotools-update/Cbc/configure

    r2395 r2412  
    765765ac_ct_AR
    766766AR
    767 DLLTOOL
    768 OBJDUMP
    769767LN_S
    770768NM
     
    777775SED
    778776LIBTOOL
     777OBJDUMP
     778DLLTOOL
     779AS
    779780COIN_CXX_IS_CL_FALSE
    780781COIN_CXX_IS_CL_TRUE
     
    889890enable_maintainer_mode
    890891enable_dependency_tracking
    891 enable_shared
    892892enable_static
    893893with_pic
     894enable_shared
    894895enable_fast_install
    895896with_aix_soname
     
    16041605  --disable-dependency-tracking
    16051606                          speeds up one-time build
     1607  --enable-static[=PKGS]  build static libraries [default=no]
    16061608  --enable-shared[=PKGS]  build shared libraries [default=yes]
    1607   --enable-static[=PKGS]  build static libraries [default=yes]
    16081609  --enable-fast-install[=PKGS]
    16091610                          optimize for fast installation [default=yes]
     
    34343435
    34353436
    3436 # libtool has some magic for host_os=mingw, but doesn't know about msys
     3437# libtool has some magic for host_os and build_os being mingw, but doesn't know about msys
    34373438
    34383439  if test $host_os = msys ; then
    34393440    host_os=mingw
    34403441    host=`echo $host | sed -e 's/msys/mingw/'`
     3442  fi
     3443
     3444  if test $build_os = msys ; then
     3445    build_os=mingw
     3446    build=`echo $build | sed -e 's/msys/mingw/'`
    34413447  fi
    34423448
     
    60966102
    60976103
    6098 
    6099 
    6100 
    61016104{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
    61026105$as_echo_n "checking how to recognize dependent libraries... " >&6; }
     
    64346437
    64356438test -z "$DLLTOOL" && DLLTOOL=dlltool
    6436 
    6437 
    6438 
    64396439
    64406440
     
    86938693
    86948694
    8695 # On Windows, shared C++ libraries do not work with the current libtool (it
    8696 # handles only exports for C functions, not C++). On all other systems, build
    8697 # only shared libraries.
    8698 
    86998695# (lh, 180302) Sadly, we can't use the obvious libtool macros
    87008696# (AC_{ENABLE,DISABLE}_{SHARED,STATIC}, nor parameters to LT_INIT,
     
    87048700# something more inventive. The relevant libtool macros are in ltoptions.m4,
    87058701# _LT_ENABLE_SHARED and _LT_ENABLE_STATIC.
    8706 
     8702# That is, something like the following will not work:
    87078703# case $host_os in
    8708 #   cygwin* | mingw* | msys* )
    8709 #     AC_DISABLE_SHARED
    8710 #     ;;
    8711 #   *)
    8712 #     AC_DISABLE_STATIC
    8713 #     ;;
     8704#   cygwin* | mingw* | msys* ) AC_DISABLE_SHARED  ;;
     8705#   *) AC_DISABLE_STATIC ;;
    87148706# esac
    87158707
     
    87218713
    87228714# Set options
     8715# Check whether --enable-static was given.
     8716if test "${enable_static+set}" = set; then :
     8717  enableval=$enable_static; p=${PACKAGE-default}
     8718    case $enableval in
     8719    yes) enable_static=yes ;;
     8720    no) enable_static=no ;;
     8721    *)
     8722     enable_static=no
     8723      # Look at the argument we got.  We use all the common list separators.
     8724      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
     8725      for pkg in $enableval; do
     8726        IFS=$lt_save_ifs
     8727        if test "X$pkg" = "X$p"; then
     8728          enable_static=yes
     8729        fi
     8730      done
     8731      IFS=$lt_save_ifs
     8732      ;;
     8733    esac
     8734else
     8735  enable_static=no
     8736fi
     8737
     8738
     8739
     8740
     8741
     8742
     8743
     8744
     8745# Check whether --with-pic was given.
     8746if test "${with_pic+set}" = set; then :
     8747  withval=$with_pic; lt_p=${PACKAGE-default}
     8748    case $withval in
     8749    yes|no) pic_mode=$withval ;;
     8750    *)
     8751      pic_mode=default
     8752      # Look at the argument we got.  We use all the common list separators.
     8753      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
     8754      for lt_pkg in $withval; do
     8755        IFS=$lt_save_ifs
     8756        if test "X$lt_pkg" = "X$lt_p"; then
     8757          pic_mode=yes
     8758        fi
     8759      done
     8760      IFS=$lt_save_ifs
     8761      ;;
     8762    esac
     8763else
     8764  pic_mode=yes
     8765fi
     8766
     8767
     8768
     8769
     8770
     8771
     8772enable_win32_dll=yes
     8773
     8774case $host in
     8775*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
     8776  if test -n "$ac_tool_prefix"; then
     8777  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
     8778set dummy ${ac_tool_prefix}as; ac_word=$2
     8779{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8780$as_echo_n "checking for $ac_word... " >&6; }
     8781if ${ac_cv_prog_AS+:} false; then :
     8782  $as_echo_n "(cached) " >&6
     8783else
     8784  if test -n "$AS"; then
     8785  ac_cv_prog_AS="$AS" # Let the user override the test.
     8786else
     8787as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8788for as_dir in $PATH
     8789do
     8790  IFS=$as_save_IFS
     8791  test -z "$as_dir" && as_dir=.
     8792    for ac_exec_ext in '' $ac_executable_extensions; do
     8793  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8794    ac_cv_prog_AS="${ac_tool_prefix}as"
     8795    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8796    break 2
     8797  fi
     8798done
     8799  done
     8800IFS=$as_save_IFS
     8801
     8802fi
     8803fi
     8804AS=$ac_cv_prog_AS
     8805if test -n "$AS"; then
     8806  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
     8807$as_echo "$AS" >&6; }
     8808else
     8809  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8810$as_echo "no" >&6; }
     8811fi
     8812
     8813
     8814fi
     8815if test -z "$ac_cv_prog_AS"; then
     8816  ac_ct_AS=$AS
     8817  # Extract the first word of "as", so it can be a program name with args.
     8818set dummy as; ac_word=$2
     8819{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8820$as_echo_n "checking for $ac_word... " >&6; }
     8821if ${ac_cv_prog_ac_ct_AS+:} false; then :
     8822  $as_echo_n "(cached) " >&6
     8823else
     8824  if test -n "$ac_ct_AS"; then
     8825  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
     8826else
     8827as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8828for as_dir in $PATH
     8829do
     8830  IFS=$as_save_IFS
     8831  test -z "$as_dir" && as_dir=.
     8832    for ac_exec_ext in '' $ac_executable_extensions; do
     8833  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8834    ac_cv_prog_ac_ct_AS="as"
     8835    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8836    break 2
     8837  fi
     8838done
     8839  done
     8840IFS=$as_save_IFS
     8841
     8842fi
     8843fi
     8844ac_ct_AS=$ac_cv_prog_ac_ct_AS
     8845if test -n "$ac_ct_AS"; then
     8846  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
     8847$as_echo "$ac_ct_AS" >&6; }
     8848else
     8849  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8850$as_echo "no" >&6; }
     8851fi
     8852
     8853  if test "x$ac_ct_AS" = x; then
     8854    AS="false"
     8855  else
     8856    case $cross_compiling:$ac_tool_warned in
     8857yes:)
     8858{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     8859$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     8860ac_tool_warned=yes ;;
     8861esac
     8862    AS=$ac_ct_AS
     8863  fi
     8864else
     8865  AS="$ac_cv_prog_AS"
     8866fi
     8867
     8868  if test -n "$ac_tool_prefix"; then
     8869  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
     8870set dummy ${ac_tool_prefix}dlltool; ac_word=$2
     8871{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8872$as_echo_n "checking for $ac_word... " >&6; }
     8873if ${ac_cv_prog_DLLTOOL+:} false; then :
     8874  $as_echo_n "(cached) " >&6
     8875else
     8876  if test -n "$DLLTOOL"; then
     8877  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
     8878else
     8879as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8880for as_dir in $PATH
     8881do
     8882  IFS=$as_save_IFS
     8883  test -z "$as_dir" && as_dir=.
     8884    for ac_exec_ext in '' $ac_executable_extensions; do
     8885  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8886    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     8887    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8888    break 2
     8889  fi
     8890done
     8891  done
     8892IFS=$as_save_IFS
     8893
     8894fi
     8895fi
     8896DLLTOOL=$ac_cv_prog_DLLTOOL
     8897if test -n "$DLLTOOL"; then
     8898  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
     8899$as_echo "$DLLTOOL" >&6; }
     8900else
     8901  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8902$as_echo "no" >&6; }
     8903fi
     8904
     8905
     8906fi
     8907if test -z "$ac_cv_prog_DLLTOOL"; then
     8908  ac_ct_DLLTOOL=$DLLTOOL
     8909  # Extract the first word of "dlltool", so it can be a program name with args.
     8910set dummy dlltool; ac_word=$2
     8911{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8912$as_echo_n "checking for $ac_word... " >&6; }
     8913if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
     8914  $as_echo_n "(cached) " >&6
     8915else
     8916  if test -n "$ac_ct_DLLTOOL"; then
     8917  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
     8918else
     8919as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8920for as_dir in $PATH
     8921do
     8922  IFS=$as_save_IFS
     8923  test -z "$as_dir" && as_dir=.
     8924    for ac_exec_ext in '' $ac_executable_extensions; do
     8925  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8926    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     8927    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8928    break 2
     8929  fi
     8930done
     8931  done
     8932IFS=$as_save_IFS
     8933
     8934fi
     8935fi
     8936ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
     8937if test -n "$ac_ct_DLLTOOL"; then
     8938  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
     8939$as_echo "$ac_ct_DLLTOOL" >&6; }
     8940else
     8941  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8942$as_echo "no" >&6; }
     8943fi
     8944
     8945  if test "x$ac_ct_DLLTOOL" = x; then
     8946    DLLTOOL="false"
     8947  else
     8948    case $cross_compiling:$ac_tool_warned in
     8949yes:)
     8950{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     8951$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     8952ac_tool_warned=yes ;;
     8953esac
     8954    DLLTOOL=$ac_ct_DLLTOOL
     8955  fi
     8956else
     8957  DLLTOOL="$ac_cv_prog_DLLTOOL"
     8958fi
     8959
     8960  if test -n "$ac_tool_prefix"; then
     8961  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
     8962set dummy ${ac_tool_prefix}objdump; ac_word=$2
     8963{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8964$as_echo_n "checking for $ac_word... " >&6; }
     8965if ${ac_cv_prog_OBJDUMP+:} false; then :
     8966  $as_echo_n "(cached) " >&6
     8967else
     8968  if test -n "$OBJDUMP"; then
     8969  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
     8970else
     8971as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8972for as_dir in $PATH
     8973do
     8974  IFS=$as_save_IFS
     8975  test -z "$as_dir" && as_dir=.
     8976    for ac_exec_ext in '' $ac_executable_extensions; do
     8977  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8978    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     8979    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8980    break 2
     8981  fi
     8982done
     8983  done
     8984IFS=$as_save_IFS
     8985
     8986fi
     8987fi
     8988OBJDUMP=$ac_cv_prog_OBJDUMP
     8989if test -n "$OBJDUMP"; then
     8990  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
     8991$as_echo "$OBJDUMP" >&6; }
     8992else
     8993  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8994$as_echo "no" >&6; }
     8995fi
     8996
     8997
     8998fi
     8999if test -z "$ac_cv_prog_OBJDUMP"; then
     9000  ac_ct_OBJDUMP=$OBJDUMP
     9001  # Extract the first word of "objdump", so it can be a program name with args.
     9002set dummy objdump; ac_word=$2
     9003{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     9004$as_echo_n "checking for $ac_word... " >&6; }
     9005if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
     9006  $as_echo_n "(cached) " >&6
     9007else
     9008  if test -n "$ac_ct_OBJDUMP"; then
     9009  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
     9010else
     9011as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     9012for as_dir in $PATH
     9013do
     9014  IFS=$as_save_IFS
     9015  test -z "$as_dir" && as_dir=.
     9016    for ac_exec_ext in '' $ac_executable_extensions; do
     9017  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     9018    ac_cv_prog_ac_ct_OBJDUMP="objdump"
     9019    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     9020    break 2
     9021  fi
     9022done
     9023  done
     9024IFS=$as_save_IFS
     9025
     9026fi
     9027fi
     9028ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
     9029if test -n "$ac_ct_OBJDUMP"; then
     9030  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
     9031$as_echo "$ac_ct_OBJDUMP" >&6; }
     9032else
     9033  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     9034$as_echo "no" >&6; }
     9035fi
     9036
     9037  if test "x$ac_ct_OBJDUMP" = x; then
     9038    OBJDUMP="false"
     9039  else
     9040    case $cross_compiling:$ac_tool_warned in
     9041yes:)
     9042{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     9043$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     9044ac_tool_warned=yes ;;
     9045esac
     9046    OBJDUMP=$ac_ct_OBJDUMP
     9047  fi
     9048else
     9049  OBJDUMP="$ac_cv_prog_OBJDUMP"
     9050fi
     9051
     9052  ;;
     9053esac
     9054
     9055test -z "$AS" && AS=as
     9056
     9057
     9058
     9059
     9060
     9061test -z "$DLLTOOL" && DLLTOOL=dlltool
     9062
     9063
     9064
     9065
     9066
     9067test -z "$OBJDUMP" && OBJDUMP=objdump
     9068
     9069
     9070
     9071
    87239072
    87249073
     
    87269075        enable_dlopen=no
    87279076
    8728 
    8729   enable_win32_dll=no
    87309077
    87319078
     
    87559102
    87569103
    8757 
    8758 
    8759 
    8760 
    8761 
    8762 
    8763   # Check whether --enable-static was given.
    8764 if test "${enable_static+set}" = set; then :
    8765   enableval=$enable_static; p=${PACKAGE-default}
    8766     case $enableval in
    8767     yes) enable_static=yes ;;
    8768     no) enable_static=no ;;
    8769     *)
    8770      enable_static=no
    8771       # Look at the argument we got.  We use all the common list separators.
    8772       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
    8773       for pkg in $enableval; do
    8774         IFS=$lt_save_ifs
    8775         if test "X$pkg" = "X$p"; then
    8776           enable_static=yes
    8777         fi
    8778       done
    8779       IFS=$lt_save_ifs
    8780       ;;
    8781     esac
    8782 else
    8783   enable_static=yes
    8784 fi
    8785 
    8786 
    8787 
    8788 
    8789 
    8790 
    8791 
    8792 
    8793 
    8794 
    8795 # Check whether --with-pic was given.
    8796 if test "${with_pic+set}" = set; then :
    8797   withval=$with_pic; lt_p=${PACKAGE-default}
    8798     case $withval in
    8799     yes|no) pic_mode=$withval ;;
    8800     *)
    8801       pic_mode=default
    8802       # Look at the argument we got.  We use all the common list separators.
    8803       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
    8804       for lt_pkg in $withval; do
    8805         IFS=$lt_save_ifs
    8806         if test "X$lt_pkg" = "X$lt_p"; then
    8807           pic_mode=yes
    8808         fi
    8809       done
    8810       IFS=$lt_save_ifs
    8811       ;;
    8812     esac
    8813 else
    8814   pic_mode=default
    8815 fi
    88169104
    88179105
     
    1198512273  hardcode_into_libs=yes
    1198612274
     12275  # Add ABI-specific directories to the system library path.
     12276  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
     12277
    1198712278  # Ideally, we could use ldconfig to report *all* directores which are
    1198812279  # searched for libraries, however this is still not possible.  Aside from not
     
    1199312284  if test -f /etc/ld.so.conf; then
    1199412285    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[       ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
    11995     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
     12286    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
    1199612287  fi
    1199712288
     
    1594716238  hardcode_into_libs=yes
    1594816239
     16240  # Add ABI-specific directories to the system library path.
     16241  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
     16242
    1594916243  # Ideally, we could use ldconfig to report *all* directores which are
    1595016244  # searched for libraries, however this is still not possible.  Aside from not
     
    1595516249  if test -f /etc/ld.so.conf; then
    1595616250    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[       ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
    15957     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
     16251    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
    1595816252  fi
    1595916253
     
    1634316637  fi
    1634416638
    16345   #TODO we should be able to add this flag
    16346   #LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
     16639  # shared libraries should have no undefined symbols
     16640  # for Windows DLLs, it is mandatory to add this
     16641  LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
    1634716642
    1634816643
     
    1677517070      COINUTILS_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    1677617071      coin_has_coinutils=yes
    16777            coinutils_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     17072           coinutils_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    1677817073           coinutils_pcfiles="$pcfile"
    1677917074    else
     
    1680317098# from pkgconfig. Note that we haven't run a useability test!
    1680417099
    16805 # Change the test to enable / disable debugging output
    16806 
    16807     if test 1 = 1 ; then
     17100# Define BUILDTOOLS_DEBUG to enable debugging output
     17101
     17102    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1680817103      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for coinutils: \"$coin_has_coinutils\"" >&5
    1680917104$as_echo "$as_me: FIND_PRIM_PKG result for coinutils: \"$coin_has_coinutils\"" >&6;}
     
    1704217337      OSI_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    1704317338      coin_has_osi=yes
    17044            osi_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     17339           osi_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    1704517340           osi_pcfiles="$pcfile"
    1704617341    else
     
    1707017365# from pkgconfig. Note that we haven't run a useability test!
    1707117366
    17072 # Change the test to enable / disable debugging output
    17073 
    17074     if test 1 = 1 ; then
     17367# Define BUILDTOOLS_DEBUG to enable debugging output
     17368
     17369    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1707517370      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for osi: \"$coin_has_osi\"" >&5
    1707617371$as_echo "$as_me: FIND_PRIM_PKG result for osi: \"$coin_has_osi\"" >&6;}
     
    1730917604      CGL_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    1731017605      coin_has_cgl=yes
    17311            cgl_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     17606           cgl_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    1731217607           cgl_pcfiles="$pcfile"
    1731317608    else
     
    1733717632# from pkgconfig. Note that we haven't run a useability test!
    1733817633
    17339 # Change the test to enable / disable debugging output
    17340 
    17341     if test 1 = 1 ; then
     17634# Define BUILDTOOLS_DEBUG to enable debugging output
     17635
     17636    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1734217637      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for cgl: \"$coin_has_cgl\"" >&5
    1734317638$as_echo "$as_me: FIND_PRIM_PKG result for cgl: \"$coin_has_cgl\"" >&6;}
     
    1757617871      CLP_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    1757717872      coin_has_clp=yes
    17578            clp_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     17873           clp_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    1757917874           clp_pcfiles="$pcfile"
    1758017875    else
     
    1760417899# from pkgconfig. Note that we haven't run a useability test!
    1760517900
    17606 # Change the test to enable / disable debugging output
    17607 
    17608     if test 1 = 1 ; then
     17901# Define BUILDTOOLS_DEBUG to enable debugging output
     17902
     17903    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1760917904      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for clp: \"$coin_has_clp\"" >&5
    1761017905$as_echo "$as_me: FIND_PRIM_PKG result for clp: \"$coin_has_clp\"" >&6;}
     
    1783318128    requested | build )
    1783418129      if test -n "$PKG_CONFIG" ; then
    17835         pcfile=osi-clp
     18130        pcfile="osi-clp"
    1783618131
    1783718132
     
    1784118136      OSICLP_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    1784218137      coin_has_osiclp=yes
    17843            osiclp_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     18138           osiclp_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    1784418139           osiclp_pcfiles="$pcfile"
    1784518140    else
     
    1786918164# from pkgconfig. Note that we haven't run a useability test!
    1787018165
    17871 # Change the test to enable / disable debugging output
    17872 
    17873     if test 1 = 1 ; then
     18166# Define BUILDTOOLS_DEBUG to enable debugging output
     18167
     18168    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1787418169      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for osiclp: \"$coin_has_osiclp\"" >&5
    1787518170$as_echo "$as_me: FIND_PRIM_PKG result for osiclp: \"$coin_has_osiclp\"" >&6;}
     
    1825818553    requested | build )
    1825918554      if test -n "$PKG_CONFIG" ; then
    18260         pcfile=coinasl
     18555        pcfile="coinasl"
    1826118556
    1826218557
     
    1826618561      ASL_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    1826718562      coin_has_asl=yes
    18268            asl_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     18563           asl_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    1826918564           asl_pcfiles="$pcfile"
    1827018565    else
     
    1829418589# from pkgconfig. Note that we haven't run a useability test!
    1829518590
    18296 # Change the test to enable / disable debugging output
    18297 
    18298     if test 1 = 1 ; then
     18591# Define BUILDTOOLS_DEBUG to enable debugging output
     18592
     18593    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1829918594      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for asl: \"$coin_has_asl\"" >&5
    1830018595$as_echo "$as_me: FIND_PRIM_PKG result for asl: \"$coin_has_asl\"" >&6;}
     
    1856518860# check was performed. Skipping means the user said `don't use.'
    1856618861
    18567 # Change the test to enable / disable debugging output
    18568 
    18569     if test 1 = 1 ; then
     18862# Define BUILDTOOLS_DEBUG to enable debugging output
     18863
     18864    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1857018865      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_LIB result for nauty: \"$coin_has_nauty\"" >&5
    1857118866$as_echo "$as_me: FIND_PRIM_LIB result for nauty: \"$coin_has_nauty\"" >&6;}
     
    1863218927
    1863318928
    18634    if test 1 = 1 ; then
     18929   if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1863518930        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for CbcLib:" >&5
    1863618931$as_echo "$as_me: FINALIZE_FLAGS for CbcLib:" >&6;}
     
    1864718942      fi
    1864818943
    18649 # Change the test to enable / disable debugging output
    18650 
    18651       if test 1 = 1 ; then
     18944      # setup XYZ_EXPORT symbol for library users
     18945      libexport_attribute=
     18946      if test "$enable_shared" = yes ; then
     18947        # TODO better check for this? we essentially want to know whether we're building DLLs
     18948        # or do we also need this for GCC on Windows?
     18949        case $CC in */compile\ cl | cl | */cl | */compile\ icl | icl | */icl )
     18950          libexport_attribute="__declspec(dllimport)"
     18951        esac
     18952      fi
     18953
     18954cat >>confdefs.h <<_ACEOF
     18955#define CBCLIB_EXPORT $libexport_attribute
     18956_ACEOF
     18957
     18958
     18959# Define BUILDTOOLS_DEBUG to enable debugging output
     18960
     18961      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1865218962        { $as_echo "$as_me:${as_lineno-$LINENO}: CBCLIB_LFLAGS_NOPC: \"${CBCLIB_LFLAGS_NOPC}\"" >&5
    1865318963$as_echo "$as_me: CBCLIB_LFLAGS_NOPC: \"${CBCLIB_LFLAGS_NOPC}\"" >&6;}
     
    1867818988       OSICBCLIB_CFLAGS="$OSICBCLIB_CFLAGS $CBCLIB_CFLAGS"
    1867918989
    18680 # Change the test to enable / disable debugging output
    18681 
    18682        if test 1 = 1 ; then
     18990# Define BUILDTOOLS_DEBUG to enable debugging output
     18991
     18992       if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1868318993         { $as_echo "$as_me:${as_lineno-$LINENO}: CHK_HERE adding CbcLib to OsiCbcLib:" >&5
    1868418994$as_echo "$as_me: CHK_HERE adding CbcLib to OsiCbcLib:" >&6;}
     
    1869419004
    1869519005
    18696    if test 1 = 1 ; then
     19006   if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1869719007        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for OsiCbcLib:" >&5
    1869819008$as_echo "$as_me: FINALIZE_FLAGS for OsiCbcLib:" >&6;}
     
    1870919019      fi
    1871019020
    18711 # Change the test to enable / disable debugging output
    18712 
    18713       if test 1 = 1 ; then
     19021      # setup XYZ_EXPORT symbol for library users
     19022      libexport_attribute=
     19023      if test "$enable_shared" = yes ; then
     19024        # TODO better check for this? we essentially want to know whether we're building DLLs
     19025        # or do we also need this for GCC on Windows?
     19026        case $CC in */compile\ cl | cl | */cl | */compile\ icl | icl | */icl )
     19027          libexport_attribute="__declspec(dllimport)"
     19028        esac
     19029      fi
     19030
     19031cat >>confdefs.h <<_ACEOF
     19032#define OSICBCLIB_EXPORT $libexport_attribute
     19033_ACEOF
     19034
     19035
     19036# Define BUILDTOOLS_DEBUG to enable debugging output
     19037
     19038      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1871419039        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICBCLIB_LFLAGS_NOPC: \"${OSICBCLIB_LFLAGS_NOPC}\"" >&5
    1871519040$as_echo "$as_me: OSICBCLIB_LFLAGS_NOPC: \"${OSICBCLIB_LFLAGS_NOPC}\"" >&6;}
     
    1888819213    requested | build )
    1888919214      if test -n "$PKG_CONFIG" ; then
    18890         pcfile=osi-unittests
     19215        pcfile="osi-unittests"
    1889119216
    1889219217
     
    1889619221      OSITESTS_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    1889719222      coin_has_ositests=yes
    18898            ositests_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     19223           ositests_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    1889919224           ositests_pcfiles="$pcfile"
    1890019225    else
     
    1892419249# from pkgconfig. Note that we haven't run a useability test!
    1892519250
    18926 # Change the test to enable / disable debugging output
    18927 
    18928     if test 1 = 1 ; then
     19251# Define BUILDTOOLS_DEBUG to enable debugging output
     19252
     19253    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1892919254      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for ositests: \"$coin_has_ositests\"" >&5
    1893019255$as_echo "$as_me: FIND_PRIM_PKG result for ositests: \"$coin_has_ositests\"" >&6;}
     
    1912119446    requested | build )
    1912219447      if test -n "$PKG_CONFIG" ; then
    19123         pcfile=coindatasample
     19448        pcfile="coindatasample"
    1912419449
    1912519450
     
    1912919454      SAMPLE_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    1913019455      coin_has_sample=yes
    19131            sample_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     19456           sample_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    1913219457           sample_pcfiles="$pcfile"
    1913319458    else
     
    1915719482# from pkgconfig. Note that we haven't run a useability test!
    1915819483
    19159 # Change the test to enable / disable debugging output
    19160 
    19161     if test 1 = 1 ; then
     19484# Define BUILDTOOLS_DEBUG to enable debugging output
     19485
     19486    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1916219487      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for sample: \"$coin_has_sample\"" >&5
    1916319488$as_echo "$as_me: FIND_PRIM_PKG result for sample: \"$coin_has_sample\"" >&6;}
     
    1935219677    requested | build )
    1935319678      if test -n "$PKG_CONFIG" ; then
    19354         pcfile=coindatanetlib
     19679        pcfile="coindatanetlib"
    1935519680
    1935619681
     
    1936019685      NETLIB_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    1936119686      coin_has_netlib=yes
    19362            netlib_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     19687           netlib_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    1936319688           netlib_pcfiles="$pcfile"
    1936419689    else
     
    1938819713# from pkgconfig. Note that we haven't run a useability test!
    1938919714
    19390 # Change the test to enable / disable debugging output
    19391 
    19392     if test 1 = 1 ; then
     19715# Define BUILDTOOLS_DEBUG to enable debugging output
     19716
     19717    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1939319718      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for netlib: \"$coin_has_netlib\"" >&5
    1939419719$as_echo "$as_me: FIND_PRIM_PKG result for netlib: \"$coin_has_netlib\"" >&6;}
     
    1958319908    requested | build )
    1958419909      if test -n "$PKG_CONFIG" ; then
    19585         pcfile=coindatamiplib3
     19910        pcfile="coindatamiplib3"
    1958619911
    1958719912
     
    1959119916      MIPLIB3_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    1959219917      coin_has_miplib3=yes
    19593            miplib3_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     19918           miplib3_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    1959419919           miplib3_pcfiles="$pcfile"
    1959519920    else
     
    1961919944# from pkgconfig. Note that we haven't run a useability test!
    1962019945
    19621 # Change the test to enable / disable debugging output
    19622 
    19623     if test 1 = 1 ; then
     19946# Define BUILDTOOLS_DEBUG to enable debugging output
     19947
     19948    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1962419949      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for miplib3: \"$coin_has_miplib3\"" >&5
    1962519950$as_echo "$as_me: FIND_PRIM_PKG result for miplib3: \"$coin_has_miplib3\"" >&6;}
     
    1967820003
    1967920004
    19680    if test 1 = 1 ; then
     20005   if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1968120006        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for CbcUnitTest:" >&5
    1968220007$as_echo "$as_me: FINALIZE_FLAGS for CbcUnitTest:" >&6;}
     
    1969320018      fi
    1969420019
    19695 # Change the test to enable / disable debugging output
    19696 
    19697       if test 1 = 1 ; then
     20020      # setup XYZ_EXPORT symbol for library users
     20021      libexport_attribute=
     20022      if test "$enable_shared" = yes ; then
     20023        # TODO better check for this? we essentially want to know whether we're building DLLs
     20024        # or do we also need this for GCC on Windows?
     20025        case $CC in */compile\ cl | cl | */cl | */compile\ icl | icl | */icl )
     20026          libexport_attribute="__declspec(dllimport)"
     20027        esac
     20028      fi
     20029
     20030cat >>confdefs.h <<_ACEOF
     20031#define CBCUNITTEST_EXPORT $libexport_attribute
     20032_ACEOF
     20033
     20034
     20035# Define BUILDTOOLS_DEBUG to enable debugging output
     20036
     20037      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1969820038        { $as_echo "$as_me:${as_lineno-$LINENO}: CBCUNITTEST_LFLAGS_NOPC: \"${CBCUNITTEST_LFLAGS_NOPC}\"" >&5
    1969920039$as_echo "$as_me: CBCUNITTEST_LFLAGS_NOPC: \"${CBCUNITTEST_LFLAGS_NOPC}\"" >&6;}
     
    1987620216    requested | build )
    1987720217      if test -n "$PKG_CONFIG" ; then
    19878         pcfile=osi-dylp
     20218        pcfile="osi-dylp"
    1987920219
    1988020220
     
    1988420224      DYLP_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    1988520225      coin_has_dylp=yes
    19886            dylp_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     20226           dylp_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    1988720227           dylp_pcfiles="$pcfile"
    1988820228    else
     
    1991220252# from pkgconfig. Note that we haven't run a useability test!
    1991320253
    19914 # Change the test to enable / disable debugging output
    19915 
    19916     if test 1 = 1 ; then
     20254# Define BUILDTOOLS_DEBUG to enable debugging output
     20255
     20256    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1991720257      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for dylp: \"$coin_has_dylp\"" >&5
    1991820258$as_echo "$as_me: FIND_PRIM_PKG result for dylp: \"$coin_has_dylp\"" >&6;}
     
    2012720467    requested | build )
    2012820468      if test -n "$PKG_CONFIG" ; then
    20129         pcfile=osi-vol
     20469        pcfile="osi-vol"
    2013020470
    2013120471
     
    2013520475      VOL_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2013620476      coin_has_vol=yes
    20137            vol_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     20477           vol_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2013820478           vol_pcfiles="$pcfile"
    2013920479    else
     
    2016320503# from pkgconfig. Note that we haven't run a useability test!
    2016420504
    20165 # Change the test to enable / disable debugging output
    20166 
    20167     if test 1 = 1 ; then
     20505# Define BUILDTOOLS_DEBUG to enable debugging output
     20506
     20507    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2016820508      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for vol: \"$coin_has_vol\"" >&5
    2016920509$as_echo "$as_me: FIND_PRIM_PKG result for vol: \"$coin_has_vol\"" >&6;}
     
    2038120721    requested | build )
    2038220722      if test -n "$PKG_CONFIG" ; then
    20383         pcfile=osi-cplex
     20723        pcfile="osi-cplex"
    2038420724
    2038520725
     
    2038920729      CPX_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2039020730      coin_has_cpx=yes
    20391            cpx_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     20731           cpx_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2039220732           cpx_pcfiles="$pcfile"
    2039320733    else
     
    2041720757# from pkgconfig. Note that we haven't run a useability test!
    2041820758
    20419 # Change the test to enable / disable debugging output
    20420 
    20421     if test 1 = 1 ; then
     20759# Define BUILDTOOLS_DEBUG to enable debugging output
     20760
     20761    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2042220762      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for cpx: \"$coin_has_cpx\"" >&5
    2042320763$as_echo "$as_me: FIND_PRIM_PKG result for cpx: \"$coin_has_cpx\"" >&6;}
     
    2063820978    requested | build )
    2063920979      if test -n "$PKG_CONFIG" ; then
    20640         pcfile=osi-glpk
     20980        pcfile="osi-glpk"
    2064120981
    2064220982
     
    2064620986      GLPK_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2064720987      coin_has_glpk=yes
    20648            glpk_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     20988           glpk_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2064920989           glpk_pcfiles="$pcfile"
    2065020990    else
     
    2067421014# from pkgconfig. Note that we haven't run a useability test!
    2067521015
    20676 # Change the test to enable / disable debugging output
    20677 
    20678     if test 1 = 1 ; then
     21016# Define BUILDTOOLS_DEBUG to enable debugging output
     21017
     21018    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2067921019      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for glpk: \"$coin_has_glpk\"" >&5
    2068021020$as_echo "$as_me: FIND_PRIM_PKG result for glpk: \"$coin_has_glpk\"" >&6;}
     
    2088921229    requested | build )
    2089021230      if test -n "$PKG_CONFIG" ; then
    20891         pcfile=osi-gurobi
     21231        pcfile="osi-gurobi"
    2089221232
    2089321233
     
    2089721237      GRB_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2089821238      coin_has_grb=yes
    20899            grb_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     21239           grb_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2090021240           grb_pcfiles="$pcfile"
    2090121241    else
     
    2092521265# from pkgconfig. Note that we haven't run a useability test!
    2092621266
    20927 # Change the test to enable / disable debugging output
    20928 
    20929     if test 1 = 1 ; then
     21267# Define BUILDTOOLS_DEBUG to enable debugging output
     21268
     21269    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2093021270      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for grb: \"$coin_has_grb\"" >&5
    2093121271$as_echo "$as_me: FIND_PRIM_PKG result for grb: \"$coin_has_grb\"" >&6;}
     
    2114021480    requested | build )
    2114121481      if test -n "$PKG_CONFIG" ; then
    21142         pcfile=osi-mosek
     21482        pcfile="osi-mosek"
    2114321483
    2114421484
     
    2114821488      MSK_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2114921489      coin_has_msk=yes
    21150            msk_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     21490           msk_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2115121491           msk_pcfiles="$pcfile"
    2115221492    else
     
    2117621516# from pkgconfig. Note that we haven't run a useability test!
    2117721517
    21178 # Change the test to enable / disable debugging output
    21179 
    21180     if test 1 = 1 ; then
     21518# Define BUILDTOOLS_DEBUG to enable debugging output
     21519
     21520    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2118121521      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for msk: \"$coin_has_msk\"" >&5
    2118221522$as_echo "$as_me: FIND_PRIM_PKG result for msk: \"$coin_has_msk\"" >&6;}
     
    2139421734    requested | build )
    2139521735      if test -n "$PKG_CONFIG" ; then
    21396         pcfile=osi-soplex
     21736        pcfile="osi-soplex"
    2139721737
    2139821738
     
    2140221742      SPX_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2140321743      coin_has_spx=yes
    21404            spx_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     21744           spx_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2140521745           spx_pcfiles="$pcfile"
    2140621746    else
     
    2143021770# from pkgconfig. Note that we haven't run a useability test!
    2143121771
    21432 # Change the test to enable / disable debugging output
    21433 
    21434     if test 1 = 1 ; then
     21772# Define BUILDTOOLS_DEBUG to enable debugging output
     21773
     21774    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2143521775      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for spx: \"$coin_has_spx\"" >&5
    2143621776$as_echo "$as_me: FIND_PRIM_PKG result for spx: \"$coin_has_spx\"" >&6;}
     
    2164521985    requested | build )
    2164621986      if test -n "$PKG_CONFIG" ; then
    21647         pcfile=osi-xpress
     21987        pcfile="osi-xpress"
    2164821988
    2164921989
     
    2165321993      XPR_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2165421994      coin_has_xpr=yes
    21655            xpr_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     21995           xpr_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2165621996           xpr_pcfiles="$pcfile"
    2165721997    else
     
    2168122021# from pkgconfig. Note that we haven't run a useability test!
    2168222022
    21683 # Change the test to enable / disable debugging output
    21684 
    21685     if test 1 = 1 ; then
     22023# Define BUILDTOOLS_DEBUG to enable debugging output
     22024
     22025    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2168622026      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for xpr: \"$coin_has_xpr\"" >&5
    2168722027$as_echo "$as_me: FIND_PRIM_PKG result for xpr: \"$coin_has_xpr\"" >&6;}
     
    2173922079
    2174022080
    21741    if test 1 = 1 ; then
     22081   if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2174222082        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for CbcGeneric:" >&5
    2174322083$as_echo "$as_me: FINALIZE_FLAGS for CbcGeneric:" >&6;}
     
    2175422094      fi
    2175522095
    21756 # Change the test to enable / disable debugging output
    21757 
    21758       if test 1 = 1 ; then
     22096      # setup XYZ_EXPORT symbol for library users
     22097      libexport_attribute=
     22098      if test "$enable_shared" = yes ; then
     22099        # TODO better check for this? we essentially want to know whether we're building DLLs
     22100        # or do we also need this for GCC on Windows?
     22101        case $CC in */compile\ cl | cl | */cl | */compile\ icl | icl | */icl )
     22102          libexport_attribute="__declspec(dllimport)"
     22103        esac
     22104      fi
     22105
     22106cat >>confdefs.h <<_ACEOF
     22107#define CBCGENERIC_EXPORT $libexport_attribute
     22108_ACEOF
     22109
     22110
     22111# Define BUILDTOOLS_DEBUG to enable debugging output
     22112
     22113      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2175922114        { $as_echo "$as_me:${as_lineno-$LINENO}: CBCGENERIC_LFLAGS_NOPC: \"${CBCGENERIC_LFLAGS_NOPC}\"" >&5
    2176022115$as_echo "$as_me: CBCGENERIC_LFLAGS_NOPC: \"${CBCGENERIC_LFLAGS_NOPC}\"" >&6;}
     
    2328423639macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
    2328523640macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
    23286 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    2328723641enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    2328823642pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
     23643AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
     23644DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
     23645OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
     23646enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    2328923647enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
    2329023648shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
     
    2331623674reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
    2331723675reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
    23318 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
    2331923676deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
    2332023677file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
    2332123678file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
    2332223679want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
    23323 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
    2332423680sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
    2332523681AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
     
    2348523841
    2348623842# Quote evaled strings.
    23487 for var in SHELL \
     23843for var in AS \
     23844DLLTOOL \
     23845OBJDUMP \
     23846SHELL \
    2348823847ECHO \
    2348923848PATH_SEPARATOR \
     
    2349823857lt_NL2SP \
    2349923858reload_flag \
    23500 OBJDUMP \
    2350123859deplibs_check_method \
    2350223860file_magic_cmd \
    2350323861file_magic_glob \
    2350423862want_nocaseglob \
    23505 DLLTOOL \
    2350623863sharedlib_from_linklib_cmd \
    2350723864AR \
     
    2442024777macro_revision=$macro_revision
    2442124778
     24779# Whether or not to build static libraries.
     24780build_old_libs=$enable_static
     24781
     24782# What type of objects to build.
     24783pic_mode=$pic_mode
     24784
     24785# Assembler program.
     24786AS=$lt_AS
     24787
     24788# DLL creation program.
     24789DLLTOOL=$lt_DLLTOOL
     24790
     24791# Object dumper program.
     24792OBJDUMP=$lt_OBJDUMP
     24793
    2442224794# Whether or not to build shared libraries.
    2442324795build_libtool_libs=$enable_shared
    24424 
    24425 # Whether or not to build static libraries.
    24426 build_old_libs=$enable_static
    24427 
    24428 # What type of objects to build.
    24429 pic_mode=$pic_mode
    2443024796
    2443124797# Whether or not to optimize for fast installation.
     
    2449924865to_tool_file_cmd=$lt_cv_to_tool_file_cmd
    2450024866
    24501 # An object symbol dumper.
    24502 OBJDUMP=$lt_OBJDUMP
    24503 
    2450424867# Method to check whether dependent libraries are shared objects.
    2450524868deplibs_check_method=$lt_deplibs_check_method
     
    2451324876# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
    2451424877want_nocaseglob=$lt_want_nocaseglob
    24515 
    24516 # DLL creation program.
    24517 DLLTOOL=$lt_DLLTOOL
    2451824878
    2451924879# Command to associate shared and link libraries.
  • branches/autotools-update/Cbc/get.dependencies.sh

    r2399 r2412  
    66#
    77# TODO
    8 # - fix dependency-tracking or remove it from configure
    98# - consider using pushd/popd instead of cd somewhere/cd ..
    109# - look at TODO and FIXME below
     
    479478                fi
    480479                if [ $verbosity -ge 3 ]; then
    481                     "$root_dir/$dir/configure" --disable-dependency-tracking --prefix=$1 "${!configure_options[@]}"
     480                    "$root_dir/$dir/configure" --prefix=$1 "${!configure_options[@]}"
    482481                else
    483                     "$root_dir/$dir/configure" --disable-dependency-tracking --prefix=$1 "${!configure_options[@]}" > /dev/null
     482                    "$root_dir/$dir/configure" --prefix=$1 "${!configure_options[@]}" > /dev/null
    484483                fi
    485484            fi
     
    522521            # Now, do the actual configuration
    523522            if [ $verbosity -ge 2 ]; then
    524                 "$root_config" --disable-dependency-tracking --prefix=$1 "${!configure_options[@]}"
    525             else
    526                 "$root_config" --disable-dependency-tracking --prefix=$1 "${!configure_options[@]}" > /dev/null
     523                "$root_config" --prefix=$1 "${!configure_options[@]}"
     524            else
     525                "$root_config" --prefix=$1 "${!configure_options[@]}" > /dev/null
    527526            fi
    528527        fi
     
    562561        if [ ! -e config.status ] || [ $reconfigure = "true" ]; then
    563562            if [ $verbosity != 1 ]; then
    564                 "$root_dir/configure" --disable-dependency-tracking --prefix=$1 "${!configure_options[@]}"
    565             else
    566                 "$root_dir/configure" --disable-dependency-tracking --prefix=$1 "${!configure_options[@]}" > /dev/null
     563                "$root_dir/configure" --prefix=$1 "${!configure_options[@]}"
     564            else
     565                "$root_dir/configure" --prefix=$1 "${!configure_options[@]}" > /dev/null
    567566            fi
    568567        fi
  • branches/autotools-update/Cbc/ltmain.sh

    r2390 r2412  
    72737273      # --sysroot=*          for sysroot support
    72747274      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
     7275      # -specs=*             GCC specs files
    72757276      # -stdlib=*            select c++ std lib with clang
    72767277      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
    72777278      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
    7278       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
     7279      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
     7280      -specs=*)
    72797281        func_quote_for_eval "$arg"
    72807282        arg=$func_quote_for_eval_result
  • branches/autotools-update/Cbc/src

  • branches/autotools-update/Cbc/src/CbcGenParamUtils.cpp

    r1899 r2412  
    1919#include <cassert>
    2020
     21#include "CoinUtilsConfig.h"
    2122#include "CoinFileIO.hpp"
    2223
  • branches/autotools-update/Cbc/src/CbcGeneric.cpp

    r1899 r2412  
    2222#include <iostream>
    2323
     24#include "CoinUtilsConfig.h"
    2425#include "CoinFileIO.hpp"
    2526#include "CoinMpsIO.hpp"
  • branches/autotools-update/Cbc/src/CbcModel.cpp

    r2382 r2412  
    1963019630        mipStart_.push_back( std::pair<std::string, double>( std::string(colNames[i]), colValues[i]) );
    1963119631}
     19632#ifdef COIN_HAS_NTY
     19633// get rid of all
     19634void
     19635CbcModel::zapSymmetry() {
     19636  delete symmetryInfo_;
     19637  symmetryInfo_=NULL;
     19638}
     19639#endif
    1963219640/* Add SOS info to solver -
    1963319641   Overwrites SOS information in solver with information
  • branches/autotools-update/Cbc/src/CbcModel.hpp

    r2382 r2412  
    23542354        maximumNumberIterations_ = value;
    23552355    }
     2356#ifdef COIN_HAS_NTY
    23562357    /// Symmetry information
    23572358    inline CbcSymmetry * symmetryInfo() const
    23582359    { return symmetryInfo_;} 
     2360    /// get rid of all
     2361    void zapSymmetry();
     2362#endif
    23592363    /// Set depth for fast nodes
    23602364    inline void setFastNodeDepth(int value) {
  • branches/autotools-update/Cbc/src/CbcSolver.cpp

    r2387 r2412  
    5454#include "OsiAuxInfo.hpp"
    5555#include "CbcMipStartIO.hpp"
     56#include "CbcMessage.hpp"
    5657// for printing
    5758#ifndef CLP_OUTPUT_FORMAT
     
    677678    parameters_[whichParam(CBC_PARAM_STR_LOCALTREE, numberParameters_, parameters_)].setCurrentOption("off");
    678679    parameters_[whichParam(CBC_PARAM_STR_COSTSTRATEGY, numberParameters_, parameters_)].setCurrentOption("off");
     680    parameters_[whichParam(CBC_PARAM_STR_PREPROCNAMES, numberParameters_, parameters_)].setCurrentOption("off");
    679681    if (createSolver)
    680682        delete clpSolver;
     
    822824                        std::string & check);
    823825static void generateCode(CbcModel * model, const char * fileName, int type, int preProcess);
     826#ifdef COIN_HAS_NTY
     827// returns number of constraints added
     828static int nautiedConstraints (CbcModel & model, int maxPass);
     829#endif
    824830
    825831// dummy fake main programs for UserClp and UserCbc
     
    43714377#endif
    43724378                                        redoSOS=true;
    4373                                         process.setTimeLimit( babModel_->getMaximumSeconds()-babModel_->getCurrentSeconds(), babModel_->useElapsedTime() );
    4374                                         solver2 = process.preProcessNonDefault(*saveSolver, translate[preProcess], numberPasses,
     4379
     4380          bool keepPPN = parameters_[whichParam(CBC_PARAM_STR_PREPROCNAMES, numberParameters_, parameters_)].currentOptionAsInteger();
     4381          process.setKeepColumnNames( keepPPN );
     4382          process.setTimeLimit( babModel_->getMaximumSeconds()-babModel_->getCurrentSeconds(), babModel_->useElapsedTime() );
     4383          solver2 = process.preProcessNonDefault(*saveSolver, translate[preProcess], numberPasses,
    43754384                                                                               tunePreProcess);
    43764385                                        if (solver2) {
     
    57545763                                      babModel_->passInSolverCharacteristics(&dummy);
    57555764                                      babModel_->createContinuousSolver();
    5756                                       babModel_->setBestSolution(CBC_Message::CBC_ROUNDING,
     5765                                      babModel_->setBestSolution(CBC_ROUNDING,
    57575766                                                                 obj,&x[0], 1 );
    57585767                                      babModel_->clearContinuousSolver();
     
    72377246                                babModel_->setMoreSpecialOptions2(parameters_[whichParam(CBC_PARAM_INT_MOREMOREMIPOPTIONS, numberParameters_, parameters_)].intValue());
    72387247#ifdef COIN_HAS_NTY
     7248                                int nautyAdded=0;
    72397249                                {
    72407250                                  int jParam = whichParam(CBC_PARAM_STR_ORBITAL,
     
    72427252                                  if(parameters_[jParam].currentOptionAsInteger()) {
    72437253                                    int k = parameters_[jParam].currentOptionAsInteger();
    7244                                     babModel_->setMoreSpecialOptions2(babModel_->moreSpecialOptions2() | (k*128));
     7254                                    if (k<4) {
     7255                                      babModel_->setMoreSpecialOptions2(babModel_->moreSpecialOptions2() | (k*128));
     7256                                    } else {
     7257#define MAX_NAUTY_PASS 2000
     7258                                      nautyAdded=nautiedConstraints(*babModel_,
     7259                                                                    MAX_NAUTY_PASS);
     7260                                    }
    72457261                                  }
    72467262                                }
     
    72517267                                }
    72527268                                babModel_->branchAndBound(statistics);
     7269#ifdef COIN_HAS_NTY
     7270                                if (nautyAdded) {
     7271                                  int * which = new int [nautyAdded];
     7272                                  int numberOldRows=
     7273                                    babModel_->solver()->getNumRows()-nautyAdded;
     7274                                  for (int i=0;i<nautyAdded;i++)
     7275                                    which[i]=i+numberOldRows;
     7276                                  babModel_->solver()->deleteRows(nautyAdded,which);
     7277                                  delete [] which;
     7278                                  babModel_->solver()->resolve();
     7279                                }
     7280#endif
    72537281                                if (truncateColumns<babModel_->solver()->getNumCols()) {
    72547282                                  OsiSolverInterface * solverX = babModel_->solver();
     
    96579685                                    statistics_nprocessedrows, statistics_nprocessedcols);
    96589686                            for (int i = 0; i < statistics_number_generators; i++)
    9659                                 fprintf(fp, ",%d", statistics_number_cuts[i]!=NULL ? statistics_number_cuts[i] : 0);
     9687                                fprintf(fp, ",%d", statistics_number_cuts!=NULL ? statistics_number_cuts[i] : 0);
    96609688                            fprintf(fp, ",");
    96619689                            for (int i = 1; i < argc; i++) {
     
    1240712435#endif
    1240812436}
     12437#ifdef COIN_HAS_NTY
     12438#include "CbcSymmetry.hpp"
     12439// returns number of constraints added
     12440static int nautiedConstraints (CbcModel & model,int maxPass)
     12441{
     12442  bool changed =true;
     12443  int numberAdded=0;
     12444  int numberPasses=0;
     12445  int changeType = 0; //(more2&(128|256))>>7;
     12446  OsiSolverInterface * solverOriginal = model.solver();
     12447#define REALLY_CHANGE
     12448#ifdef REALLY_CHANGE
     12449  OsiSolverInterface * solver = solverOriginal;
     12450#else
     12451  int numberOriginalRows=solverOriginal->getNumRows();
     12452  OsiSolverInterface * solver = solverOriginal->clone();
     12453#endif
     12454  while (changed) {
     12455    changed=false;
     12456    CbcSymmetry symmetryInfo;
     12457    //symmetryInfo.setModel(&model);
     12458    // for now strong is just on counts - use user option
     12459    //int maxN=5000000;
     12460    //OsiSolverInterface * solver = model.solver();
     12461    symmetryInfo.setupSymmetry(*solver);
     12462    int numberGenerators = symmetryInfo.statsOrbits(&model,0);
     12463    if (numberGenerators) {
     12464      //symmetryInfo.Print_Orbits();
     12465      int numberUsefulOrbits = symmetryInfo.numberUsefulOrbits();
     12466      if (numberUsefulOrbits) {
     12467        symmetryInfo.Compute_Symmetry();
     12468        symmetryInfo.fillOrbits(/*true*/);
     12469        const int * orbits = symmetryInfo.whichOrbit();
     12470        int numberUsefulOrbits = symmetryInfo.numberUsefulOrbits();
     12471        int * counts = new int[numberUsefulOrbits];
     12472        memset(counts,0,numberUsefulOrbits*sizeof(int));
     12473        int numberColumns = solver->getNumCols();
     12474        int numberUseful=0;
     12475        if (changeType==1) {
     12476          // just 0-1
     12477          for (int i=0;i<numberColumns;i++) {
     12478            int iOrbit=orbits[i];
     12479            if (iOrbit>=0) {
     12480              if (solver->isBinary(i)) {
     12481                counts[iOrbit]++;
     12482                numberUseful++;
     12483              }
     12484            }
     12485          }
     12486        } else if (changeType==2) {
     12487          // just integer
     12488          for (int i=0;i<numberColumns;i++) {
     12489            int iOrbit=orbits[i];
     12490            if (iOrbit>=0) {
     12491              if (solver->isInteger(i)) {
     12492                counts[iOrbit]++;
     12493                numberUseful++;
     12494              }
     12495            }
     12496          }
     12497        } else {
     12498          // all
     12499          for (int i=0;i<numberColumns;i++) {
     12500            int iOrbit=orbits[i];
     12501            if (iOrbit>=0) {
     12502              counts[iOrbit]++;
     12503              numberUseful++;
     12504            }
     12505          }
     12506        }
     12507        int iOrbit=-1;
     12508#define LONGEST 1
     12509#if LONGEST
     12510        // choose longest
     12511        int maxOrbit=0;
     12512        for (int i=0;i<numberUsefulOrbits;i++) {
     12513          if (counts[i]>maxOrbit) {
     12514            maxOrbit=counts[i];
     12515            iOrbit=i;
     12516          }
     12517        }
     12518#else
     12519        // choose closest to 2
     12520        int minOrbit=numberColumns+1;
     12521        for (int i=0;i<numberUsefulOrbits;i++) {
     12522          if (counts[i]>1&&counts[i]<minOrbit) {
     12523            minOrbit=counts[i];
     12524            iOrbit=i;
     12525          }
     12526        }
     12527#endif
     12528        delete [] counts;
     12529        if (!numberUseful)
     12530          break;
     12531        // take largest
     12532        const double * solution = solver->getColSolution();
     12533        double * size = new double [numberColumns];
     12534        int * which = new int [numberColumns];
     12535        int nIn=0;
     12536        for (int i=0;i<numberColumns;i++) {
     12537          if (orbits[i]==iOrbit) {
     12538            size[nIn]=-solution[i];
     12539            which[nIn++]=i;
     12540          }
     12541        }
     12542        if (nIn>1) {
     12543          //printf("Using orbit length %d\n",nIn);
     12544          CoinSort_2(size,size+nIn,which);
     12545          size[0]=1.0;
     12546          size[1]=-1.0;
     12547#if LONGEST == 0
     12548          solver->addRow(2,which,size,0.0,COIN_DBL_MAX);
     12549          numberAdded++;
     12550#elif LONGEST == 1
     12551          for (int i=0;i<nIn-1;i++) {
     12552            solver->addRow(2,which+i,size,0.0,COIN_DBL_MAX);
     12553            numberAdded++;
     12554          }
     12555#else
     12556          for (int i=0;i<nIn-1;i++) {
     12557            solver->addRow(2,which,size,0.0,COIN_DBL_MAX);
     12558            which[1]=which[2+i];
     12559            numberAdded++;
     12560          }
     12561#endif
     12562          numberPasses++;
     12563          if (numberPasses<3/*maxPass*/)
     12564            changed=true;
     12565        }
     12566        delete [] size;
     12567        delete [] which;
     12568      }
     12569    }
     12570  }
     12571  if (numberAdded) {
     12572    char general[100];
     12573    if (numberPasses<maxPass)
     12574      sprintf(general,"%d constraints added in %d passes",numberAdded,
     12575             numberPasses);
     12576    else
     12577      sprintf(general,"%d constraints added in %d passes (maximum) - must be better way",numberAdded,
     12578             numberPasses);
     12579    model.messageHandler()->message(CBC_GENERAL,
     12580                                    model.messages())
     12581      << general << CoinMessageEol ;
     12582    //printf("saving model on nauty\n");
     12583    //solver->writeMps("nauty");
     12584  }
     12585#ifndef REALLY_CHANGE
     12586  CbcRowCuts * globalCuts = model.globalCuts();
     12587  int numberRows = solver->getNumRows();
     12588  if (numberRows>numberOriginalRows) {
     12589    const CoinPackedMatrix * rowCopy = solver->getMatrixByRow();
     12590    const int * column = rowCopy->getIndices();
     12591    const int * rowLength = rowCopy->getVectorLengths();
     12592    const CoinBigIndex * rowStart = rowCopy->getVectorStarts();
     12593    const double * elements = rowCopy->getElements();
     12594    const double * rowLower = solver->getRowLower();
     12595    const double * rowUpper = solver->getRowUpper();
     12596    for (int iRow=numberOriginalRows;iRow<numberRows;iRow++) {
     12597      OsiRowCut rc;
     12598      rc.setLb(rowLower[iRow]);
     12599      rc.setUb(rowUpper[iRow]);
     12600      CoinBigIndex start = rowStart[iRow];
     12601      rc.setRow(rowLength[iRow],column+start,elements+start,false);
     12602      globalCuts->addCutIfNotDuplicate(rc);
     12603    }
     12604  }
     12605  delete solver;
     12606#endif
     12607  return numberAdded;
     12608}
     12609#endif
    1240912610/*
    1241012611  Version 1.00.00 November 16 2005.
     
    1243412635*/
    1243512636                           
     12637//# vim: ts=2 sw=2 et
     12638
  • branches/autotools-update/Cbc/src/Makefile.in

    r2395 r2412  
    330330AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
    331331AR = @AR@
     332AS = @AS@
    332333AUTOCONF = @AUTOCONF@
    333334AUTOHEADER = @AUTOHEADER@
  • branches/autotools-update/Cbc/src/OsiCbc/Makefile.in

    r2399 r2412  
    254254AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
    255255AR = @AR@
     256AS = @AS@
    256257AUTOCONF = @AUTOCONF@
    257258AUTOHEADER = @AUTOHEADER@
  • branches/autotools-update/Cbc/src/config.h.in

    r2391 r2412  
    11/* src/config.h.in.  Generated from configure.ac by autoheader.  */
     2
     3/* Library Visibility Attribute */
     4#undef CBCGENERIC_EXPORT
     5
     6/* Library Visibility Attribute */
     7#undef CBCLIB_EXPORT
     8
     9/* Library Visibility Attribute */
     10#undef CBCUNITTEST_EXPORT
    211
    312/* Define to the name of the default solver to be used in cbc-generic in small
     
    143152#undef LT_OBJDIR
    144153
     154/* Library Visibility Attribute */
     155#undef OSICBCLIB_EXPORT
     156
    145157/* define to the name of the default solver interface class, e.g.,
    146158   OsiClpSolverInterface */
  • branches/autotools-update/Cbc/test/Makefile.in

    r2399 r2412  
    232232AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
    233233AR = @AR@
     234AS = @AS@
    234235AUTOCONF = @AUTOCONF@
    235236AUTOHEADER = @AUTOHEADER@
Note: See TracChangeset for help on using the changeset viewer.