Changes from releases/0.9.0 at r1595 to releases/0.9.1 at r1595
- Location:
- releases/0.9.1
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
releases/0.9.1/Dip
- Property svn:mergeinfo changed
/trunk/Dip merged: 842,844,849-851
- Property svn:mergeinfo changed
-
releases/0.9.1/Dip/configure
r1595 r1595 1 1 #! /bin/sh 2 2 # 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. 4 4 # 5 5 # Report bugs to <dip@lists.coin-or.org>. … … 441 441 PACKAGE_NAME='Dip' 442 442 PACKAGE_TARNAME='dip' 443 PACKAGE_VERSION='0.9. 0'444 PACKAGE_STRING='Dip 0.9. 0'443 PACKAGE_VERSION='0.9.1' 444 PACKAGE_STRING='Dip 0.9.1' 445 445 PACKAGE_BUGREPORT='dip@lists.coin-or.org' 446 446 … … 1017 1017 # This message is too long to be a string in the A/UX 3.1 sh. 1018 1018 cat <<_ACEOF 1019 \`configure' configures Dip 0.9. 0to adapt to many kinds of systems.1019 \`configure' configures Dip 0.9.1 to adapt to many kinds of systems. 1020 1020 1021 1021 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1083 1083 if test -n "$ac_init_help"; then 1084 1084 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:";; 1086 1086 esac 1087 1087 cat <<\_ACEOF … … 1291 1291 if $ac_init_version; then 1292 1292 cat <<\_ACEOF 1293 Dip configure 0.9. 01293 Dip configure 0.9.1 1294 1294 generated by GNU Autoconf 2.59 1295 1295 … … 1322 1322 running configure, to aid debugging if configure makes a mistake. 1323 1323 1324 It was created by Dip $as_me 0.9. 0, which was1324 It was created by Dip $as_me 0.9.1, which was 1325 1325 generated by GNU Autoconf 2.59. Invocation command line was 1326 1326 … … 1848 1848 1849 1849 # Capture libtool library version, if given. 1850 coin_libversion=2: 0:11850 coin_libversion=2:1:1 1851 1851 1852 1852 … … 4741 4741 # Define the identity of the package. 4742 4742 PACKAGE='dip' 4743 VERSION='0.9. 0'4743 VERSION='0.9.1' 4744 4744 4745 4745 … … 25850 25850 cat >&5 <<_CSEOF 25851 25851 25852 This file was extended by Dip $as_me 0.9. 0, which was25852 This file was extended by Dip $as_me 0.9.1, which was 25853 25853 generated by GNU Autoconf 2.59. Invocation command line was 25854 25854 … … 25916 25916 cat >>$CONFIG_STATUS <<_ACEOF 25917 25917 ac_cs_version="\\ 25918 Dip config.status 0.9. 025918 Dip config.status 0.9.1 25919 25919 configured by $0, generated by GNU Autoconf 2.59, 25920 25920 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -
releases/0.9.1/Dip/configure.ac
r1595 r1595 21 21 22 22 # name of project, version number, contact info 23 AC_INIT([Dip],[0.9. 0],[dip@lists.coin-or.org])23 AC_INIT([Dip],[0.9.1],[dip@lists.coin-or.org]) 24 24 25 25 # copyright for configure script … … 61 61 # externals. The following macro ensures that those externals are 62 62 # retrieved by svn if they are not there yet. 63 AC_COIN_PROJECTDIR_INIT(Dip,2: 0:1)63 AC_COIN_PROJECTDIR_INIT(Dip,2:1:1) 64 64 65 65 # Check if user wants to produce debugging code -
releases/0.9.1/Dip/setup.py
r1595 r1595 8 8 9 9 PROJECT = 'dippy' 10 VERSION = '1.9. 0'10 VERSION = '1.9.1' 11 11 URL = 'https://projects.coin-or.org/Dip/wiki/Dippy' 12 12 AUTHOR_EMAIL = u'' … … 37 37 libs = [flag[2:] for flag in link_line.split() if 38 38 flag.startswith('-l')] 39 return libs 40 41 def 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')] 39 50 return libs 40 51 … … 69 80 sources = [join('src/dippy', f) for f in files] 70 81 71 lib_dirs = [join(coin_install_dir, 'lib', 'intel'), 72 join(coin_install_dir, 'lib')] 82 lib_dirs = get_lib_dirs(coin_install_dir) 83 lib_dirs.append(join(coin_install_dir, 'lib')) 84 if operatingSystem is 'windows': 85 lib_dirs.append(join(coin_install_dir, 'lib', 'intel')) 73 86 74 87 modules=[Extension('_dippy', … … 90 103 packages=['dippy'], 91 104 package_dir = {'': 'src'}, 92 install_requires=['coinor.pulp' ],105 install_requires=['coinor.pulp','coinor.gimpy'], 93 106 ext_modules=modules 94 107 ) -
releases/0.9.1/Dip/src
- Property svn:mergeinfo changed
/trunk/Dip/src merged: 844
- Property svn:mergeinfo changed
-
releases/0.9.1/Dip/src/config_dip_default.h
r1595 r1595 20 20 21 21 /* Version number of project */ 22 #define DIP_VERSION "0.9. 0"22 #define DIP_VERSION "0.9.1" 23 23 24 24 /* Major Version number of project */ … … 29 29 30 30 /* Release Version number of project */ 31 #define DIP_VERSION_RELEASE 031 #define DIP_VERSION_RELEASE 1 32 32 -
releases/0.9.1/Dip/src/dippy/dippy.py
r1595 r1595 468 468 # explicit bounds 469 469 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) \ 471 471 and not v.isBinary()] 472 472 else: -
releases/0.9.1/INSTALL
r1595 r1595 28 28 client TortoiseSVN (http://tortoisesvn.net). 29 29 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, 31 31 you would execute the command 32 32 33 svn co https://projects.coin-or.org/svn/ Dip/releases/0.9.0 Dip-0.9.033 svn co https://projects.coin-or.org/svn/Cbc/releases/0.82.0 Cbc-0.82.0 34 34 35 35 You can similarly get source for the latest stable version or the trunk 36 36 (development) version. 37 37 38 2. Download the tarball from http://www.coin-or.org/download/source/ Dip39 and extract it. For example, for the release 0. 9.0 you type38 2. 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 40 40 41 gunzip Dip-0. 9.0.tgz42 tar xvf Dip-0. 9.0.tar41 gunzip Dip-0.82.0.tgz 42 tar xvf Dip-0.82.0.tar 43 43 44 44 More detailed download instructions can be found at … … 48 48 ********************************************************************** 49 49 50 Go into the directory that you just downloaded or extracted (e.g., Dip-0.9.0).50 Go into the directory that you just downloaded or extracted (e.g., Cbc-2.7.0). 51 51 Then create a build directory and configure the package by typing 52 52 … … 61 61 https://projects.coin-or.org/BuildTools/ 62 62 63 and the DipTrac page63 and the Cbc Trac page 64 64 65 65 https://projects.coin-or.org/Dip … … 97 97 98 98 ********************************************************************** 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 execute107 108 python setup.py install109 110 to build and install DipPy from source or111 112 pip install dippy113 114 **********************************************************************115 99 *** DIP EXAMPLES *** 116 100 ********************************************************************** -
releases/0.9.1/README
r1595 r1595 5 5 each of the subdirectories give more information about these projects. 6 6 7 test commit -
releases/0.9.1/configure
r1595 r1595 2 2 # From configure.ac 0.8. 3 3 # 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. 5 5 # 6 6 # Report bugs to <dip@lists.coin-or.org>. … … 442 442 PACKAGE_NAME='Dip' 443 443 PACKAGE_TARNAME='dip' 444 PACKAGE_VERSION='0.9. 0'445 PACKAGE_STRING='Dip 0.9. 0'444 PACKAGE_VERSION='0.9.1' 445 PACKAGE_STRING='Dip 0.9.1' 446 446 PACKAGE_BUGREPORT='dip@lists.coin-or.org' 447 447 … … 495 495 ac_subdirs_all="$ac_subdirs_all Alps" 496 496 ac_subdirs_all="$ac_subdirs_all Dip" 497 ac_subdirs_all="$ac_subdirs_all GiMPy" 498 ac_subdirs_all="$ac_subdirs_all GrUMPy" 497 499 ac_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' 498 500 ac_subst_files='' … … 1044 1046 # This message is too long to be a string in the A/UX 3.1 sh. 1045 1047 cat <<_ACEOF 1046 \`configure' configures Dip 0.9. 0to adapt to many kinds of systems.1048 \`configure' configures Dip 0.9.1 to adapt to many kinds of systems. 1047 1049 1048 1050 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1110 1112 if test -n "$ac_init_help"; then 1111 1113 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:";; 1113 1115 esac 1114 1116 cat <<\_ACEOF … … 1182 1184 --with-dip-incdir directory with header files for using project Dip 1183 1185 --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 1184 1192 1185 1193 Some influential environment variables: … … 1316 1324 if $ac_init_version; then 1317 1325 cat <<\_ACEOF 1318 Dip configure 0.9. 01326 Dip configure 0.9.1 1319 1327 generated by GNU Autoconf 2.59 1320 1328 … … 1347 1355 running configure, to aid debugging if configure makes a mistake. 1348 1356 1349 It was created by Dip $as_me 0.9. 0, which was1357 It was created by Dip $as_me 0.9.1, which was 1350 1358 generated by GNU Autoconf 2.59. Invocation command line was 1351 1359 … … 4359 4367 4360 4368 # Provide some information about the compiler. 4361 echo "$as_me:436 1:" \4369 echo "$as_me:4369:" \ 4362 4370 "checking for Fortran 77 compiler version" >&5 4363 4371 ac_compiler=`set X $ac_compile; echo $2` … … 5351 5359 # Define the identity of the package. 5352 5360 PACKAGE='dip' 5353 VERSION='0.9. 0'5361 VERSION='0.9.1' 5354 5362 5355 5363 … … 6647 6655 *-*-irix6*) 6648 6656 # Find out which ABI we are using. 6649 echo '#line 66 49"configure"' > conftest.$ac_ext6657 echo '#line 6657 "configure"' > conftest.$ac_ext 6650 6658 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6651 6659 (eval $ac_compile) 2>&5 … … 8611 8619 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8612 8620 -e 's:$: $lt_compiler_flag:'` 8613 (eval echo "\"\$as_me:86 13: $lt_compile\"" >&5)8621 (eval echo "\"\$as_me:8621: $lt_compile\"" >&5) 8614 8622 (eval "$lt_compile" 2>conftest.err) 8615 8623 ac_status=$? 8616 8624 cat conftest.err >&5 8617 echo "$as_me:86 17: \$? = $ac_status" >&58625 echo "$as_me:8625: \$? = $ac_status" >&5 8618 8626 if (exit $ac_status) && test -s "$ac_outfile"; then 8619 8627 # The compiler can only warn and ignore the option if not recognized … … 8879 8887 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8880 8888 -e 's:$: $lt_compiler_flag:'` 8881 (eval echo "\"\$as_me:888 1: $lt_compile\"" >&5)8889 (eval echo "\"\$as_me:8889: $lt_compile\"" >&5) 8882 8890 (eval "$lt_compile" 2>conftest.err) 8883 8891 ac_status=$? 8884 8892 cat conftest.err >&5 8885 echo "$as_me:88 85: \$? = $ac_status" >&58893 echo "$as_me:8893: \$? = $ac_status" >&5 8886 8894 if (exit $ac_status) && test -s "$ac_outfile"; then 8887 8895 # The compiler can only warn and ignore the option if not recognized … … 8983 8991 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8984 8992 -e 's:$: $lt_compiler_flag:'` 8985 (eval echo "\"\$as_me:89 85: $lt_compile\"" >&5)8993 (eval echo "\"\$as_me:8993: $lt_compile\"" >&5) 8986 8994 (eval "$lt_compile" 2>out/conftest.err) 8987 8995 ac_status=$? 8988 8996 cat out/conftest.err >&5 8989 echo "$as_me:89 89: \$? = $ac_status" >&58997 echo "$as_me:8997: \$? = $ac_status" >&5 8990 8998 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8991 8999 then … … 11328 11336 lt_status=$lt_dlunknown 11329 11337 cat > conftest.$ac_ext <<EOF 11330 #line 1133 0"configure"11338 #line 11338 "configure" 11331 11339 #include "confdefs.h" 11332 11340 … … 11428 11436 lt_status=$lt_dlunknown 11429 11437 cat > conftest.$ac_ext <<EOF 11430 #line 1143 0"configure"11438 #line 11438 "configure" 11431 11439 #include "confdefs.h" 11432 11440 … … 13772 13780 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13773 13781 -e 's:$: $lt_compiler_flag:'` 13774 (eval echo "\"\$as_me:137 74: $lt_compile\"" >&5)13782 (eval echo "\"\$as_me:13782: $lt_compile\"" >&5) 13775 13783 (eval "$lt_compile" 2>conftest.err) 13776 13784 ac_status=$? 13777 13785 cat conftest.err >&5 13778 echo "$as_me:137 78: \$? = $ac_status" >&513786 echo "$as_me:13786: \$? = $ac_status" >&5 13779 13787 if (exit $ac_status) && test -s "$ac_outfile"; then 13780 13788 # The compiler can only warn and ignore the option if not recognized … … 13876 13884 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13877 13885 -e 's:$: $lt_compiler_flag:'` 13878 (eval echo "\"\$as_me:138 78: $lt_compile\"" >&5)13886 (eval echo "\"\$as_me:13886: $lt_compile\"" >&5) 13879 13887 (eval "$lt_compile" 2>out/conftest.err) 13880 13888 ac_status=$? 13881 13889 cat out/conftest.err >&5 13882 echo "$as_me:138 82: \$? = $ac_status" >&513890 echo "$as_me:13890: \$? = $ac_status" >&5 13883 13891 if (exit $ac_status) && test -s out/conftest2.$ac_objext 13884 13892 then … … 15446 15454 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 15447 15455 -e 's:$: $lt_compiler_flag:'` 15448 (eval echo "\"\$as_me:154 48: $lt_compile\"" >&5)15456 (eval echo "\"\$as_me:15456: $lt_compile\"" >&5) 15449 15457 (eval "$lt_compile" 2>conftest.err) 15450 15458 ac_status=$? 15451 15459 cat conftest.err >&5 15452 echo "$as_me:154 52: \$? = $ac_status" >&515460 echo "$as_me:15460: \$? = $ac_status" >&5 15453 15461 if (exit $ac_status) && test -s "$ac_outfile"; then 15454 15462 # The compiler can only warn and ignore the option if not recognized … … 15550 15558 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 15551 15559 -e 's:$: $lt_compiler_flag:'` 15552 (eval echo "\"\$as_me:155 52: $lt_compile\"" >&5)15560 (eval echo "\"\$as_me:15560: $lt_compile\"" >&5) 15553 15561 (eval "$lt_compile" 2>out/conftest.err) 15554 15562 ac_status=$? 15555 15563 cat out/conftest.err >&5 15556 echo "$as_me:155 56: \$? = $ac_status" >&515564 echo "$as_me:15564: \$? = $ac_status" >&5 15557 15565 if (exit $ac_status) && test -s out/conftest2.$ac_objext 15558 15566 then … … 17757 17765 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17758 17766 -e 's:$: $lt_compiler_flag:'` 17759 (eval echo "\"\$as_me:177 59: $lt_compile\"" >&5)17767 (eval echo "\"\$as_me:17767: $lt_compile\"" >&5) 17760 17768 (eval "$lt_compile" 2>conftest.err) 17761 17769 ac_status=$? 17762 17770 cat conftest.err >&5 17763 echo "$as_me:177 63: \$? = $ac_status" >&517771 echo "$as_me:17771: \$? = $ac_status" >&5 17764 17772 if (exit $ac_status) && test -s "$ac_outfile"; then 17765 17773 # The compiler can only warn and ignore the option if not recognized … … 18025 18033 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 18026 18034 -e 's:$: $lt_compiler_flag:'` 18027 (eval echo "\"\$as_me:180 27: $lt_compile\"" >&5)18035 (eval echo "\"\$as_me:18035: $lt_compile\"" >&5) 18028 18036 (eval "$lt_compile" 2>conftest.err) 18029 18037 ac_status=$? 18030 18038 cat conftest.err >&5 18031 echo "$as_me:1803 1: \$? = $ac_status" >&518039 echo "$as_me:18039: \$? = $ac_status" >&5 18032 18040 if (exit $ac_status) && test -s "$ac_outfile"; then 18033 18041 # The compiler can only warn and ignore the option if not recognized … … 18129 18137 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 18130 18138 -e 's:$: $lt_compiler_flag:'` 18131 (eval echo "\"\$as_me:1813 1: $lt_compile\"" >&5)18139 (eval echo "\"\$as_me:18139: $lt_compile\"" >&5) 18132 18140 (eval "$lt_compile" 2>out/conftest.err) 18133 18141 ac_status=$? 18134 18142 cat out/conftest.err >&5 18135 echo "$as_me:181 35: \$? = $ac_status" >&518143 echo "$as_me:18143: \$? = $ac_status" >&5 18136 18144 if (exit $ac_status) && test -s out/conftest2.$ac_objext 18137 18145 then … … 22223 22231 22224 22232 22233 echo "$as_me:$LINENO: checking whether source of project GiMPy is available and should be compiled" >&5 22234 echo $ECHO_N "checking whether source of project GiMPy is available and should be compiled... $ECHO_C" >&6 22235 22236 coin_has_gimpy=notGiven 22237 coin_reason= 22238 22239 # check if user wants to skip project in any case 22240 22241 if 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 22249 fi 22250 22251 if test "$coin_has_gimpy" != no; then 22252 22253 # Check whether --with-m4_tolower(GiMPy) or --without-m4_tolower(GiMPy) was given. 22254 if 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 22261 fi; 22262 fi 22263 22264 if test "$coin_has_gimpy" != no; then 22265 22266 # Check whether --with-m4_tolower(GiMPy)-lib or --without-m4_tolower(GiMPy)-lib was given. 22267 if 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 22276 fi; 22277 fi 22278 22279 if test "$coin_has_gimpy" != no; then 22280 22281 # Check whether --with-m4_tolower(GiMPy)-incdir or --without-m4_tolower(GiMPy)-incdir was given. 22282 if 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 22291 fi; 22292 fi 22293 22294 if test "$coin_has_gimpy" != no; then 22295 22296 # Check whether --with-m4_tolower(GiMPy)-datadir or --without-m4_tolower(GiMPy)-datadir was given. 22297 if 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 22306 fi; 22307 fi 22308 22309 22310 22311 22312 22313 # check if project is available in present directory 22314 if 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 22324 fi 22325 22326 if test -z "$coin_reason" ; then 22327 echo "$as_me:$LINENO: result: $coin_has_gimpy" >&5 22328 echo "${ECHO_T}$coin_has_gimpy" >&6 22329 else 22330 echo "$as_me:$LINENO: result: $coin_has_gimpy, $coin_reason" >&5 22331 echo "${ECHO_T}$coin_has_gimpy, $coin_reason" >&6 22332 fi 22333 22334 if test "$coin_has_gimpy" = yes ; then 22335 if test -r $srcdir/GiMPy/configure; then 22336 coin_subdirs="$coin_subdirs GiMPy" 22337 22338 22339 subdirs="$subdirs GiMPy" 22340 22341 fi 22342 fi 22343 22344 22345 echo "$as_me:$LINENO: checking whether source of project GrUMPy is available and should be compiled" >&5 22346 echo $ECHO_N "checking whether source of project GrUMPy is available and should be compiled... $ECHO_C" >&6 22347 22348 coin_has_grumpy=notGiven 22349 coin_reason= 22350 22351 # check if user wants to skip project in any case 22352 22353 if 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 22361 fi 22362 22363 if test "$coin_has_grumpy" != no; then 22364 22365 # Check whether --with-m4_tolower(GrUMPy) or --without-m4_tolower(GrUMPy) was given. 22366 if 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 22373 fi; 22374 fi 22375 22376 if test "$coin_has_grumpy" != no; then 22377 22378 # Check whether --with-m4_tolower(GrUMPy)-lib or --without-m4_tolower(GrUMPy)-lib was given. 22379 if 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 22388 fi; 22389 fi 22390 22391 if test "$coin_has_grumpy" != no; then 22392 22393 # Check whether --with-m4_tolower(GrUMPy)-incdir or --without-m4_tolower(GrUMPy)-incdir was given. 22394 if 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 22403 fi; 22404 fi 22405 22406 if test "$coin_has_grumpy" != no; then 22407 22408 # Check whether --with-m4_tolower(GrUMPy)-datadir or --without-m4_tolower(GrUMPy)-datadir was given. 22409 if 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 22418 fi; 22419 fi 22420 22421 22422 22423 22424 22425 # check if project is available in present directory 22426 if 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 22436 fi 22437 22438 if test -z "$coin_reason" ; then 22439 echo "$as_me:$LINENO: result: $coin_has_grumpy" >&5 22440 echo "${ECHO_T}$coin_has_grumpy" >&6 22441 else 22442 echo "$as_me:$LINENO: result: $coin_has_grumpy, $coin_reason" >&5 22443 echo "${ECHO_T}$coin_has_grumpy, $coin_reason" >&6 22444 fi 22445 22446 if test "$coin_has_grumpy" = yes ; then 22447 if test -r $srcdir/GrUMPy/configure; then 22448 coin_subdirs="$coin_subdirs GrUMPy" 22449 22450 22451 subdirs="$subdirs GrUMPy" 22452 22453 fi 22454 fi 22455 22456 22225 22457 ############################################################################## 22226 22458 # Finishing up by writing all the output # … … 22739 22971 cat >&5 <<_CSEOF 22740 22972 22741 This file was extended by Dip $as_me 0.9. 0, which was22973 This file was extended by Dip $as_me 0.9.1, which was 22742 22974 generated by GNU Autoconf 2.59. Invocation command line was 22743 22975 … … 22797 23029 cat >>$CONFIG_STATUS <<_ACEOF 22798 23030 ac_cs_version="\\ 22799 Dip config.status 0.9. 023031 Dip config.status 0.9.1 22800 23032 configured by $0, generated by GNU Autoconf 2.59, 22801 23033 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -
releases/0.9.1/configure.ac
r1595 r1595 21 21 22 22 # name of project, version number, contact info 23 AC_INIT([Dip],[0.9. 0],[dip@lists.coin-or.org])23 AC_INIT([Dip],[0.9.1],[dip@lists.coin-or.org]) 24 24 25 25 # copyright for configure script … … 74 74 AC_COIN_MAIN_PACKAGEDIR(Alps) 75 75 AC_COIN_MAIN_PACKAGEDIR(Dip) 76 AC_COIN_MAIN_PACKAGEDIR(GiMPy) 77 AC_COIN_MAIN_PACKAGEDIR(GrUMPy) 76 78 77 79 ##############################################################################
Note: See TracChangeset
for help on using the changeset viewer.