Changes from releases/0.9.0 at r1595 to releases/0.9.1 at r1595


Ignore:
Location:
releases/0.9.1
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • releases/0.9.1/Dip

  • releases/0.9.1/Dip/configure

    r1595 r1595  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for Dip 0.9.0.
     3# Generated by GNU Autoconf 2.59 for Dip 0.9.1.
    44#
    55# Report bugs to <dip@lists.coin-or.org>.
    … …  
    441441PACKAGE_NAME='Dip'
    442442PACKAGE_TARNAME='dip'
    443 PACKAGE_VERSION='0.9.0'
    444 PACKAGE_STRING='Dip 0.9.0'
     443PACKAGE_VERSION='0.9.1'
     444PACKAGE_STRING='Dip 0.9.1'
    445445PACKAGE_BUGREPORT='dip@lists.coin-or.org'
    446446
    … …  
    10171017  # This message is too long to be a string in the A/UX 3.1 sh.
    10181018  cat <<_ACEOF
    1019 \`configure' configures Dip 0.9.0 to adapt to many kinds of systems.
     1019\`configure' configures Dip 0.9.1 to adapt to many kinds of systems.
    10201020
    10211021Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    10831083if test -n "$ac_init_help"; then
    10841084  case $ac_init_help in
    1085      short | recursive ) echo "Configuration of Dip 0.9.0:";;
     1085     short | recursive ) echo "Configuration of Dip 0.9.1:";;
    10861086   esac
    10871087  cat <<\_ACEOF
    … …  
    12911291if $ac_init_version; then
    12921292  cat <<\_ACEOF
    1293 Dip configure 0.9.0
     1293Dip configure 0.9.1
    12941294generated by GNU Autoconf 2.59
    12951295
    … …  
    13221322running configure, to aid debugging if configure makes a mistake.
    13231323
    1324 It was created by Dip $as_me 0.9.0, which was
     1324It was created by Dip $as_me 0.9.1, which was
    13251325generated by GNU Autoconf 2.59.  Invocation command line was
    13261326
    … …  
    18481848
    18491849# Capture libtool library version, if given.
    1850  coin_libversion=2:0:1
     1850 coin_libversion=2:1:1
    18511851
    18521852
    … …  
    47414741# Define the identity of the package.
    47424742 PACKAGE='dip'
    4743  VERSION='0.9.0'
     4743 VERSION='0.9.1'
    47444744
    47454745
    … …  
    2585025850cat >&5 <<_CSEOF
    2585125851
    25852 This file was extended by Dip $as_me 0.9.0, which was
     25852This file was extended by Dip $as_me 0.9.1, which was
    2585325853generated by GNU Autoconf 2.59.  Invocation command line was
    2585425854
    … …  
    2591625916cat >>$CONFIG_STATUS <<_ACEOF
    2591725917ac_cs_version="\\
    25918 Dip config.status 0.9.0
     25918Dip config.status 0.9.1
    2591925919configured by $0, generated by GNU Autoconf 2.59,
    2592025920  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • releases/0.9.1/Dip/configure.ac

    r1595 r1595  
    2121
    2222# name of project, version number, contact info
    23 AC_INIT([Dip],[0.9.0],[dip@lists.coin-or.org])
     23AC_INIT([Dip],[0.9.1],[dip@lists.coin-or.org])
    2424
    2525# copyright for configure script
    … …  
    6161# externals.  The following macro ensures that those externals are
    6262# retrieved by svn if they are not there yet.
    63 AC_COIN_PROJECTDIR_INIT(Dip,2:0:1)
     63AC_COIN_PROJECTDIR_INIT(Dip,2:1:1)
    6464
    6565# Check if user wants to produce debugging code

  • releases/0.9.1/Dip/setup.py

    r1595 r1595  
    88
    99PROJECT = 'dippy'
    10 VERSION = '1.9.0'
     10VERSION = '1.9.1'
    1111URL = 'https://projects.coin-or.org/Dip/wiki/Dippy'
    1212AUTHOR_EMAIL = u''
    … …  
    3737            libs = [flag[2:] for flag in link_line.split() if
    3838                    flag.startswith('-l')]
     39    return libs
     40
     41def get_lib_dirs(dir):
     42    '''
     43    Return a list of library directories.
     44    '''
     45    with open(join(dir, 'share', 'coin',
     46                   'doc', 'Dip', 'dip_addlibs.txt')) as f:
     47        link_line = f.read()
     48        libs = [flag[2:] for flag in link_line.split() if
     49                flag.startswith('-L')]
    3950    return libs
    4051
    … …  
    6980sources = [join('src/dippy', f) for f in files]
    7081
    71 lib_dirs = [join(coin_install_dir, 'lib', 'intel'),
    72             join(coin_install_dir, 'lib')]
     82lib_dirs = get_lib_dirs(coin_install_dir)
     83lib_dirs.append(join(coin_install_dir, 'lib'))
     84if operatingSystem is 'windows':
     85    lib_dirs.append(join(coin_install_dir, 'lib', 'intel'))
    7386
    7487modules=[Extension('_dippy',
    … …  
    90103      packages=['dippy'],
    91104      package_dir = {'': 'src'},
    92       install_requires=['coinor.pulp'],
     105      install_requires=['coinor.pulp','coinor.gimpy'],
    93106      ext_modules=modules
    94107     )

  • releases/0.9.1/Dip/src

  • releases/0.9.1/Dip/src/config_dip_default.h

    r1595 r1595  
    2020
    2121/* Version number of project */
    22 #define DIP_VERSION "0.9.0"
     22#define DIP_VERSION "0.9.1"
    2323
    2424/* Major Version number of project */
    … …  
    2929
    3030/* Release Version number of project */
    31 #define DIP_VERSION_RELEASE 0
     31#define DIP_VERSION_RELEASE 1
    3232

  • releases/0.9.1/Dip/src/dippy/dippy.py

    r1595 r1595  
    468468        # explicit bounds
    469469        if mip:
    470             vg = [v for v in vs if not (v.isPositive() and v.cat == LpContinuous) \
     470            vg = [v for v in vs if not (v.isPositive() and v.cat == pulp.LpContinuous) \
    471471                and not v.isBinary()]
    472472        else:

  • releases/0.9.1/INSTALL

    r1595 r1595  
    2828   client TortoiseSVN (http://tortoisesvn.net).
    2929
    30    Assuming that you want to download a release version 0.9.0, as an example,
     30   Assuming that you want to download a release version 0.82.0, as an example,
    3131   you would execute the command
    3232
    33    svn co https://projects.coin-or.org/svn/Dip/releases/0.9.0 Dip-0.9.0
     33   svn co https://projects.coin-or.org/svn/Cbc/releases/0.82.0 Cbc-0.82.0
    3434
    3535   You can similarly get source for the latest stable version or the trunk
    3636   (development) version.
    3737
    38 2. Download the tarball from http://www.coin-or.org/download/source/Dip
    39    and extract it. For example, for the release 0.9.0 you type
     382. Download the tarball from http://www.coin-or.org/download/source/Cbc
     39   and extract it. For example, for the release 0.82.0 you type
    4040
    41    gunzip Dip-0.9.0.tgz
    42    tar xvf Dip-0.9.0.tar
     41   gunzip Dip-0.82.0.tgz
     42   tar xvf Dip-0.82.0.tar
    4343
    4444   More detailed download instructions can be found at
    … …  
    4848**********************************************************************
    4949
    50 Go into the directory that you just downloaded or extracted (e.g., Dip-0.9.0).
     50Go into the directory that you just downloaded or extracted (e.g., Cbc-2.7.0).
    5151Then create a build directory and configure the package by typing
    5252
    … …  
    6161   https://projects.coin-or.org/BuildTools/
    6262
    63 and the Dip Trac page
     63and the Cbc Trac page
    6464
    6565   https://projects.coin-or.org/Dip
    … …  
    9797
    9898**********************************************************************
    99 ***              BUILDING AND INSTALLING DIPPY                     ***
    100 **********************************************************************
    101 
    102 1. First, build and install Dip as above.
    103 
    104 2. Set the environment variable COIN_INSTALL_DIR to the location of the installation directory.
    105 
    106 3. Then either execute
    107 
    108 python setup.py install
    109 
    110 to build and install DipPy from source or
    111 
    112 pip install dippy
    113 
    114 **********************************************************************
    11599***                  DIP EXAMPLES                                  ***
    116100**********************************************************************

  • releases/0.9.1/README

    r1595 r1595  
    55each of the subdirectories give more information about these projects.
    66
     7test commit

  • releases/0.9.1/configure

    r1595 r1595  
    22# From configure.ac 0.8.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for Dip 0.9.0.
     4# Generated by GNU Autoconf 2.59 for Dip 0.9.1.
    55#
    66# Report bugs to <dip@lists.coin-or.org>.
    … …  
    442442PACKAGE_NAME='Dip'
    443443PACKAGE_TARNAME='dip'
    444 PACKAGE_VERSION='0.9.0'
    445 PACKAGE_STRING='Dip 0.9.0'
     444PACKAGE_VERSION='0.9.1'
     445PACKAGE_STRING='Dip 0.9.1'
    446446PACKAGE_BUGREPORT='dip@lists.coin-or.org'
    447447
    … …  
    495495ac_subdirs_all="$ac_subdirs_all Alps"
    496496ac_subdirs_all="$ac_subdirs_all Dip"
     497ac_subdirs_all="$ac_subdirs_all GiMPy"
     498ac_subdirs_all="$ac_subdirs_all GrUMPy"
    497499ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 ac_ct_F77 FFLAGS MPIF77 EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS COIN_SKIP_PROJECTS subdirs LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    498500ac_subst_files=''
    … …  
    10441046  # This message is too long to be a string in the A/UX 3.1 sh.
    10451047  cat <<_ACEOF
    1046 \`configure' configures Dip 0.9.0 to adapt to many kinds of systems.
     1048\`configure' configures Dip 0.9.1 to adapt to many kinds of systems.
    10471049
    10481050Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    11101112if test -n "$ac_init_help"; then
    11111113  case $ac_init_help in
    1112      short | recursive ) echo "Configuration of Dip 0.9.0:";;
     1114     short | recursive ) echo "Configuration of Dip 0.9.1:";;
    11131115   esac
    11141116  cat <<\_ACEOF
    … …  
    11821184  --with-dip-incdir directory with header files for using project Dip
    11831185  --with-dip-datadir directory with data files for using project Dip
     1186  --with-gimpy-lib linker flags for using project GiMPy
     1187  --with-gimpy-incdir directory with header files for using project GiMPy
     1188  --with-gimpy-datadir directory with data files for using project GiMPy
     1189  --with-grumpy-lib linker flags for using project GrUMPy
     1190  --with-grumpy-incdir directory with header files for using project GrUMPy
     1191  --with-grumpy-datadir directory with data files for using project GrUMPy
    11841192
    11851193Some influential environment variables:
    … …  
    13161324if $ac_init_version; then
    13171325  cat <<\_ACEOF
    1318 Dip configure 0.9.0
     1326Dip configure 0.9.1
    13191327generated by GNU Autoconf 2.59
    13201328
    … …  
    13471355running configure, to aid debugging if configure makes a mistake.
    13481356
    1349 It was created by Dip $as_me 0.9.0, which was
     1357It was created by Dip $as_me 0.9.1, which was
    13501358generated by GNU Autoconf 2.59.  Invocation command line was
    13511359
    … …  
    43594367
    43604368# Provide some information about the compiler.
    4361 echo "$as_me:4361:" \
     4369echo "$as_me:4369:" \
    43624370     "checking for Fortran 77 compiler version" >&5
    43634371ac_compiler=`set X $ac_compile; echo $2`
    … …  
    53515359# Define the identity of the package.
    53525360 PACKAGE='dip'
    5353  VERSION='0.9.0'
     5361 VERSION='0.9.1'
    53545362
    53555363
    … …  
    66476655*-*-irix6*)
    66486656  # Find out which ABI we are using.
    6649   echo '#line 6649 "configure"' > conftest.$ac_ext
     6657  echo '#line 6657 "configure"' > conftest.$ac_ext
    66506658  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    66516659  (eval $ac_compile) 2>&5
    … …  
    86118619   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    86128620   -e 's:$: $lt_compiler_flag:'`
    8613    (eval echo "\"\$as_me:8613: $lt_compile\"" >&5)
     8621   (eval echo "\"\$as_me:8621: $lt_compile\"" >&5)
    86148622   (eval "$lt_compile" 2>conftest.err)
    86158623   ac_status=$?
    86168624   cat conftest.err >&5
    8617    echo "$as_me:8617: \$? = $ac_status" >&5
     8625   echo "$as_me:8625: \$? = $ac_status" >&5
    86188626   if (exit $ac_status) && test -s "$ac_outfile"; then
    86198627     # The compiler can only warn and ignore the option if not recognized
    … …  
    88798887   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    88808888   -e 's:$: $lt_compiler_flag:'`
    8881    (eval echo "\"\$as_me:8881: $lt_compile\"" >&5)
     8889   (eval echo "\"\$as_me:8889: $lt_compile\"" >&5)
    88828890   (eval "$lt_compile" 2>conftest.err)
    88838891   ac_status=$?
    88848892   cat conftest.err >&5
    8885    echo "$as_me:8885: \$? = $ac_status" >&5
     8893   echo "$as_me:8893: \$? = $ac_status" >&5
    88868894   if (exit $ac_status) && test -s "$ac_outfile"; then
    88878895     # The compiler can only warn and ignore the option if not recognized
    … …  
    89838991   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    89848992   -e 's:$: $lt_compiler_flag:'`
    8985    (eval echo "\"\$as_me:8985: $lt_compile\"" >&5)
     8993   (eval echo "\"\$as_me:8993: $lt_compile\"" >&5)
    89868994   (eval "$lt_compile" 2>out/conftest.err)
    89878995   ac_status=$?
    89888996   cat out/conftest.err >&5
    8989    echo "$as_me:8989: \$? = $ac_status" >&5
     8997   echo "$as_me:8997: \$? = $ac_status" >&5
    89908998   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    89918999   then
    … …  
    1132811336  lt_status=$lt_dlunknown
    1132911337  cat > conftest.$ac_ext <<EOF
    11330 #line 11330 "configure"
     11338#line 11338 "configure"
    1133111339#include "confdefs.h"
    1133211340
    … …  
    1142811436  lt_status=$lt_dlunknown
    1142911437  cat > conftest.$ac_ext <<EOF
    11430 #line 11430 "configure"
     11438#line 11438 "configure"
    1143111439#include "confdefs.h"
    1143211440
    … …  
    1377213780   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1377313781   -e 's:$: $lt_compiler_flag:'`
    13774    (eval echo "\"\$as_me:13774: $lt_compile\"" >&5)
     13782   (eval echo "\"\$as_me:13782: $lt_compile\"" >&5)
    1377513783   (eval "$lt_compile" 2>conftest.err)
    1377613784   ac_status=$?
    1377713785   cat conftest.err >&5
    13778    echo "$as_me:13778: \$? = $ac_status" >&5
     13786   echo "$as_me:13786: \$? = $ac_status" >&5
    1377913787   if (exit $ac_status) && test -s "$ac_outfile"; then
    1378013788     # The compiler can only warn and ignore the option if not recognized
    … …  
    1387613884   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1387713885   -e 's:$: $lt_compiler_flag:'`
    13878    (eval echo "\"\$as_me:13878: $lt_compile\"" >&5)
     13886   (eval echo "\"\$as_me:13886: $lt_compile\"" >&5)
    1387913887   (eval "$lt_compile" 2>out/conftest.err)
    1388013888   ac_status=$?
    1388113889   cat out/conftest.err >&5
    13882    echo "$as_me:13882: \$? = $ac_status" >&5
     13890   echo "$as_me:13890: \$? = $ac_status" >&5
    1388313891   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1388413892   then
    … …  
    1544615454   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1544715455   -e 's:$: $lt_compiler_flag:'`
    15448    (eval echo "\"\$as_me:15448: $lt_compile\"" >&5)
     15456   (eval echo "\"\$as_me:15456: $lt_compile\"" >&5)
    1544915457   (eval "$lt_compile" 2>conftest.err)
    1545015458   ac_status=$?
    1545115459   cat conftest.err >&5
    15452    echo "$as_me:15452: \$? = $ac_status" >&5
     15460   echo "$as_me:15460: \$? = $ac_status" >&5
    1545315461   if (exit $ac_status) && test -s "$ac_outfile"; then
    1545415462     # The compiler can only warn and ignore the option if not recognized
    … …  
    1555015558   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1555115559   -e 's:$: $lt_compiler_flag:'`
    15552    (eval echo "\"\$as_me:15552: $lt_compile\"" >&5)
     15560   (eval echo "\"\$as_me:15560: $lt_compile\"" >&5)
    1555315561   (eval "$lt_compile" 2>out/conftest.err)
    1555415562   ac_status=$?
    1555515563   cat out/conftest.err >&5
    15556    echo "$as_me:15556: \$? = $ac_status" >&5
     15564   echo "$as_me:15564: \$? = $ac_status" >&5
    1555715565   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1555815566   then
    … …  
    1775717765   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1775817766   -e 's:$: $lt_compiler_flag:'`
    17759    (eval echo "\"\$as_me:17759: $lt_compile\"" >&5)
     17767   (eval echo "\"\$as_me:17767: $lt_compile\"" >&5)
    1776017768   (eval "$lt_compile" 2>conftest.err)
    1776117769   ac_status=$?
    1776217770   cat conftest.err >&5
    17763    echo "$as_me:17763: \$? = $ac_status" >&5
     17771   echo "$as_me:17771: \$? = $ac_status" >&5
    1776417772   if (exit $ac_status) && test -s "$ac_outfile"; then
    1776517773     # The compiler can only warn and ignore the option if not recognized
    … …  
    1802518033   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1802618034   -e 's:$: $lt_compiler_flag:'`
    18027    (eval echo "\"\$as_me:18027: $lt_compile\"" >&5)
     18035   (eval echo "\"\$as_me:18035: $lt_compile\"" >&5)
    1802818036   (eval "$lt_compile" 2>conftest.err)
    1802918037   ac_status=$?
    1803018038   cat conftest.err >&5
    18031    echo "$as_me:18031: \$? = $ac_status" >&5
     18039   echo "$as_me:18039: \$? = $ac_status" >&5
    1803218040   if (exit $ac_status) && test -s "$ac_outfile"; then
    1803318041     # The compiler can only warn and ignore the option if not recognized
    … …  
    1812918137   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1813018138   -e 's:$: $lt_compiler_flag:'`
    18131    (eval echo "\"\$as_me:18131: $lt_compile\"" >&5)
     18139   (eval echo "\"\$as_me:18139: $lt_compile\"" >&5)
    1813218140   (eval "$lt_compile" 2>out/conftest.err)
    1813318141   ac_status=$?
    1813418142   cat out/conftest.err >&5
    18135    echo "$as_me:18135: \$? = $ac_status" >&5
     18143   echo "$as_me:18143: \$? = $ac_status" >&5
    1813618144   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1813718145   then
    … …  
    2222322231
    2222422232
     22233echo "$as_me:$LINENO: checking whether source of project GiMPy is available and should be compiled" >&5
     22234echo $ECHO_N "checking whether source of project GiMPy is available and should be compiled... $ECHO_C" >&6
     22235
     22236coin_has_gimpy=notGiven
     22237coin_reason=
     22238
     22239# check if user wants to skip project in any case
     22240
     22241if test x"$COIN_SKIP_PROJECTS" != x; then
     22242  for dir in $COIN_SKIP_PROJECTS; do
     22243    if test $dir = "GiMPy"; then
     22244      coin_has_gimpy="no"
     22245      coin_reason="GiMPy has been specified in COIN_SKIP_PROJECTS"
     22246    fi
     22247
     22248  done
     22249fi
     22250
     22251if test "$coin_has_gimpy" != no; then
     22252
     22253# Check whether --with-m4_tolower(GiMPy) or --without-m4_tolower(GiMPy) was given.
     22254if test "${with_gimpy+set}" = set; then
     22255  withval="$with_gimpy"
     22256  if test "$withval" = no ; then
     22257       coin_has_gimpy="no"
     22258       coin_reason="--without-gimpy has been specified"
     22259     fi
     22260
     22261fi;
     22262fi
     22263
     22264if test "$coin_has_gimpy" != no; then
     22265
     22266# Check whether --with-m4_tolower(GiMPy)-lib or --without-m4_tolower(GiMPy)-lib was given.
     22267if test "${with_gimpy_lib+set}" = set; then
     22268  withval="$with_gimpy_lib"
     22269  if test "$withval" = no ; then
     22270       coin_has_gimpy="no"
     22271       coin_reason="--without-gimpy-lib has been specified"
     22272     else
     22273       coin_has_gimpy="no"
     22274       coin_reason="--with-gimpy-lib has been specified"
     22275     fi
     22276fi;
     22277fi
     22278
     22279if test "$coin_has_gimpy" != no; then
     22280
     22281# Check whether --with-m4_tolower(GiMPy)-incdir or --without-m4_tolower(GiMPy)-incdir was given.
     22282if test "${with_gimpy_incdir+set}" = set; then
     22283  withval="$with_gimpy_incdir"
     22284  if test "$withval" = no ; then
     22285       coin_has_gimpy="no"
     22286       coin_reason="--without-gimpy-incdir has been specified"
     22287     else
     22288       coin_has_gimpy="no"
     22289       coin_reason="--with-gimpy-incdir has been specified"
     22290     fi
     22291fi;
     22292fi
     22293
     22294if test "$coin_has_gimpy" != no; then
     22295
     22296# Check whether --with-m4_tolower(GiMPy)-datadir or --without-m4_tolower(GiMPy)-datadir was given.
     22297if test "${with_gimpy_datadir+set}" = set; then
     22298  withval="$with_gimpy_datadir"
     22299  if test "$withval" = no ; then
     22300       coin_has_gimpy="no"
     22301       coin_reason="--without-gimpy-datadir has been specified"
     22302     else
     22303       coin_has_gimpy="no"
     22304       coin_reason="--with-gimpy-datadir has been specified"
     22305     fi
     22306fi;
     22307fi
     22308
     22309
     22310
     22311
     22312
     22313# check if project is available in present directory
     22314if test "$coin_has_gimpy" = notGiven; then
     22315  coin_has_gimpy=no
     22316  if test -d $srcdir/GiMPy; then
     22317    coin_reason="source in GiMPy"
     22318    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     22319    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     22320    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
     22321     coin_has_gimpy="yes"
     22322
     22323  fi
     22324fi
     22325
     22326if test -z "$coin_reason" ; then
     22327  echo "$as_me:$LINENO: result: $coin_has_gimpy" >&5
     22328echo "${ECHO_T}$coin_has_gimpy" >&6
     22329else
     22330  echo "$as_me:$LINENO: result: $coin_has_gimpy, $coin_reason" >&5
     22331echo "${ECHO_T}$coin_has_gimpy, $coin_reason" >&6
     22332fi
     22333
     22334if test "$coin_has_gimpy" = yes ; then
     22335  if test -r $srcdir/GiMPy/configure; then
     22336    coin_subdirs="$coin_subdirs GiMPy"
     22337
     22338
     22339subdirs="$subdirs GiMPy"
     22340
     22341  fi
     22342fi
     22343
     22344
     22345echo "$as_me:$LINENO: checking whether source of project GrUMPy is available and should be compiled" >&5
     22346echo $ECHO_N "checking whether source of project GrUMPy is available and should be compiled... $ECHO_C" >&6
     22347
     22348coin_has_grumpy=notGiven
     22349coin_reason=
     22350
     22351# check if user wants to skip project in any case
     22352
     22353if test x"$COIN_SKIP_PROJECTS" != x; then
     22354  for dir in $COIN_SKIP_PROJECTS; do
     22355    if test $dir = "GrUMPy"; then
     22356      coin_has_grumpy="no"
     22357      coin_reason="GrUMPy has been specified in COIN_SKIP_PROJECTS"
     22358    fi
     22359
     22360  done
     22361fi
     22362
     22363if test "$coin_has_grumpy" != no; then
     22364
     22365# Check whether --with-m4_tolower(GrUMPy) or --without-m4_tolower(GrUMPy) was given.
     22366if test "${with_grumpy+set}" = set; then
     22367  withval="$with_grumpy"
     22368  if test "$withval" = no ; then
     22369       coin_has_grumpy="no"
     22370       coin_reason="--without-grumpy has been specified"
     22371     fi
     22372
     22373fi;
     22374fi
     22375
     22376if test "$coin_has_grumpy" != no; then
     22377
     22378# Check whether --with-m4_tolower(GrUMPy)-lib or --without-m4_tolower(GrUMPy)-lib was given.
     22379if test "${with_grumpy_lib+set}" = set; then
     22380  withval="$with_grumpy_lib"
     22381  if test "$withval" = no ; then
     22382       coin_has_grumpy="no"
     22383       coin_reason="--without-grumpy-lib has been specified"
     22384     else
     22385       coin_has_grumpy="no"
     22386       coin_reason="--with-grumpy-lib has been specified"
     22387     fi
     22388fi;
     22389fi
     22390
     22391if test "$coin_has_grumpy" != no; then
     22392
     22393# Check whether --with-m4_tolower(GrUMPy)-incdir or --without-m4_tolower(GrUMPy)-incdir was given.
     22394if test "${with_grumpy_incdir+set}" = set; then
     22395  withval="$with_grumpy_incdir"
     22396  if test "$withval" = no ; then
     22397       coin_has_grumpy="no"
     22398       coin_reason="--without-grumpy-incdir has been specified"
     22399     else
     22400       coin_has_grumpy="no"
     22401       coin_reason="--with-grumpy-incdir has been specified"
     22402     fi
     22403fi;
     22404fi
     22405
     22406if test "$coin_has_grumpy" != no; then
     22407
     22408# Check whether --with-m4_tolower(GrUMPy)-datadir or --without-m4_tolower(GrUMPy)-datadir was given.
     22409if test "${with_grumpy_datadir+set}" = set; then
     22410  withval="$with_grumpy_datadir"
     22411  if test "$withval" = no ; then
     22412       coin_has_grumpy="no"
     22413       coin_reason="--without-grumpy-datadir has been specified"
     22414     else
     22415       coin_has_grumpy="no"
     22416       coin_reason="--with-grumpy-datadir has been specified"
     22417     fi
     22418fi;
     22419fi
     22420
     22421
     22422
     22423
     22424
     22425# check if project is available in present directory
     22426if test "$coin_has_grumpy" = notGiven; then
     22427  coin_has_grumpy=no
     22428  if test -d $srcdir/GrUMPy; then
     22429    coin_reason="source in GrUMPy"
     22430    # If a third argument is given, then we have to check if one one the files given in that third argument is present.
     22431    # If none of the files in the third argument is available, then we consider the project directory as non-existing.
     22432    # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient.
     22433     coin_has_grumpy="yes"
     22434
     22435  fi
     22436fi
     22437
     22438if test -z "$coin_reason" ; then
     22439  echo "$as_me:$LINENO: result: $coin_has_grumpy" >&5
     22440echo "${ECHO_T}$coin_has_grumpy" >&6
     22441else
     22442  echo "$as_me:$LINENO: result: $coin_has_grumpy, $coin_reason" >&5
     22443echo "${ECHO_T}$coin_has_grumpy, $coin_reason" >&6
     22444fi
     22445
     22446if test "$coin_has_grumpy" = yes ; then
     22447  if test -r $srcdir/GrUMPy/configure; then
     22448    coin_subdirs="$coin_subdirs GrUMPy"
     22449
     22450
     22451subdirs="$subdirs GrUMPy"
     22452
     22453  fi
     22454fi
     22455
     22456
    2222522457##############################################################################
    2222622458#                   Finishing up by writing all the output                   #
    … …  
    2273922971cat >&5 <<_CSEOF
    2274022972
    22741 This file was extended by Dip $as_me 0.9.0, which was
     22973This file was extended by Dip $as_me 0.9.1, which was
    2274222974generated by GNU Autoconf 2.59.  Invocation command line was
    2274322975
    … …  
    2279723029cat >>$CONFIG_STATUS <<_ACEOF
    2279823030ac_cs_version="\\
    22799 Dip config.status 0.9.0
     23031Dip config.status 0.9.1
    2280023032configured by $0, generated by GNU Autoconf 2.59,
    2280123033  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

  • releases/0.9.1/configure.ac

    r1595 r1595  
    2121
    2222# name of project, version number, contact info
    23 AC_INIT([Dip],[0.9.0],[dip@lists.coin-or.org])
     23AC_INIT([Dip],[0.9.1],[dip@lists.coin-or.org])
    2424
    2525# copyright for configure script
    … …  
    7474AC_COIN_MAIN_PACKAGEDIR(Alps)
    7575AC_COIN_MAIN_PACKAGEDIR(Dip)
     76AC_COIN_MAIN_PACKAGEDIR(GiMPy)
     77AC_COIN_MAIN_PACKAGEDIR(GrUMPy)
    7678
    7779##############################################################################
Note: See TracChangeset for help on using the changeset viewer.