Changeset 2362


Ignore:
Timestamp:
Nov 2, 2018 2:13:07 PM (7 months ago)
Author:
lou
Message:

Merge trunk 2339 -- 2359. Propagate BuildTools? changes. Detect installed MUMPS
package (works on Fedora, at least).

Location:
branches/autotools-update/Clp
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Clp

  • branches/autotools-update/Clp/Makefile.in

    r2337 r2362  
    223223AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
    224224AR = @AR@
     225AS = @AS@
    225226AUTOCONF = @AUTOCONF@
    226227AUTOHEADER = @AUTOHEADER@
  • branches/autotools-update/Clp/config.guess

    r2310 r2362  
    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/Clp/config.sub

    r2310 r2362  
    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/Clp/configure

    r2351 r2362  
    732732ac_ct_AR
    733733AR
    734 DLLTOOL
    735 OBJDUMP
    736734LN_S
    737735NM
     
    744742SED
    745743LIBTOOL
     744OBJDUMP
     745DLLTOOL
     746AS
    746747FLIBS
    747748ac_ct_F77
     
    858859enable_maintainer_mode
    859860enable_dependency_tracking
    860 enable_shared
    861861enable_static
    862862with_pic
     863enable_shared
    863864enable_fast_install
    864865with_aix_soname
     
    15501551  --disable-dependency-tracking
    15511552                          speeds up one-time build
     1553  --enable-static[=PKGS]  build static libraries [default=no]
    15521554  --enable-shared[=PKGS]  build shared libraries [default=yes]
    1553   --enable-static[=PKGS]  build static libraries [default=yes]
    15541555  --enable-fast-install[=PKGS]
    15551556                          optimize for fast installation [default=yes]
     
    16391640                          environment. (Most often, -I specs for header file
    16401641                          directories.)
    1641   --with-mumps            Use Mumps. If an argument is given, 'yes' is
     1642  --with-mumps            Use MUMPS. If an argument is given, 'yes' is
    16421643                          equivalent to --with-mumps, 'no' is
    16431644                          equivalent to --without-mumps. Any other argument is
    16441645                          applied as for --with-mumps-lflags
    1645   --with-mumps-lflags     Linker flags for Mumps appropriate for your
     1646  --with-mumps-lflags     Linker flags for MUMPS appropriate for your
    16461647                          environment. (Most often, -l specs for libraries.)
    1647   --with-mumps-cflags     Compiler flags for Mumps appropriate for your
     1648  --with-mumps-cflags     Compiler flags for MUMPS appropriate for your
    16481649                          environment. (Most often, -I specs for header file
    16491650                          directories.)
     
    34383439
    34393440
    3440 # libtool has some magic for host_os=mingw, but doesn't know about msys
     3441# libtool has some magic for host_os and build_os being mingw, but doesn't know about msys
    34413442
    34423443  if test $host_os = msys ; then
    34433444    host_os=mingw
    34443445    host=`echo $host | sed -e 's/msys/mingw/'`
     3446  fi
     3447
     3448  if test $build_os = msys ; then
     3449    build_os=mingw
     3450    build=`echo $build | sed -e 's/msys/mingw/'`
    34453451  fi
    34463452
     
    72387244
    72397245
    7240 
    7241 
    7242 
    72437246{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
    72447247$as_echo_n "checking how to recognize dependent libraries... " >&6; }
     
    75767579
    75777580test -z "$DLLTOOL" && DLLTOOL=dlltool
    7578 
    7579 
    7580 
    75817581
    75827582
     
    98659865
    98669866
    9867 # On Windows, shared C++ libraries do not work with the current libtool (it
    9868 # handles only exports for C functions, not C++). On all other systems, build
    9869 # only shared libraries.
    9870 
    98719867# (lh, 180302) Sadly, we can't use the obvious libtool macros
    98729868# (AC_{ENABLE,DISABLE}_{SHARED,STATIC}, nor parameters to LT_INIT,
     
    98769872# something more inventive. The relevant libtool macros are in ltoptions.m4,
    98779873# _LT_ENABLE_SHARED and _LT_ENABLE_STATIC.
    9878 
     9874# That is, something like the following will not work:
    98799875# case $host_os in
    9880 #   cygwin* | mingw* | msys* )
    9881 #     AC_DISABLE_SHARED
    9882 #     ;;
    9883 #   *)
    9884 #     AC_DISABLE_STATIC
    9885 #     ;;
     9876#   cygwin* | mingw* | msys* ) AC_DISABLE_SHARED  ;;
     9877#   *) AC_DISABLE_STATIC ;;
    98869878# esac
    98879879
     
    98939885
    98949886# Set options
     9887# Check whether --enable-static was given.
     9888if test "${enable_static+set}" = set; then :
     9889  enableval=$enable_static; p=${PACKAGE-default}
     9890    case $enableval in
     9891    yes) enable_static=yes ;;
     9892    no) enable_static=no ;;
     9893    *)
     9894     enable_static=no
     9895      # Look at the argument we got.  We use all the common list separators.
     9896      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
     9897      for pkg in $enableval; do
     9898        IFS=$lt_save_ifs
     9899        if test "X$pkg" = "X$p"; then
     9900          enable_static=yes
     9901        fi
     9902      done
     9903      IFS=$lt_save_ifs
     9904      ;;
     9905    esac
     9906else
     9907  enable_static=no
     9908fi
     9909
     9910
     9911
     9912
     9913
     9914
     9915
     9916
     9917# Check whether --with-pic was given.
     9918if test "${with_pic+set}" = set; then :
     9919  withval=$with_pic; lt_p=${PACKAGE-default}
     9920    case $withval in
     9921    yes|no) pic_mode=$withval ;;
     9922    *)
     9923      pic_mode=default
     9924      # Look at the argument we got.  We use all the common list separators.
     9925      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
     9926      for lt_pkg in $withval; do
     9927        IFS=$lt_save_ifs
     9928        if test "X$lt_pkg" = "X$lt_p"; then
     9929          pic_mode=yes
     9930        fi
     9931      done
     9932      IFS=$lt_save_ifs
     9933      ;;
     9934    esac
     9935else
     9936  pic_mode=yes
     9937fi
     9938
     9939
     9940
     9941
     9942
     9943
     9944enable_win32_dll=yes
     9945
     9946case $host in
     9947*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
     9948  if test -n "$ac_tool_prefix"; then
     9949  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
     9950set dummy ${ac_tool_prefix}as; ac_word=$2
     9951{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     9952$as_echo_n "checking for $ac_word... " >&6; }
     9953if ${ac_cv_prog_AS+:} false; then :
     9954  $as_echo_n "(cached) " >&6
     9955else
     9956  if test -n "$AS"; then
     9957  ac_cv_prog_AS="$AS" # Let the user override the test.
     9958else
     9959as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     9960for as_dir in $PATH
     9961do
     9962  IFS=$as_save_IFS
     9963  test -z "$as_dir" && as_dir=.
     9964    for ac_exec_ext in '' $ac_executable_extensions; do
     9965  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     9966    ac_cv_prog_AS="${ac_tool_prefix}as"
     9967    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     9968    break 2
     9969  fi
     9970done
     9971  done
     9972IFS=$as_save_IFS
     9973
     9974fi
     9975fi
     9976AS=$ac_cv_prog_AS
     9977if test -n "$AS"; then
     9978  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
     9979$as_echo "$AS" >&6; }
     9980else
     9981  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     9982$as_echo "no" >&6; }
     9983fi
     9984
     9985
     9986fi
     9987if test -z "$ac_cv_prog_AS"; then
     9988  ac_ct_AS=$AS
     9989  # Extract the first word of "as", so it can be a program name with args.
     9990set dummy as; ac_word=$2
     9991{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     9992$as_echo_n "checking for $ac_word... " >&6; }
     9993if ${ac_cv_prog_ac_ct_AS+:} false; then :
     9994  $as_echo_n "(cached) " >&6
     9995else
     9996  if test -n "$ac_ct_AS"; then
     9997  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
     9998else
     9999as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     10000for as_dir in $PATH
     10001do
     10002  IFS=$as_save_IFS
     10003  test -z "$as_dir" && as_dir=.
     10004    for ac_exec_ext in '' $ac_executable_extensions; do
     10005  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     10006    ac_cv_prog_ac_ct_AS="as"
     10007    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     10008    break 2
     10009  fi
     10010done
     10011  done
     10012IFS=$as_save_IFS
     10013
     10014fi
     10015fi
     10016ac_ct_AS=$ac_cv_prog_ac_ct_AS
     10017if test -n "$ac_ct_AS"; then
     10018  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
     10019$as_echo "$ac_ct_AS" >&6; }
     10020else
     10021  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     10022$as_echo "no" >&6; }
     10023fi
     10024
     10025  if test "x$ac_ct_AS" = x; then
     10026    AS="false"
     10027  else
     10028    case $cross_compiling:$ac_tool_warned in
     10029yes:)
     10030{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     10031$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     10032ac_tool_warned=yes ;;
     10033esac
     10034    AS=$ac_ct_AS
     10035  fi
     10036else
     10037  AS="$ac_cv_prog_AS"
     10038fi
     10039
     10040  if test -n "$ac_tool_prefix"; then
     10041  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
     10042set dummy ${ac_tool_prefix}dlltool; ac_word=$2
     10043{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     10044$as_echo_n "checking for $ac_word... " >&6; }
     10045if ${ac_cv_prog_DLLTOOL+:} false; then :
     10046  $as_echo_n "(cached) " >&6
     10047else
     10048  if test -n "$DLLTOOL"; then
     10049  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
     10050else
     10051as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     10052for as_dir in $PATH
     10053do
     10054  IFS=$as_save_IFS
     10055  test -z "$as_dir" && as_dir=.
     10056    for ac_exec_ext in '' $ac_executable_extensions; do
     10057  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     10058    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     10059    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     10060    break 2
     10061  fi
     10062done
     10063  done
     10064IFS=$as_save_IFS
     10065
     10066fi
     10067fi
     10068DLLTOOL=$ac_cv_prog_DLLTOOL
     10069if test -n "$DLLTOOL"; then
     10070  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
     10071$as_echo "$DLLTOOL" >&6; }
     10072else
     10073  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     10074$as_echo "no" >&6; }
     10075fi
     10076
     10077
     10078fi
     10079if test -z "$ac_cv_prog_DLLTOOL"; then
     10080  ac_ct_DLLTOOL=$DLLTOOL
     10081  # Extract the first word of "dlltool", so it can be a program name with args.
     10082set dummy dlltool; ac_word=$2
     10083{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     10084$as_echo_n "checking for $ac_word... " >&6; }
     10085if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
     10086  $as_echo_n "(cached) " >&6
     10087else
     10088  if test -n "$ac_ct_DLLTOOL"; then
     10089  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
     10090else
     10091as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     10092for as_dir in $PATH
     10093do
     10094  IFS=$as_save_IFS
     10095  test -z "$as_dir" && as_dir=.
     10096    for ac_exec_ext in '' $ac_executable_extensions; do
     10097  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     10098    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     10099    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     10100    break 2
     10101  fi
     10102done
     10103  done
     10104IFS=$as_save_IFS
     10105
     10106fi
     10107fi
     10108ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
     10109if test -n "$ac_ct_DLLTOOL"; then
     10110  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
     10111$as_echo "$ac_ct_DLLTOOL" >&6; }
     10112else
     10113  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     10114$as_echo "no" >&6; }
     10115fi
     10116
     10117  if test "x$ac_ct_DLLTOOL" = x; then
     10118    DLLTOOL="false"
     10119  else
     10120    case $cross_compiling:$ac_tool_warned in
     10121yes:)
     10122{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     10123$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     10124ac_tool_warned=yes ;;
     10125esac
     10126    DLLTOOL=$ac_ct_DLLTOOL
     10127  fi
     10128else
     10129  DLLTOOL="$ac_cv_prog_DLLTOOL"
     10130fi
     10131
     10132  if test -n "$ac_tool_prefix"; then
     10133  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
     10134set dummy ${ac_tool_prefix}objdump; ac_word=$2
     10135{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     10136$as_echo_n "checking for $ac_word... " >&6; }
     10137if ${ac_cv_prog_OBJDUMP+:} false; then :
     10138  $as_echo_n "(cached) " >&6
     10139else
     10140  if test -n "$OBJDUMP"; then
     10141  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
     10142else
     10143as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     10144for as_dir in $PATH
     10145do
     10146  IFS=$as_save_IFS
     10147  test -z "$as_dir" && as_dir=.
     10148    for ac_exec_ext in '' $ac_executable_extensions; do
     10149  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     10150    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     10151    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     10152    break 2
     10153  fi
     10154done
     10155  done
     10156IFS=$as_save_IFS
     10157
     10158fi
     10159fi
     10160OBJDUMP=$ac_cv_prog_OBJDUMP
     10161if test -n "$OBJDUMP"; then
     10162  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
     10163$as_echo "$OBJDUMP" >&6; }
     10164else
     10165  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     10166$as_echo "no" >&6; }
     10167fi
     10168
     10169
     10170fi
     10171if test -z "$ac_cv_prog_OBJDUMP"; then
     10172  ac_ct_OBJDUMP=$OBJDUMP
     10173  # Extract the first word of "objdump", so it can be a program name with args.
     10174set dummy objdump; ac_word=$2
     10175{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     10176$as_echo_n "checking for $ac_word... " >&6; }
     10177if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
     10178  $as_echo_n "(cached) " >&6
     10179else
     10180  if test -n "$ac_ct_OBJDUMP"; then
     10181  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
     10182else
     10183as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     10184for as_dir in $PATH
     10185do
     10186  IFS=$as_save_IFS
     10187  test -z "$as_dir" && as_dir=.
     10188    for ac_exec_ext in '' $ac_executable_extensions; do
     10189  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     10190    ac_cv_prog_ac_ct_OBJDUMP="objdump"
     10191    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     10192    break 2
     10193  fi
     10194done
     10195  done
     10196IFS=$as_save_IFS
     10197
     10198fi
     10199fi
     10200ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
     10201if test -n "$ac_ct_OBJDUMP"; then
     10202  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
     10203$as_echo "$ac_ct_OBJDUMP" >&6; }
     10204else
     10205  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     10206$as_echo "no" >&6; }
     10207fi
     10208
     10209  if test "x$ac_ct_OBJDUMP" = x; then
     10210    OBJDUMP="false"
     10211  else
     10212    case $cross_compiling:$ac_tool_warned in
     10213yes:)
     10214{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     10215$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     10216ac_tool_warned=yes ;;
     10217esac
     10218    OBJDUMP=$ac_ct_OBJDUMP
     10219  fi
     10220else
     10221  OBJDUMP="$ac_cv_prog_OBJDUMP"
     10222fi
     10223
     10224  ;;
     10225esac
     10226
     10227test -z "$AS" && AS=as
     10228
     10229
     10230
     10231
     10232
     10233test -z "$DLLTOOL" && DLLTOOL=dlltool
     10234
     10235
     10236
     10237
     10238
     10239test -z "$OBJDUMP" && OBJDUMP=objdump
     10240
     10241
     10242
     10243
    989510244
    989610245
     
    989810247        enable_dlopen=no
    989910248
    9900 
    9901   enable_win32_dll=no
    990210249
    990310250
     
    992710274
    992810275
    9929 
    9930 
    9931 
    9932 
    9933 
    9934 
    9935   # Check whether --enable-static was given.
    9936 if test "${enable_static+set}" = set; then :
    9937   enableval=$enable_static; p=${PACKAGE-default}
    9938     case $enableval in
    9939     yes) enable_static=yes ;;
    9940     no) enable_static=no ;;
    9941     *)
    9942      enable_static=no
    9943       # Look at the argument we got.  We use all the common list separators.
    9944       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
    9945       for pkg in $enableval; do
    9946         IFS=$lt_save_ifs
    9947         if test "X$pkg" = "X$p"; then
    9948           enable_static=yes
    9949         fi
    9950       done
    9951       IFS=$lt_save_ifs
    9952       ;;
    9953     esac
    9954 else
    9955   enable_static=yes
    9956 fi
    9957 
    9958 
    9959 
    9960 
    9961 
    9962 
    9963 
    9964 
    9965 
    9966 
    9967 # Check whether --with-pic was given.
    9968 if test "${with_pic+set}" = set; then :
    9969   withval=$with_pic; lt_p=${PACKAGE-default}
    9970     case $withval in
    9971     yes|no) pic_mode=$withval ;;
    9972     *)
    9973       pic_mode=default
    9974       # Look at the argument we got.  We use all the common list separators.
    9975       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
    9976       for lt_pkg in $withval; do
    9977         IFS=$lt_save_ifs
    9978         if test "X$lt_pkg" = "X$lt_p"; then
    9979           pic_mode=yes
    9980         fi
    9981       done
    9982       IFS=$lt_save_ifs
    9983       ;;
    9984     esac
    9985 else
    9986   pic_mode=default
    9987 fi
    998810276
    998910277
     
    1318113469  hardcode_into_libs=yes
    1318213470
     13471  # Add ABI-specific directories to the system library path.
     13472  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
     13473
    1318313474  # Ideally, we could use ldconfig to report *all* directores which are
    1318413475  # searched for libraries, however this is still not possible.  Aside from not
     
    1318913480  if test -f /etc/ld.so.conf; then
    1319013481    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' ' '`
    13191     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
     13482    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
    1319213483  fi
    1319313484
     
    1720717498  hardcode_into_libs=yes
    1720817499
     17500  # Add ABI-specific directories to the system library path.
     17501  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
     17502
    1720917503  # Ideally, we could use ldconfig to report *all* directores which are
    1721017504  # searched for libraries, however this is still not possible.  Aside from not
     
    1721517509  if test -f /etc/ld.so.conf; then
    1721617510    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' ' '`
    17217     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
     17511    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
    1721817512  fi
    1721917513
     
    2015720451  hardcode_into_libs=yes
    2015820452
     20453  # Add ABI-specific directories to the system library path.
     20454  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
     20455
    2015920456  # Ideally, we could use ldconfig to report *all* directores which are
    2016020457  # searched for libraries, however this is still not possible.  Aside from not
     
    2016520462  if test -f /etc/ld.so.conf; then
    2016620463    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' ' '`
    20167     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
     20464    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
    2016820465  fi
    2016920466
     
    2054420841  fi
    2054520842
    20546   #TODO we should be able to add this flag
    20547   #LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
     20843  # shared libraries should have no undefined symbols
     20844  # for Windows DLLs, it is mandatory to add this
     20845  LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
    2054820846
    2054920847
     
    2097621274      COINUTILS_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2097721275      coin_has_coinutils=yes
    20978            coinutils_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     21276           coinutils_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2097921277           coinutils_pcfiles="$pcfile"
    2098021278    else
     
    2100421302# from pkgconfig. Note that we haven't run a useability test!
    2100521303
    21006 # Change the test to enable / disable debugging output
    21007 
    21008     if test 1 = 1 ; then
     21304# Define BUILDTOOLS_DEBUG to enable debugging output
     21305
     21306    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2100921307      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for coinutils: \"$coin_has_coinutils\"" >&5
    2101021308$as_echo "$as_me: FIND_PRIM_PKG result for coinutils: \"$coin_has_coinutils\"" >&6;}
     
    2123721535      OSI_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2123821536      coin_has_osi=yes
    21239            osi_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     21537           osi_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2124021538           osi_pcfiles="$pcfile"
    2124121539    else
     
    2126521563# from pkgconfig. Note that we haven't run a useability test!
    2126621564
    21267 # Change the test to enable / disable debugging output
    21268 
    21269     if test 1 = 1 ; then
     21565# Define BUILDTOOLS_DEBUG to enable debugging output
     21566
     21567    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2127021568      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for osi: \"$coin_has_osi\"" >&5
    2127121569$as_echo "$as_me: FIND_PRIM_PKG result for osi: \"$coin_has_osi\"" >&6;}
     
    2148321781    requested | build )
    2148421782      if test -n "$PKG_CONFIG" ; then
    21485         pcfile=osi-unittests
     21783        pcfile="osi-unittests"
    2148621784
    2148721785
     
    2149121789      OSITESTS_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2149221790      coin_has_ositests=yes
    21493            ositests_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     21791           ositests_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2149421792           ositests_pcfiles="$pcfile"
    2149521793    else
     
    2151921817# from pkgconfig. Note that we haven't run a useability test!
    2152021818
    21521 # Change the test to enable / disable debugging output
    21522 
    21523     if test 1 = 1 ; then
     21819# Define BUILDTOOLS_DEBUG to enable debugging output
     21820
     21821    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2152421822      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for ositests: \"$coin_has_ositests\"" >&5
    2152521823$as_echo "$as_me: FIND_PRIM_PKG result for ositests: \"$coin_has_ositests\"" >&6;}
     
    2171622014    requested | build )
    2171722015      if test -n "$PKG_CONFIG" ; then
    21718         pcfile=coindatasample
     22016        pcfile="coindatasample"
    2171922017
    2172022018
     
    2172422022      SAMPLE_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2172522023      coin_has_sample=yes
    21726            sample_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     22024           sample_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2172722025           sample_pcfiles="$pcfile"
    2172822026    else
     
    2175222050# from pkgconfig. Note that we haven't run a useability test!
    2175322051
    21754 # Change the test to enable / disable debugging output
    21755 
    21756     if test 1 = 1 ; then
     22052# Define BUILDTOOLS_DEBUG to enable debugging output
     22053
     22054    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2175722055      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for sample: \"$coin_has_sample\"" >&5
    2175822056$as_echo "$as_me: FIND_PRIM_PKG result for sample: \"$coin_has_sample\"" >&6;}
     
    2194722245    requested | build )
    2194822246      if test -n "$PKG_CONFIG" ; then
    21949         pcfile=coindatanetlib
     22247        pcfile="coindatanetlib"
    2195022248
    2195122249
     
    2195522253      NETLIB_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2195622254      coin_has_netlib=yes
    21957            netlib_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     22255           netlib_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2195822256           netlib_pcfiles="$pcfile"
    2195922257    else
     
    2198322281# from pkgconfig. Note that we haven't run a useability test!
    2198422282
    21985 # Change the test to enable / disable debugging output
    21986 
    21987     if test 1 = 1 ; then
     22283# Define BUILDTOOLS_DEBUG to enable debugging output
     22284
     22285    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2198822286      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for netlib: \"$coin_has_netlib\"" >&5
    2198922287$as_echo "$as_me: FIND_PRIM_PKG result for netlib: \"$coin_has_netlib\"" >&6;}
     
    2230122599# check was performed. Skipping means the user said `don't use.'
    2230222600
    22303 # Change the test to enable / disable debugging output
    22304 
    22305     if test 1 = 1 ; then
     22601# Define BUILDTOOLS_DEBUG to enable debugging output
     22602
     22603    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2230622604      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_LIB result for amd: \"$coin_has_amd\"" >&5
    2230722605$as_echo "$as_me: FIND_PRIM_LIB result for amd: \"$coin_has_amd\"" >&6;}
     
    2257222870# check was performed. Skipping means the user said `don't use.'
    2257322871
    22574 # Change the test to enable / disable debugging output
    22575 
    22576     if test 1 = 1 ; then
     22872# Define BUILDTOOLS_DEBUG to enable debugging output
     22873
     22874    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2257722875      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_LIB result for cholmod: \"$coin_has_cholmod\"" >&5
    2257822876$as_echo "$as_me: FIND_PRIM_LIB result for cholmod: \"$coin_has_cholmod\"" >&6;}
     
    2263122929
    2263222930
    22633 # Glpk also brings AMD  (FIXME: Glpk installs amd.h only if build via ThirdParty/Glpk)
     22931# ThirdParty/Glpk also brings AMD and will install amd.h. Note that a standard
     22932# package for glpk does not install amd.h.
    2263422933
    2263522934if test $coin_has_cholmod = no -a $coin_has_amd = no ; then
     
    2279323092    requested | build )
    2279423093      if test -n "$PKG_CONFIG" ; then
    22795         pcfile=coinglpk
     23094        pcfile="coinglpk"
    2279623095
    2279723096
     
    2280123100      GLPK_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2280223101      coin_has_glpk=yes
    22803            glpk_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     23102           glpk_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2280423103           glpk_pcfiles="$pcfile"
    2280523104    else
     
    2282923128# from pkgconfig. Note that we haven't run a useability test!
    2283023129
    22831 # Change the test to enable / disable debugging output
    22832 
    22833     if test 1 = 1 ; then
     23130# Define BUILDTOOLS_DEBUG to enable debugging output
     23131
     23132    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2283423133      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for glpk: \"$coin_has_glpk\"" >&5
    2283523134$as_echo "$as_me: FIND_PRIM_PKG result for glpk: \"$coin_has_glpk\"" >&6;}
     
    2288923188
    2289023189  if test $coin_has_glpk = yes ; then
    22891     { $as_echo "$as_me:${as_lineno-$LINENO}: using AMD from GLPK package" >&5
    22892 $as_echo "$as_me: using AMD from GLPK package" >&6;}
     23190    { $as_echo "$as_me:${as_lineno-$LINENO}: using AMD from ThirdParty/GLPK package" >&5
     23191$as_echo "$as_me: using AMD from ThirdParty/GLPK package" >&6;}
    2289323192
    2289423193$as_echo "#define COIN_HAS_AMD 1" >>confdefs.h
     
    2290723206fi
    2290823207
    22909 # MUMPS
    22910 
    22911 
    22912 
    22913   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for package Mumps" >&5
    22914 $as_echo_n "checking for package Mumps... " >&6; }
     23208# MUMPS. Check first for ThirdParty/MUMPS, on the assumption that if the user
     23209# bothered to build it, we should use it. If it's not present, try for a
     23210# system installation. If we find it, define CLP_HAS_MUMPS for export to code
     23211# using clp.
     23212
     23213
     23214
     23215
     23216  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for package MUMPS" >&5
     23217$as_echo_n "checking for package MUMPS... " >&6; }
    2291523218
    2291623219# Make sure the necessary variables exist for each client package.
     
    2306723370    requested | build )
    2306823371      if test -n "$PKG_CONFIG" ; then
    23069         pcfile=coinmumps
     23372        pcfile="coinmumps"
    2307023373
    2307123374
     
    2307523378      MUMPS_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2307623379      coin_has_mumps=yes
    23077            mumps_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     23380           mumps_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2307823381           mumps_pcfiles="$pcfile"
    2307923382    else
     
    2310323406# from pkgconfig. Note that we haven't run a useability test!
    2310423407
    23105 # Change the test to enable / disable debugging output
    23106 
    23107     if test 1 = 1 ; then
     23408# Define BUILDTOOLS_DEBUG to enable debugging output
     23409
     23410    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2310823411      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for mumps: \"$coin_has_mumps\"" >&5
    2310923412$as_echo "$as_me: FIND_PRIM_PKG result for mumps: \"$coin_has_mumps\"" >&6;}
     
    2316223465  fi
    2316323466
     23467if test $coin_has_mumps = no ; then
     23468
     23469  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for package MUMPS" >&5
     23470$as_echo_n "checking for package MUMPS... " >&6; }
     23471
     23472# Make sure the necessary variables exist for each client package.
     23473
     23474
     23475
     23476
     23477
     23478# Check to see if the user has overridden configure parameters from the
     23479# environment.
     23480
     23481  coin_has_mumps=noInfo
     23482  if test x"$COIN_SKIP_PROJECTS" != x ; then
     23483    for pkg in $COIN_SKIP_PROJECTS ; do
     23484      if test "$pkg" = "$mumps" ; then
     23485        coin_has_mumps=skipping
     23486      fi
     23487    done
     23488  fi
     23489
     23490# If we're not skipping this project, define and process the command line
     23491# options according to the cmdopts parameter. Then invoke FIND_PRIM_PKG to do
     23492# the heavy lifting.
     23493
     23494  if test "$coin_has_mumps" != skipping ; then
     23495
     23496
     23497
     23498
     23499# Check whether --with-mumps was given.
     23500if test "${with_mumps+set}" = set; then :
     23501  withval=$with_mumps;
     23502fi
     23503
     23504
     23505
     23506# Check whether --with-mumps-lflags was given.
     23507if test "${with_mumps_lflags+set}" = set; then :
     23508  withval=$with_mumps_lflags;
     23509fi
     23510
     23511
     23512
     23513# Check whether --with-mumps-cflags was given.
     23514if test "${with_mumps_cflags+set}" = set; then :
     23515  withval=$with_mumps_cflags;
     23516fi
     23517
     23518
     23519
     23520
     23521
     23522  dflt_action=yes
     23523
     23524# Initialize variables for the primary library.
     23525
     23526  coin_has_mumps=noInfo
     23527  mumps_lflags=
     23528  mumps_cflags=
     23529  mumps_data=
     23530
     23531# --with-prim is always present. If the client specified dataonly, its value
     23532# is assigned to prim_data.
     23533
     23534  withval=$with_mumps
     23535  if test -n "$withval" ; then
     23536    case "$withval" in
     23537      no )
     23538        coin_has_mumps=skipping
     23539        ;;
     23540      yes )
     23541        coin_has_mumps=requested
     23542        ;;
     23543      build )
     23544        coin_has_mumps=build
     23545        ;;
     23546      * )
     23547        coin_has_mumps=yes
     23548        mumps_lflags=$withval
     23549        ;;
     23550    esac
     23551  fi
     23552
     23553# --with-prim-lflags and --with-prim-cflags are present unless the client
     23554# specified dataonly. Specifying --with-prim=no overrides the individual
     23555# options for lflags and cflags.
     23556
     23557  if test "$coin_has_mumps" != skipping ; then
     23558       withval=$with_mumps_lflags
     23559       if test -n "$withval" ; then
     23560         case "$withval" in
     23561           build | no | yes )
     23562             as_fn_error $? "\"$withval\" is not valid here; please specify linker flags appropriate for your environment." "$LINENO" 5
     23563             ;;
     23564           * )
     23565             coin_has_mumps=yes
     23566             mumps_lflags=$withval
     23567             ;;
     23568         esac
     23569       fi
     23570
     23571       withval=$with_mumps_cflags
     23572       if test -n "$withval" ; then
     23573         case "$withval" in
     23574           build | no | yes )
     23575             as_fn_error $? "\"$withval\" is not valid here; please specify compiler flags appropriate for your environment." "$LINENO" 5
     23576             ;;
     23577           * )
     23578             coin_has_mumps=yes
     23579             mumps_cflags="$withval"
     23580             ;;
     23581         esac
     23582       fi
     23583     fi
     23584
     23585# --with-prim-data will be present unless the client specified nodata.
     23586# Specifying --with-prim=no overrides the individual option for data.
     23587
     23588
     23589
     23590# At this point, coin_has_prim can be one of noInfo (no user options
     23591# specified), skipping (user said no), requested or build (user said yes
     23592# or build and gave no further guidance), or yes (user specified one or
     23593# more --with-prim options). If we're already at yes or skipping, we're
     23594# done looking.
     23595
     23596# If there are no user options (noInfo) and the default is no, we're skipping.
     23597# Otherwise, the default must be yes or build; consider the package requested.
     23598# A default action we don't recognise defaults to yes.
     23599
     23600  if test "$coin_has_mumps" = noInfo ; then
     23601    case $dflt_action in
     23602      no )
     23603        coin_has_mumps=skipping
     23604        ;;
     23605      build )
     23606        coin_has_mumps=build
     23607        ;;
     23608      * )
     23609        coin_has_mumps=requested
     23610        ;;
     23611    esac
     23612  fi
     23613
     23614# Now coin_has_prim can be one of skipping, yes, build, or requested. For
     23615# build or requested, use the parameter values or invent some.
     23616
     23617  case $coin_has_mumps in
     23618    build | requested)
     23619      mumps_lflags=-ldmumps
     23620         mumps_cflags=-I/usr/include/MUMPS
     23621
     23622      coin_has_mumps=yes
     23623      ;;
     23624    skipping | yes )
     23625      ;;
     23626    * )
     23627      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unexpected status \"$coin_has_mumps\" in COIN_FIND_PRIM_LIB" >&5
     23628$as_echo "$as_me: WARNING: Unexpected status \"$coin_has_mumps\" in COIN_FIND_PRIM_LIB" >&2;}
     23629      ;;
     23630  esac
     23631
     23632# At this point, coin_has_prim is yes or skipping.  Time to run a link check,
     23633# if we have a function (dmumps_c). Use whatever we've collected for lflags, plus
     23634# other libraries () as the other libraries parameter to AC_SEARCH_LIBS,
     23635# leaving the library parameter blank.
     23636
     23637  if test $coin_has_mumps != skipping ; then
     23638    ac_save_LIBS=$LIBS
     23639       LIBS="$mumps_lflags "
     23640       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     23641/* end confdefs.h.  */
     23642#ifdef __cplusplus
     23643             extern "C"
     23644           #endif
     23645           void dmumps_c();
     23646#ifdef F77_DUMMY_MAIN
     23647
     23648#  ifdef __cplusplus
     23649     extern "C"
     23650#  endif
     23651   int F77_DUMMY_MAIN() { return 1; }
     23652
     23653#endif
     23654int
     23655main ()
     23656{
     23657dmumps_c()
     23658  ;
     23659  return 0;
     23660}
     23661_ACEOF
     23662if ac_fn_cxx_try_link "$LINENO"; then :
     23663
     23664else
     23665  coin_has_mumps=no
     23666fi
     23667rm -f core conftest.err conftest.$ac_objext \
     23668    conftest$ac_exeext conftest.$ac_ext
     23669       LIBS=$ac_save_LIBS
     23670  fi
     23671
     23672# The final value of coin_has_prim will be yes, no, or skipping. No means that
     23673# the link check failed. Yes means that we passed the link check, or no link
     23674# check was performed. Skipping means the user said `don't use.'
     23675
     23676# Define BUILDTOOLS_DEBUG to enable debugging output
     23677
     23678    if test "$BUILDTOOLS_DEBUG" = 1 ; then
     23679      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_LIB result for mumps: \"$coin_has_mumps\"" >&5
     23680$as_echo "$as_me: FIND_PRIM_LIB result for mumps: \"$coin_has_mumps\"" >&6;}
     23681      { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'mumps'" >&5
     23682$as_echo "$as_me: Collected values for package 'mumps'" >&6;}
     23683      { $as_echo "$as_me:${as_lineno-$LINENO}: mumps_lflags is \"$mumps_lflags\"" >&5
     23684$as_echo "$as_me: mumps_lflags is \"$mumps_lflags\"" >&6;}
     23685      { $as_echo "$as_me:${as_lineno-$LINENO}: mumps_cflags is \"$mumps_cflags\"" >&5
     23686$as_echo "$as_me: mumps_cflags is \"$mumps_cflags\"" >&6;}
     23687      { $as_echo "$as_me:${as_lineno-$LINENO}: mumps_data is \"$mumps_data\"" >&5
     23688$as_echo "$as_me: mumps_data is \"$mumps_data\"" >&6;}
     23689      { $as_echo "$as_me:${as_lineno-$LINENO}: mumps_pcfiles is \"$mumps_pcfiles\"" >&5
     23690$as_echo "$as_me: mumps_pcfiles is \"$mumps_pcfiles\"" >&6;}
     23691    fi
     23692
     23693
     23694    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_mumps" >&5
     23695$as_echo "$coin_has_mumps" >&6; }
     23696  else
     23697    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_mumps due to COIN_SKIP_PROJECTS" >&5
     23698$as_echo "$coin_has_mumps due to COIN_SKIP_PROJECTS" >&6; }
     23699  fi
     23700
     23701# Possibilities are `yes', `no', or `skipping'. Normalise to `yes' or `no'.
     23702
     23703  if test "$coin_has_mumps" != yes ; then
     23704    coin_has_mumps=no
     23705  fi
     23706
     23707# Create an automake conditional COIN_HAS_PRIM.
     23708
     23709   if test $coin_has_mumps = yes; then
     23710  COIN_HAS_MUMPS_TRUE=
     23711  COIN_HAS_MUMPS_FALSE='#'
     23712else
     23713  COIN_HAS_MUMPS_TRUE='#'
     23714  COIN_HAS_MUMPS_FALSE=
     23715fi
     23716
     23717
     23718# If we've located the package, define preprocessor symbol COIN_HAS_PRIM
     23719# and augment the necessary variables for the client packages.
     23720
     23721  if test $coin_has_mumps = yes ; then
     23722
     23723$as_echo "#define COIN_HAS_MUMPS 1" >>confdefs.h
     23724
     23725    CLPLIB_LFLAGS="$mumps_lflags $CLPLIB_LFLAGS"
     23726       CLPLIB_CFLAGS="$mumps_cflags $CLPLIB_CFLAGS"
     23727
     23728
     23729# Finally, set up PRIM_DATA, unless the user specified nodata.
     23730
     23731
     23732  fi
     23733
     23734fi
    2316423735if test $coin_has_mumps = yes ; then
    2316523736
     
    2338423955# check was performed. Skipping means the user said `don't use.'
    2338523956
    23386 # Change the test to enable / disable debugging output
    23387 
    23388     if test 1 = 1 ; then
     23957# Define BUILDTOOLS_DEBUG to enable debugging output
     23958
     23959    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2338923960      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_LIB result for wsmp: \"$coin_has_wsmp\"" >&5
    2339023961$as_echo "$as_me: FIND_PRIM_LIB result for wsmp: \"$coin_has_wsmp\"" >&6;}
     
    2360624177      BLAS_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2360724178      coin_has_blas=yes
    23608            blas_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     24179           blas_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2360924180           blas_pcfiles="$pcfile"
    2361024181    else
     
    2363424205# from pkgconfig. Note that we haven't run a useability test!
    2363524206
    23636 # Change the test to enable / disable debugging output
    23637 
    23638     if test 1 = 1 ; then
     24207# Define BUILDTOOLS_DEBUG to enable debugging output
     24208
     24209    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2363924210      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for blas: \"$coin_has_blas\"" >&5
    2364024211$as_echo "$as_me: FIND_PRIM_PKG result for blas: \"$coin_has_blas\"" >&6;}
     
    2569026261    requested | build )
    2569126262      if test -n "$PKG_CONFIG" ; then
    25692         pcfile=coinasl
     26263        pcfile="coinasl"
    2569326264
    2569426265
     
    2569826269      ASL_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "$pcfile" 2>/dev/null | tr '\n' ' '`
    2569926270      coin_has_asl=yes
    25700            asl_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     26271           asl_data=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir "$pcfile" 2>/dev/null`
    2570126272           asl_pcfiles="$pcfile"
    2570226273    else
     
    2572626297# from pkgconfig. Note that we haven't run a useability test!
    2572726298
    25728 # Change the test to enable / disable debugging output
    25729 
    25730     if test 1 = 1 ; then
     26299# Define BUILDTOOLS_DEBUG to enable debugging output
     26300
     26301    if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2573126302      { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for asl: \"$coin_has_asl\"" >&5
    2573226303$as_echo "$as_me: FIND_PRIM_PKG result for asl: \"$coin_has_asl\"" >&6;}
     
    2625126822# Finalize libs and cflags.
    2625226823
    26253    if test 1 = 1 ; then
     26824   if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2625426825        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for ClpLib:" >&5
    2625526826$as_echo "$as_me: FINALIZE_FLAGS for ClpLib:" >&6;}
     
    2626626837      fi
    2626726838
    26268 # Change the test to enable / disable debugging output
    26269 
    26270       if test 1 = 1 ; then
     26839      # setup XYZ_EXPORT symbol for library users
     26840      libexport_attribute=
     26841      if test "$enable_shared" = yes ; then
     26842        # TODO better check for this? we essentially want to know whether we're building DLLs
     26843        # or do we also need this for GCC on Windows?
     26844        case $CC in */compile\ cl | cl | */cl | */compile\ icl | icl | */icl )
     26845          libexport_attribute="__declspec(dllimport)"
     26846        esac
     26847      fi
     26848
     26849cat >>confdefs.h <<_ACEOF
     26850#define CLPLIB_EXPORT $libexport_attribute
     26851_ACEOF
     26852
     26853
     26854# Define BUILDTOOLS_DEBUG to enable debugging output
     26855
     26856      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2627126857        { $as_echo "$as_me:${as_lineno-$LINENO}: CLPLIB_LFLAGS_NOPC: \"${CLPLIB_LFLAGS_NOPC}\"" >&5
    2627226858$as_echo "$as_me: CLPLIB_LFLAGS_NOPC: \"${CLPLIB_LFLAGS_NOPC}\"" >&6;}
     
    2628026866$as_echo "$as_me: CLPLIB_CFLAGS: \"${CLPLIB_CFLAGS}\"" >&6;}
    2628126867      fi
    26282      if test 1 = 1 ; then
     26868     if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2628326869        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for OsiClpLib:" >&5
    2628426870$as_echo "$as_me: FINALIZE_FLAGS for OsiClpLib:" >&6;}
     
    2629526881      fi
    2629626882
    26297 # Change the test to enable / disable debugging output
    26298 
    26299       if test 1 = 1 ; then
     26883      # setup XYZ_EXPORT symbol for library users
     26884      libexport_attribute=
     26885      if test "$enable_shared" = yes ; then
     26886        # TODO better check for this? we essentially want to know whether we're building DLLs
     26887        # or do we also need this for GCC on Windows?
     26888        case $CC in */compile\ cl | cl | */cl | */compile\ icl | icl | */icl )
     26889          libexport_attribute="__declspec(dllimport)"
     26890        esac
     26891      fi
     26892
     26893cat >>confdefs.h <<_ACEOF
     26894#define OSICLPLIB_EXPORT $libexport_attribute
     26895_ACEOF
     26896
     26897
     26898# Define BUILDTOOLS_DEBUG to enable debugging output
     26899
     26900      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2630026901        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPLIB_LFLAGS_NOPC: \"${OSICLPLIB_LFLAGS_NOPC}\"" >&5
    2630126902$as_echo "$as_me: OSICLPLIB_LFLAGS_NOPC: \"${OSICLPLIB_LFLAGS_NOPC}\"" >&6;}
     
    2630926910$as_echo "$as_me: OSICLPLIB_CFLAGS: \"${OSICLPLIB_CFLAGS}\"" >&6;}
    2631026911      fi
    26311      if test 1 = 1 ; then
     26912     if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2631226913        { $as_echo "$as_me:${as_lineno-$LINENO}: FINALIZE_FLAGS for OsiClpUnitTest:" >&5
    2631326914$as_echo "$as_me: FINALIZE_FLAGS for OsiClpUnitTest:" >&6;}
     
    2632426925      fi
    2632526926
    26326 # Change the test to enable / disable debugging output
    26327 
    26328       if test 1 = 1 ; then
     26927      # setup XYZ_EXPORT symbol for library users
     26928      libexport_attribute=
     26929      if test "$enable_shared" = yes ; then
     26930        # TODO better check for this? we essentially want to know whether we're building DLLs
     26931        # or do we also need this for GCC on Windows?
     26932        case $CC in */compile\ cl | cl | */cl | */compile\ icl | icl | */icl )
     26933          libexport_attribute="__declspec(dllimport)"
     26934        esac
     26935      fi
     26936
     26937cat >>confdefs.h <<_ACEOF
     26938#define OSICLPUNITTEST_EXPORT $libexport_attribute
     26939_ACEOF
     26940
     26941
     26942# Define BUILDTOOLS_DEBUG to enable debugging output
     26943
     26944      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2632926945        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICLPUNITTEST_LFLAGS_NOPC: \"${OSICLPUNITTEST_LFLAGS_NOPC}\"" >&5
    2633026946$as_echo "$as_me: OSICLPUNITTEST_LFLAGS_NOPC: \"${OSICLPUNITTEST_LFLAGS_NOPC}\"" >&6;}
     
    2635526971       OSICLPLIB_CFLAGS="$OSICLPLIB_CFLAGS $CLPLIB_CFLAGS"
    2635626972
    26357 # Change the test to enable / disable debugging output
    26358 
    26359        if test 1 = 1 ; then
     26973# Define BUILDTOOLS_DEBUG to enable debugging output
     26974
     26975       if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2636026976         { $as_echo "$as_me:${as_lineno-$LINENO}: CHK_HERE adding ClpLib to OsiClpLib:" >&5
    2636126977$as_echo "$as_me: CHK_HERE adding ClpLib to OsiClpLib:" >&6;}
     
    2657727193if test -z "${COIN_HAS_GLPK_TRUE}" && test -z "${COIN_HAS_GLPK_FALSE}"; then
    2657827194  as_fn_error $? "conditional \"COIN_HAS_GLPK\" was never defined.
     27195Usually this means the macro was only invoked conditionally." "$LINENO" 5
     27196fi
     27197if test -z "${COIN_HAS_MUMPS_TRUE}" && test -z "${COIN_HAS_MUMPS_FALSE}"; then
     27198  as_fn_error $? "conditional \"COIN_HAS_MUMPS\" was never defined.
    2657927199Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2658027200fi
     
    2722227842macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
    2722327843macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
    27224 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    2722527844enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    2722627845pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
     27846AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
     27847DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
     27848OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
     27849enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    2722727850enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
    2722827851shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
     
    2725427877reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
    2725527878reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
    27256 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
    2725727879deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
    2725827880file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
    2725927881file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
    2726027882want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
    27261 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
    2726227883sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
    2726327884AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
     
    2747128092
    2747228093# Quote evaled strings.
    27473 for var in SHELL \
     28094for var in AS \
     28095DLLTOOL \
     28096OBJDUMP \
     28097SHELL \
    2747428098ECHO \
    2747528099PATH_SEPARATOR \
     
    2748428108lt_NL2SP \
    2748528109reload_flag \
    27486 OBJDUMP \
    2748728110deplibs_check_method \
    2748828111file_magic_cmd \
    2748928112file_magic_glob \
    2749028113want_nocaseglob \
    27491 DLLTOOL \
    2749228114sharedlib_from_linklib_cmd \
    2749328115AR \
     
    2844429066macro_revision=$macro_revision
    2844529067
     29068# Whether or not to build static libraries.
     29069build_old_libs=$enable_static
     29070
     29071# What type of objects to build.
     29072pic_mode=$pic_mode
     29073
     29074# Assembler program.
     29075AS=$lt_AS
     29076
     29077# DLL creation program.
     29078DLLTOOL=$lt_DLLTOOL
     29079
     29080# Object dumper program.
     29081OBJDUMP=$lt_OBJDUMP
     29082
    2844629083# Whether or not to build shared libraries.
    2844729084build_libtool_libs=$enable_shared
    28448 
    28449 # Whether or not to build static libraries.
    28450 build_old_libs=$enable_static
    28451 
    28452 # What type of objects to build.
    28453 pic_mode=$pic_mode
    2845429085
    2845529086# Whether or not to optimize for fast installation.
     
    2852329154to_tool_file_cmd=$lt_cv_to_tool_file_cmd
    2852429155
    28525 # An object symbol dumper.
    28526 OBJDUMP=$lt_OBJDUMP
    28527 
    2852829156# Method to check whether dependent libraries are shared objects.
    2852929157deplibs_check_method=$lt_deplibs_check_method
     
    2853729165# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
    2853829166want_nocaseglob=$lt_want_nocaseglob
    28539 
    28540 # DLL creation program.
    28541 DLLTOOL=$lt_DLLTOOL
    2854229167
    2854329168# Command to associate shared and link libraries.
  • branches/autotools-update/Clp/configure.ac

    r2351 r2362  
    111111                [cholmod_start])
    112112
    113 # Glpk also brings AMD  (FIXME: Glpk installs amd.h only if build via ThirdParty/Glpk)
     113# ThirdParty/Glpk also brings AMD and will install amd.h. Note that a standard
     114# package for glpk does not install amd.h.
    114115
    115116if test $coin_has_cholmod = no -a $coin_has_amd = no ; then
    116117  AC_COIN_CHK_PKG(Glpk,[ClpLib],[coinglpk])
    117118  if test $coin_has_glpk = yes ; then
    118     AC_MSG_NOTICE([using AMD from GLPK package])
     119    AC_MSG_NOTICE([using AMD from ThirdParty/GLPK package])
    119120    AC_DEFINE(COIN_HAS_AMD,[1],[Define to 1 if the AMD package is available])
    120121  fi
     
    124125fi
    125126
    126 # MUMPS
    127 AC_COIN_CHK_PKG(Mumps,[ClpLib],[coinmumps])
     127# MUMPS. Check first for ThirdParty/MUMPS, on the assumption that if the user
     128# bothered to build it, we should use it. If it's not present, try for a
     129# system installation. If we find it, define CLP_HAS_MUMPS for export to code
     130# using clp.
     131
     132AC_COIN_CHK_PKG(MUMPS,[ClpLib],[coinmumps])
     133if test $coin_has_mumps = no ; then
     134  AC_COIN_CHK_LIB(MUMPS,[ClpLib],[-ldmumps],[-I/usr/include/MUMPS],[],
     135                  [dmumps_c])
     136fi
    128137if test $coin_has_mumps = yes ; then
    129   AC_DEFINE(CLP_HAS_MUMPS, [1], [Define to 1 if MUMPS package is available])
     138  AC_DEFINE(CLP_HAS_MUMPS,[1],
     139            [Define to 1 if the MUMPS package is available.])
    130140fi
    131141
  • branches/autotools-update/Clp/get.dependencies.sh

    r2355 r2362  
    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/Clp/ltmain.sh

    r2310 r2362  
    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/Clp/src

  • branches/autotools-update/Clp/src/CbcOrClpParam.cpp

    r2345 r2362  
    29952995     parameters[numberParameters-1].append("strong");
    29962996     parameters[numberParameters-1].append("force");
     2997     parameters[numberParameters-1].append("simple");
    29972998     parameters[numberParameters-1].setLonghelp
    29982999     (
     
    30003001On just adds orbital, strong tries extra fixing in strong branching");
    30013002#endif
     3003     parameters[numberParameters++] =
     3004          CbcOrClpParam("PrepN!ames", "If column names will be kept in pre-processed model",
     3005                        "off", CBC_PARAM_STR_PREPROCNAMES);
     3006     parameters[numberParameters-1].append("on");
     3007     parameters[numberParameters-1].setLonghelp
     3008     (
     3009           "Normally the preprocessed model has column names replaced by new names C0000...\
     3010Setting this option to on keeps original names in variables which still exist in the preprocessed problem");
     3011
    30023012     parameters[numberParameters++] =
    30033013          CbcOrClpParam("outDup!licates", "takes duplicate rows etc out of integer model",
  • branches/autotools-update/Clp/src/CbcOrClpParam.hpp

    r2312 r2362  
    224224     CBC_PARAM_STR_DW,
    225225     CBC_PARAM_STR_ORBITAL,
     226     CBC_PARAM_STR_PREPROCNAMES,
    226227
    227228     CLP_PARAM_ACTION_DIRECTORY = 301,
  • branches/autotools-update/Clp/src/ClpPresolve.cpp

    r2312 r2362  
    16671667{
    16681668     bulk0_ = static_cast<CoinBigIndex> (bulkRatio_ *
    1669                                          CoinMax(nelems_in,nelems_));
     1669                                         CoinMax(nelems_in,nelems_)
     1670                                         +ncols_in);
    16701671     // allow for temporary overflow
    16711672     hrow_  = new int   [bulk0_+ncols_in];
  • branches/autotools-update/Clp/src/Makefile.in

    r2352 r2362  
    401401AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
    402402AR = @AR@
     403AS = @AS@
    403404AUTOCONF = @AUTOCONF@
    404405AUTOHEADER = @AUTOHEADER@
  • branches/autotools-update/Clp/src/OsiClp/Makefile.in

    r2355 r2362  
    244244AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
    245245AR = @AR@
     246AS = @AS@
    246247AUTOCONF = @AUTOCONF@
    247248AUTOHEADER = @AUTOHEADER@
  • branches/autotools-update/Clp/src/config.h.in

    r2345 r2362  
    11/* src/config.h.in.  Generated from configure.ac by autoheader.  */
     2
     3/* Library Visibility Attribute */
     4#undef CLPLIB_EXPORT
    25
    36/* Define to 1, 2, 3, or 4 if Aboca should be built. */
    47#undef CLP_HAS_ABC
    58
    6 /* Define to 1 if MUMPS package is available */
     9/* Define to 1 if the MUMPS package is available. */
    710#undef CLP_HAS_MUMPS
    811
     
    4043#undef COIN_HAS_GLPK
    4144
    42 /* Define to 1 if Mumps is available. */
     45/* Define to 1 if the MUMPS package is available */
    4346#undef COIN_HAS_MUMPS
    4447
     
    135138#undef LT_OBJDIR
    136139
     140/* Library Visibility Attribute */
     141#undef OSICLPLIB_EXPORT
     142
     143/* Library Visibility Attribute */
     144#undef OSICLPUNITTEST_EXPORT
     145
    137146/* Define to the address where bug reports for this package should be sent. */
    138147#undef PACKAGE_BUGREPORT
  • branches/autotools-update/Clp/src/config_clp.h.in

    r2345 r2362  
    11/* src/config_clp.h.in.  */
    22
    3 /* Define to 1, 2, 3, or 4 if Aboca should be build. */
     3/* Define to 1, 2, 3, or 4 if Aboca should be built. */
    44#undef CLP_HAS_ABC
    55
  • branches/autotools-update/Clp/test/Makefile.in

    r2355 r2362  
    205205AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
    206206AR = @AR@
     207AS = @AS@
    207208AUTOCONF = @AUTOCONF@
    208209AUTOHEADER = @AUTOHEADER@
Note: See TracChangeset for help on using the changeset viewer.