Changeset 471


Ignore:
Timestamp:
Aug 3, 2013 10:53:53 AM (6 years ago)
Author:
tkr
Message:

temporarily committing stable candidate

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
        2 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
        3 Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
        4 Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
        5 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
        6 Cbc  https://projects.coin-or.org/svn/Cbc/stable/2.7/Cbc
        7 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.7.6/
         2CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.8/CoinUtils
         3Clp  https://projects.coin-or.org/svn/Clp/releases/1.14.8/Clp
         4Osi  https://projects.coin-or.org/svn/Osi/releases/0.105.7/Osi
         5Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.57.4/Cgl
         6Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.7.8/Cbc
         7Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.6/
  • trunk/CoinMP/Makefile.in

    r431 r471  
    224224ac_ct_CXX = @ac_ct_CXX@
    225225ac_ct_F77 = @ac_ct_F77@
     226ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    226227ac_ct_RANLIB = @ac_ct_RANLIB@
    227228ac_ct_STRIP = @ac_ct_STRIP@
    228229ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    229 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    230230am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    231231am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • trunk/CoinMP/configure

    r470 r471  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for CoinMP trunk.
     3# Generated by GNU Autoconf 2.59 for CoinMP 1.7.
    44#
    55# Report bugs to <coinmp@list.coin-or.org>.
     
    430430PACKAGE_NAME='CoinMP'
    431431PACKAGE_TARNAME='coinmp'
    432 PACKAGE_VERSION='trunk'
    433 PACKAGE_STRING='CoinMP trunk'
     432PACKAGE_VERSION='1.7'
     433PACKAGE_STRING='CoinMP 1.7'
    434434PACKAGE_BUGREPORT='coinmp@list.coin-or.org'
    435435
     
    473473#endif"
    474474
    475 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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion COINMP_SVN_REV 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 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 F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED CBC_LIBS CBC_CFLAGS CBC_DATA CBC_DEPENDENCIES CBC_LIBS_INSTALLED CBC_CFLAGS_INSTALLED CBC_DATA_INSTALLED COINMP_CFLAGS COINMP_LIBS COINMP_PCLIBS COINMP_PCREQUIRES COINMP_DEPENDENCIES COINMP_CFLAGS_INSTALLED COINMP_LIBS_INSTALLED COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion COINMP_SVN_REV 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 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 F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_ct_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED CBC_LIBS CBC_CFLAGS CBC_DATA CBC_DEPENDENCIES CBC_LIBS_INSTALLED CBC_CFLAGS_INSTALLED CBC_DATA_INSTALLED COINMP_CFLAGS COINMP_LIBS COINMP_PCLIBS COINMP_PCREQUIRES COINMP_DEPENDENCIES COINMP_CFLAGS_INSTALLED COINMP_LIBS_INSTALLED COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    10061006  # This message is too long to be a string in the A/UX 3.1 sh.
    10071007  cat <<_ACEOF
    1008 \`configure' configures CoinMP trunk to adapt to many kinds of systems.
     1008\`configure' configures CoinMP 1.7 to adapt to many kinds of systems.
    10091009
    10101010Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10721072if test -n "$ac_init_help"; then
    10731073  case $ac_init_help in
    1074      short | recursive ) echo "Configuration of CoinMP trunk:";;
     1074     short | recursive ) echo "Configuration of CoinMP 1.7:";;
    10751075   esac
    10761076  cat <<\_ACEOF
     
    12481248if $ac_init_version; then
    12491249  cat <<\_ACEOF
    1250 CoinMP configure trunk
     1250CoinMP configure 1.7
    12511251generated by GNU Autoconf 2.59
    12521252
     
    12681268running configure, to aid debugging if configure makes a mistake.
    12691269
    1270 It was created by CoinMP $as_me trunk, which was
     1270It was created by CoinMP $as_me 1.7, which was
    12711271generated by GNU Autoconf 2.59.  Invocation command line was
    12721272
     
    28922892          clang* ) ;;
    28932893          cl* | */cl* | CL* | */CL*)
    2894             coin_opt_cflags='-MT -O2'
     2894            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
     2895              coin_opt_cflags='-MD -O2'
     2896              coin_dbg_cflags='-MDd'
     2897            else
     2898              coin_opt_cflags='-MT -O2'
     2899              coin_dbg_cflags='-MTd'
     2900            fi
    28952901            coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    2896             coin_dbg_cflags='-MTd'
    28972902            ;;
    28982903          icl* | */icl* | ICL* | */ICL*)
    2899             coin_opt_cflags='-MT -Ox'
     2904            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
     2905              coin_opt_cflags='-MD -Ox'
     2906              coin_dbg_cflags='-MDd -debug'
     2907            else
     2908              coin_opt_cflags='-MT -Ox'
     2909              coin_dbg_cflags='-MTd -debug'
     2910            fi
    29002911            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
    2901             coin_dbg_cflags='-MTd -debug'
    29022912            ;;
    29032913        esac
     
    38323842          clang* ) ;;
    38333843          cl* | */cl* | CL* | */CL*)
    3834             # The MT and MTd options are mutually exclusive
    3835             coin_opt_cxxflags='-MT -O2'
     3844            # The MT and MTd options are mutually exclusive
     3845            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
     3846               coin_opt_cxxflags='-MD -O2'
     3847               coin_dbg_cxxflags='-MDd'
     3848            else
     3849               coin_opt_cxxflags='-MT -O2'
     3850               coin_dbg_cxxflags='-MTd'
     3851            fi
    38363852            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    3837             coin_dbg_cxxflags='-MTd'
    38383853            ;;
    38393854          icl* | */icl* | ICL* | */ICL*)
    3840             # The MT and MTd options are mutually exclusive
    3841             coin_opt_cxxflags='-MT -Ox'
     3855          # The MT and MTd options are mutually exclusive
     3856            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
     3857              coin_opt_cxxflags='-MD -Ox'
     3858              coin_dbg_cxxflags='-MDd -debug'
     3859            else
     3860              coin_opt_cxxflags='-MT -Ox'
     3861              coin_dbg_cxxflags='-MTd -debug'
     3862            fi
    38423863            coin_add_cxxflags='-nologo -EHsc -GR -D_CRT_SECURE_NO_DEPRECATE'
    3843             coin_dbg_cxxflags='-MTd -debug'
    38443864            ;;
    38453865        esac
     
    41954215# START
    41964216
     4217coin_disable_shared=no
    41974218# Test if force_shared has been set
    41984219if test "x" = xforce_shared; then
     
    42304251    { echo "$as_me:$LINENO: WARNING: On $platform, shared objects are not supported. I'm disabling your choice." >&5
    42314252echo "$as_me: WARNING: On $platform, shared objects are not supported. I'm disabling your choice." >&2;}
     4253  else
     4254    # we don't disable shared, because it was not selected anyway
     4255    coin_disable_shared=no
    42324256  fi
    42334257  enable_shared=no
     
    46404664# Define the identity of the package.
    46414665 PACKAGE='coinmp'
    4642  VERSION='trunk'
     4666 VERSION='1.7'
    46434667
    46444668
     
    59365960*-*-irix6*)
    59375961  # Find out which ABI we are using.
    5938   echo '#line 5938 "configure"' > conftest.$ac_ext
     5962  echo '#line 5962 "configure"' > conftest.$ac_ext
    59395963  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59405964  (eval $ac_compile) 2>&5
     
    70707094
    70717095# Provide some information about the compiler.
    7072 echo "$as_me:7072:" \
     7096echo "$as_me:7096:" \
    70737097     "checking for Fortran 77 compiler version" >&5
    70747098ac_compiler=`set X $ac_compile; echo $2`
     
    81378161   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81388162   -e 's:$: $lt_compiler_flag:'`
    8139    (eval echo "\"\$as_me:8139: $lt_compile\"" >&5)
     8163   (eval echo "\"\$as_me:8163: $lt_compile\"" >&5)
    81408164   (eval "$lt_compile" 2>conftest.err)
    81418165   ac_status=$?
    81428166   cat conftest.err >&5
    8143    echo "$as_me:8143: \$? = $ac_status" >&5
     8167   echo "$as_me:8167: \$? = $ac_status" >&5
    81448168   if (exit $ac_status) && test -s "$ac_outfile"; then
    81458169     # The compiler can only warn and ignore the option if not recognized
     
    84058429   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84068430   -e 's:$: $lt_compiler_flag:'`
    8407    (eval echo "\"\$as_me:8407: $lt_compile\"" >&5)
     8431   (eval echo "\"\$as_me:8431: $lt_compile\"" >&5)
    84088432   (eval "$lt_compile" 2>conftest.err)
    84098433   ac_status=$?
    84108434   cat conftest.err >&5
    8411    echo "$as_me:8411: \$? = $ac_status" >&5
     8435   echo "$as_me:8435: \$? = $ac_status" >&5
    84128436   if (exit $ac_status) && test -s "$ac_outfile"; then
    84138437     # The compiler can only warn and ignore the option if not recognized
     
    85098533   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    85108534   -e 's:$: $lt_compiler_flag:'`
    8511    (eval echo "\"\$as_me:8511: $lt_compile\"" >&5)
     8535   (eval echo "\"\$as_me:8535: $lt_compile\"" >&5)
    85128536   (eval "$lt_compile" 2>out/conftest.err)
    85138537   ac_status=$?
    85148538   cat out/conftest.err >&5
    8515    echo "$as_me:8515: \$? = $ac_status" >&5
     8539   echo "$as_me:8539: \$? = $ac_status" >&5
    85168540   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    85178541   then
     
    1085410878  lt_status=$lt_dlunknown
    1085510879  cat > conftest.$ac_ext <<EOF
    10856 #line 10856 "configure"
     10880#line 10880 "configure"
    1085710881#include "confdefs.h"
    1085810882
     
    1095410978  lt_status=$lt_dlunknown
    1095510979  cat > conftest.$ac_ext <<EOF
    10956 #line 10956 "configure"
     10980#line 10980 "configure"
    1095710981#include "confdefs.h"
    1095810982
     
    1329813322   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1329913323   -e 's:$: $lt_compiler_flag:'`
    13300    (eval echo "\"\$as_me:13300: $lt_compile\"" >&5)
     13324   (eval echo "\"\$as_me:13324: $lt_compile\"" >&5)
    1330113325   (eval "$lt_compile" 2>conftest.err)
    1330213326   ac_status=$?
    1330313327   cat conftest.err >&5
    13304    echo "$as_me:13304: \$? = $ac_status" >&5
     13328   echo "$as_me:13328: \$? = $ac_status" >&5
    1330513329   if (exit $ac_status) && test -s "$ac_outfile"; then
    1330613330     # The compiler can only warn and ignore the option if not recognized
     
    1340213426   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1340313427   -e 's:$: $lt_compiler_flag:'`
    13404    (eval echo "\"\$as_me:13404: $lt_compile\"" >&5)
     13428   (eval echo "\"\$as_me:13428: $lt_compile\"" >&5)
    1340513429   (eval "$lt_compile" 2>out/conftest.err)
    1340613430   ac_status=$?
    1340713431   cat out/conftest.err >&5
    13408    echo "$as_me:13408: \$? = $ac_status" >&5
     13432   echo "$as_me:13432: \$? = $ac_status" >&5
    1340913433   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1341013434   then
     
    1497214996   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1497314997   -e 's:$: $lt_compiler_flag:'`
    14974    (eval echo "\"\$as_me:14974: $lt_compile\"" >&5)
     14998   (eval echo "\"\$as_me:14998: $lt_compile\"" >&5)
    1497514999   (eval "$lt_compile" 2>conftest.err)
    1497615000   ac_status=$?
    1497715001   cat conftest.err >&5
    14978    echo "$as_me:14978: \$? = $ac_status" >&5
     15002   echo "$as_me:15002: \$? = $ac_status" >&5
    1497915003   if (exit $ac_status) && test -s "$ac_outfile"; then
    1498015004     # The compiler can only warn and ignore the option if not recognized
     
    1507615100   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1507715101   -e 's:$: $lt_compiler_flag:'`
    15078    (eval echo "\"\$as_me:15078: $lt_compile\"" >&5)
     15102   (eval echo "\"\$as_me:15102: $lt_compile\"" >&5)
    1507915103   (eval "$lt_compile" 2>out/conftest.err)
    1508015104   ac_status=$?
    1508115105   cat out/conftest.err >&5
    15082    echo "$as_me:15082: \$? = $ac_status" >&5
     15106   echo "$as_me:15106: \$? = $ac_status" >&5
    1508315107   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1508415108   then
     
    1728317307   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1728417308   -e 's:$: $lt_compiler_flag:'`
    17285    (eval echo "\"\$as_me:17285: $lt_compile\"" >&5)
     17309   (eval echo "\"\$as_me:17309: $lt_compile\"" >&5)
    1728617310   (eval "$lt_compile" 2>conftest.err)
    1728717311   ac_status=$?
    1728817312   cat conftest.err >&5
    17289    echo "$as_me:17289: \$? = $ac_status" >&5
     17313   echo "$as_me:17313: \$? = $ac_status" >&5
    1729017314   if (exit $ac_status) && test -s "$ac_outfile"; then
    1729117315     # The compiler can only warn and ignore the option if not recognized
     
    1755117575   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1755217576   -e 's:$: $lt_compiler_flag:'`
    17553    (eval echo "\"\$as_me:17553: $lt_compile\"" >&5)
     17577   (eval echo "\"\$as_me:17577: $lt_compile\"" >&5)
    1755417578   (eval "$lt_compile" 2>conftest.err)
    1755517579   ac_status=$?
    1755617580   cat conftest.err >&5
    17557    echo "$as_me:17557: \$? = $ac_status" >&5
     17581   echo "$as_me:17581: \$? = $ac_status" >&5
    1755817582   if (exit $ac_status) && test -s "$ac_outfile"; then
    1755917583     # The compiler can only warn and ignore the option if not recognized
     
    1765517679   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1765617680   -e 's:$: $lt_compiler_flag:'`
    17657    (eval echo "\"\$as_me:17657: $lt_compile\"" >&5)
     17681   (eval echo "\"\$as_me:17681: $lt_compile\"" >&5)
    1765817682   (eval "$lt_compile" 2>out/conftest.err)
    1765917683   ac_status=$?
    1766017684   cat out/conftest.err >&5
    17661    echo "$as_me:17661: \$? = $ac_status" >&5
     17685   echo "$as_me:17685: \$? = $ac_status" >&5
    1766217686   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1766317687   then
     
    2057720601  use_pkgconfig="$enableval"
    2057820602else
    20579   use_pkgconfig=yes
     20603  if test x$coin_cc_is_cl = xtrue; then
     20604     use_pkgconfig=no
     20605   else
     20606     use_pkgconfig=yes
     20607   fi
    2058020608fi;
    2058120609
     
    2058720615echo "$as_me:$LINENO: checking for $ac_word" >&5
    2058820616echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    20589 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
     20617if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
    2059020618  echo $ECHO_N "(cached) $ECHO_C" >&6
    2059120619else
    20592   case $PKG_CONFIG in
    20593   [\\/]* | ?:[\\/]*)
    20594   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
    20595   ;;
    20596   *)
    20597   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     20620  if test -n "$PKG_CONFIG"; then
     20621  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
     20622else
     20623as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    2059820624for as_dir in $PATH
    2059920625do
     
    2060220628  for ac_exec_ext in '' $ac_executable_extensions; do
    2060320629  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    20604     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     20630    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
    2060520631    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    2060620632    break 2
     
    2060920635done
    2061020636
    20611   ;;
    20612 esac
    20613 fi
    20614 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
    20615 
     20637fi
     20638fi
     20639PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
    2061620640if test -n "$PKG_CONFIG"; then
    2061720641  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
     
    2062320647
    2062420648fi
    20625 if test -z "$ac_cv_path_PKG_CONFIG"; then
    20626   ac_pt_PKG_CONFIG=$PKG_CONFIG
     20649if test -z "$ac_cv_prog_PKG_CONFIG"; then
     20650  ac_ct_PKG_CONFIG=$PKG_CONFIG
    2062720651  # Extract the first word of "pkg-config", so it can be a program name with args.
    2062820652set dummy pkg-config; ac_word=$2
    2062920653echo "$as_me:$LINENO: checking for $ac_word" >&5
    2063020654echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    20631 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
     20655if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
    2063220656  echo $ECHO_N "(cached) $ECHO_C" >&6
    2063320657else
    20634   case $ac_pt_PKG_CONFIG in
    20635   [\\/]* | ?:[\\/]*)
    20636   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
    20637   ;;
    20638   *)
    20639   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     20658  if test -n "$ac_ct_PKG_CONFIG"; then
     20659  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
     20660else
     20661as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    2064020662for as_dir in $PATH
    2064120663do
     
    2064420666  for ac_exec_ext in '' $ac_executable_extensions; do
    2064520667  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    20646     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     20668    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
    2064720669    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    2064820670    break 2
     
    2065120673done
    2065220674
    20653   ;;
    20654 esac
    20655 fi
    20656 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
    20657 
    20658 if test -n "$ac_pt_PKG_CONFIG"; then
    20659   echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
    20660 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
     20675fi
     20676fi
     20677ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
     20678if test -n "$ac_ct_PKG_CONFIG"; then
     20679  echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
     20680echo "${ECHO_T}$ac_ct_PKG_CONFIG" >&6
    2066120681else
    2066220682  echo "$as_me:$LINENO: result: no" >&5
     
    2066420684fi
    2066520685
    20666   PKG_CONFIG=$ac_pt_PKG_CONFIG
    20667 else
    20668   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
     20686  PKG_CONFIG=$ac_ct_PKG_CONFIG
     20687else
     20688  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
    2066920689fi
    2067020690
     
    2180521825cat >&5 <<_CSEOF
    2180621826
    21807 This file was extended by CoinMP $as_me trunk, which was
     21827This file was extended by CoinMP $as_me 1.7, which was
    2180821828generated by GNU Autoconf 2.59.  Invocation command line was
    2180921829
     
    2186821888cat >>$CONFIG_STATUS <<_ACEOF
    2186921889ac_cs_version="\\
    21870 CoinMP config.status trunk
     21890CoinMP config.status 1.7
    2187121891configured by $0, generated by GNU Autoconf 2.59,
    2187221892  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
     
    2217622196s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
    2217722197s,@PKG_CONFIG@,$PKG_CONFIG,;t t
    22178 s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
     22198s,@ac_ct_PKG_CONFIG@,$ac_ct_PKG_CONFIG,;t t
    2217922199s,@COIN_HAS_PKGCONFIG_TRUE@,$COIN_HAS_PKGCONFIG_TRUE,;t t
    2218022200s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
  • trunk/CoinMP/configure.ac

    r455 r471  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([CoinMP],[trunk],[coinmp@list.coin-or.org])
     15AC_INIT([CoinMP],[1.7],[coinmp@list.coin-or.org])
    1616
    1717AC_COPYRIGHT([
  • trunk/CoinMP/src/Makefile.in

    r430 r471  
    207207ac_ct_CXX = @ac_ct_CXX@
    208208ac_ct_F77 = @ac_ct_F77@
     209ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    209210ac_ct_RANLIB = @ac_ct_RANLIB@
    210211ac_ct_STRIP = @ac_ct_STRIP@
    211212ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    212 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    213213am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    214214am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • trunk/CoinMP/src/config_coinmp_default.h

    r455 r471  
    66
    77/* Version number of project */
    8 #define COINMP_VERSION      "trunk"
     8#define COINMP_VERSION "1.7"
    99
    1010/* Major Version number of project */
    11 #define COINMP_VERSION_MAJOR   9999
     11#define COINMP_VERSION_MAJOR 1
    1212
    1313/* Minor Version number of project */
    14 #define COINMP_VERSION_MINOR   9999
     14#define COINMP_VERSION_MINOR 7
    1515
    1616/* Release Version number of project */
  • trunk/CoinMP/test/Makefile.in

    r430 r471  
    188188ac_ct_CXX = @ac_ct_CXX@
    189189ac_ct_F77 = @ac_ct_F77@
     190ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    190191ac_ct_RANLIB = @ac_ct_RANLIB@
    191192ac_ct_STRIP = @ac_ct_STRIP@
    192193ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    193 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    194194am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    195195am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • trunk/configure

    r455 r471  
    22# From configure.ac 0.9.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.59 for CoinMP trunk.
     4# Generated by GNU Autoconf 2.59 for CoinMP 1.7.
    55#
    66# Report bugs to <coinmp@list.coin-or.org>.
     
    277277PACKAGE_NAME='CoinMP'
    278278PACKAGE_TARNAME='coinmp'
    279 PACKAGE_VERSION='trunk'
    280 PACKAGE_STRING='CoinMP trunk'
     279PACKAGE_VERSION='1.7'
     280PACKAGE_STRING='CoinMP 1.7'
    281281PACKAGE_BUGREPORT='coinmp@list.coin-or.org'
    282282
     
    743743  # This message is too long to be a string in the A/UX 3.1 sh.
    744744  cat <<_ACEOF
    745 \`configure' configures CoinMP trunk to adapt to many kinds of systems.
     745\`configure' configures CoinMP 1.7 to adapt to many kinds of systems.
    746746
    747747Usage: $0 [OPTION]... [VAR=VALUE]...
     
    805805if test -n "$ac_init_help"; then
    806806  case $ac_init_help in
    807      short | recursive ) echo "Configuration of CoinMP trunk:";;
     807     short | recursive ) echo "Configuration of CoinMP 1.7:";;
    808808   esac
    809809  cat <<\_ACEOF
     
    948948if $ac_init_version; then
    949949  cat <<\_ACEOF
    950 CoinMP configure trunk
     950CoinMP configure 1.7
    951951generated by GNU Autoconf 2.59
    952952
     
    968968running configure, to aid debugging if configure makes a mistake.
    969969
    970 It was created by CoinMP $as_me trunk, which was
     970It was created by CoinMP $as_me 1.7, which was
    971971generated by GNU Autoconf 2.59.  Invocation command line was
    972972
     
    16621662# Define the identity of the package.
    16631663 PACKAGE='coinmp'
    1664  VERSION='trunk'
     1664 VERSION='1.7'
    16651665
    16661666
     
    30023002fi
    30033003case "$CC" in
     3004  clang* ) ;;
    30043005  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    30053006    coin_link_input_cmd=cp ;;
     
    30153016
    30163017  case "$CC" in
     3018    clang* )
     3019         LIBEXT=a ;;
    30173020    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    30183021         LIBEXT=lib ;;
     
    34603463cat >&5 <<_CSEOF
    34613464
    3462 This file was extended by CoinMP $as_me trunk, which was
     3465This file was extended by CoinMP $as_me 1.7, which was
    34633466generated by GNU Autoconf 2.59.  Invocation command line was
    34643467
     
    35153518cat >>$CONFIG_STATUS <<_ACEOF
    35163519ac_cs_version="\\
    3517 CoinMP config.status trunk
     3520CoinMP config.status 1.7
    35183521configured by $0, generated by GNU Autoconf 2.59,
    35193522  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • trunk/configure.ac

    r455 r471  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([CoinMP],[trunk],[coinmp@list.coin-or.org])
     15AC_INIT([CoinMP],[1.7],[coinmp@list.coin-or.org])
    1616
    1717AC_COPYRIGHT([
Note: See TracChangeset for help on using the changeset viewer.