Changeset 973 for stable/0.4


Ignore:
Timestamp:
Jul 16, 2013 5:15:17 AM (7 years ago)
Author:
stefan
Message:

merge r970, r971, r972 from trunk; rerun autotools

Location:
stable/0.4/Couenne
Files:
24 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne

  • stable/0.4/Couenne/Makefile.in

    r783 r973  
    298298ac_ct_CXX = @ac_ct_CXX@
    299299ac_ct_F77 = @ac_ct_F77@
     300ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    300301ac_ct_RANLIB = @ac_ct_RANLIB@
    301302ac_ct_STRIP = @ac_ct_STRIP@
    302303ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    303 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    304304am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    305305am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/configure

    r969 r973  
    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 COUENNE_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 BONMIN_LIBS BONMIN_CFLAGS BONMIN_DATA BONMIN_DEPENDENCIES BONMIN_LIBS_INSTALLED BONMIN_CFLAGS_INSTALLED BONMIN_DATA_INSTALLED COUENNELIB_CFLAGS COUENNELIB_LIBS COUENNELIB_PCLIBS COUENNELIB_PCREQUIRES COUENNELIB_DEPENDENCIES COUENNELIB_CFLAGS_INSTALLED COUENNELIB_LIBS_INSTALLED COIN_HAS_BONMIN_TRUE COIN_HAS_BONMIN_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE NTYINCDIR NTYLIB COIN_HAS_NTY_TRUE COIN_HAS_NTY_FALSE SCIP_LIBS SCIP_CFLAGS SCIP_DATA SCIP_DEPENDENCIES SCIP_LIBS_INSTALLED SCIP_CFLAGS_INSTALLED SCIP_DATA_INSTALLED COIN_HAS_SCIP_TRUE COIN_HAS_SCIP_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA CPX_DEPENDENCIES CPX_LIBS_INSTALLED CPX_CFLAGS_INSTALLED CPX_DATA_INSTALLED COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE CPXINCDIR GRB_LIBS GRB_CFLAGS GRB_DATA GRB_DEPENDENCIES GRB_LIBS_INSTALLED GRB_CFLAGS_INSTALLED GRB_DATA_INSTALLED COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA MSK_DEPENDENCIES MSK_LIBS_INSTALLED MSK_CFLAGS_INSTALLED MSK_DATA_INSTALLED COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA SPX_DEPENDENCIES SPX_LIBS_INSTALLED SPX_CFLAGS_INSTALLED SPX_DATA_INSTALLED COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA XPR_DEPENDENCIES XPR_LIBS_INSTALLED XPR_CFLAGS_INSTALLED XPR_DATA_INSTALLED COIN_HAS_XPR_TRUE COIN_HAS_XPR_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 COUENNE_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 BONMIN_LIBS BONMIN_CFLAGS BONMIN_DATA BONMIN_DEPENDENCIES BONMIN_LIBS_INSTALLED BONMIN_CFLAGS_INSTALLED BONMIN_DATA_INSTALLED COUENNELIB_CFLAGS COUENNELIB_LIBS COUENNELIB_PCLIBS COUENNELIB_PCREQUIRES COUENNELIB_DEPENDENCIES COUENNELIB_CFLAGS_INSTALLED COUENNELIB_LIBS_INSTALLED COIN_HAS_BONMIN_TRUE COIN_HAS_BONMIN_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE NTYINCDIR NTYLIB COIN_HAS_NTY_TRUE COIN_HAS_NTY_FALSE SCIP_LIBS SCIP_CFLAGS SCIP_DATA SCIP_DEPENDENCIES SCIP_LIBS_INSTALLED SCIP_CFLAGS_INSTALLED SCIP_DATA_INSTALLED COIN_HAS_SCIP_TRUE COIN_HAS_SCIP_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA CPX_DEPENDENCIES CPX_LIBS_INSTALLED CPX_CFLAGS_INSTALLED CPX_DATA_INSTALLED COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE CPXINCDIR GRB_LIBS GRB_CFLAGS GRB_DATA GRB_DEPENDENCIES GRB_LIBS_INSTALLED GRB_CFLAGS_INSTALLED GRB_DATA_INSTALLED COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA MSK_DEPENDENCIES MSK_LIBS_INSTALLED MSK_CFLAGS_INSTALLED MSK_DATA_INSTALLED COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA SPX_DEPENDENCIES SPX_LIBS_INSTALLED SPX_CFLAGS_INSTALLED SPX_DATA_INSTALLED COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA XPR_DEPENDENCIES XPR_LIBS_INSTALLED XPR_CFLAGS_INSTALLED XPR_DATA_INSTALLED COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    18061806
    18071807    svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
    1808     if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x; then
     1808    if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x -a "x$svn_rev_tmp" != "xUnversioned directory"; then
    18091809      COUENNE_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    18101810
     
    29172917          clang* ) ;;
    29182918          cl* | */cl* | CL* | */CL*)
    2919             coin_opt_cflags='-MT -O2'
     2919            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
     2920              coin_opt_cflags='-MD -O2'
     2921              coin_dbg_cflags='-MDd'
     2922            else
     2923              coin_opt_cflags='-MT -O2'
     2924              coin_dbg_cflags='-MTd'
     2925            fi
    29202926            coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    2921             coin_dbg_cflags='-MTd'
    29222927            ;;
    29232928          icl* | */icl* | ICL* | */ICL*)
    2924             coin_opt_cflags='-MT -Ox'
     2929            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
     2930              coin_opt_cflags='-MD -Ox'
     2931              coin_dbg_cflags='-MDd -debug'
     2932            else
     2933              coin_opt_cflags='-MT -Ox'
     2934              coin_dbg_cflags='-MTd -debug'
     2935            fi
    29252936            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
    2926             coin_dbg_cflags='-MTd -debug'
    29272937            ;;
    29282938        esac
     
    38573867          clang* ) ;;
    38583868          cl* | */cl* | CL* | */CL*)
    3859             # The MT and MTd options are mutually exclusive
    3860             coin_opt_cxxflags='-MT -O2'
     3869            # The MT and MTd options are mutually exclusive
     3870            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
     3871               coin_opt_cxxflags='-MD -O2'
     3872               coin_dbg_cxxflags='-MDd'
     3873            else
     3874               coin_opt_cxxflags='-MT -O2'
     3875               coin_dbg_cxxflags='-MTd'
     3876            fi
    38613877            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    3862             coin_dbg_cxxflags='-MTd'
    38633878            ;;
    38643879          icl* | */icl* | ICL* | */ICL*)
    3865             # The MT and MTd options are mutually exclusive
    3866             coin_opt_cxxflags='-MT -Ox'
     3880          # The MT and MTd options are mutually exclusive
     3881            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
     3882              coin_opt_cxxflags='-MD -Ox'
     3883              coin_dbg_cxxflags='-MDd -debug'
     3884            else
     3885              coin_opt_cxxflags='-MT -Ox'
     3886              coin_dbg_cxxflags='-MTd -debug'
     3887            fi
    38673888            coin_add_cxxflags='-nologo -EHsc -GR -D_CRT_SECURE_NO_DEPRECATE'
    3868             coin_dbg_cxxflags='-MTd -debug'
    38693889            ;;
    38703890        esac
     
    49654985          clang* ) ;;
    49664986          cl* | */cl* | CL* | */CL*)
    4967             coin_opt_cflags='-MT -O2'
     4987            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
     4988              coin_opt_cflags='-MD -O2'
     4989              coin_dbg_cflags='-MDd'
     4990            else
     4991              coin_opt_cflags='-MT -O2'
     4992              coin_dbg_cflags='-MTd'
     4993            fi
    49684994            coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    4969             coin_dbg_cflags='-MTd'
    49704995            ;;
    49714996          icl* | */icl* | ICL* | */ICL*)
    4972             coin_opt_cflags='-MT -Ox'
     4997            if test "$coin_disable_shared" = yes || test "$enable_shared" = yes ; then
     4998              coin_opt_cflags='-MD -Ox'
     4999              coin_dbg_cflags='-MDd -debug'
     5000            else
     5001              coin_opt_cflags='-MT -Ox'
     5002              coin_dbg_cflags='-MTd -debug'
     5003            fi
    49735004            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
    4974             coin_dbg_cflags='-MTd -debug'
    49755005            ;;
    49765006        esac
     
    53205350# START
    53215351
     5352coin_disable_shared=no
    53225353# Test if force_shared has been set
    53235354if test "x" = xforce_shared; then
     
    53555386    { echo "$as_me:$LINENO: WARNING: On $platform, shared objects are not supported. I'm disabling your choice." >&5
    53565387echo "$as_me: WARNING: On $platform, shared objects are not supported. I'm disabling your choice." >&2;}
     5388  else
     5389    # we don't disable shared, because it was not selected anyway
     5390    coin_disable_shared=no
    53575391  fi
    53585392  enable_shared=no
     
    70617095*-*-irix6*)
    70627096  # Find out which ABI we are using.
    7063   echo '#line 7063 "configure"' > conftest.$ac_ext
     7097  echo '#line 7097 "configure"' > conftest.$ac_ext
    70647098  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    70657099  (eval $ac_compile) 2>&5
     
    81958229
    81968230# Provide some information about the compiler.
    8197 echo "$as_me:8197:" \
     8231echo "$as_me:8231:" \
    81988232     "checking for Fortran 77 compiler version" >&5
    81998233ac_compiler=`set X $ac_compile; echo $2`
     
    92629296   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    92639297   -e 's:$: $lt_compiler_flag:'`
    9264    (eval echo "\"\$as_me:9264: $lt_compile\"" >&5)
     9298   (eval echo "\"\$as_me:9298: $lt_compile\"" >&5)
    92659299   (eval "$lt_compile" 2>conftest.err)
    92669300   ac_status=$?
    92679301   cat conftest.err >&5
    9268    echo "$as_me:9268: \$? = $ac_status" >&5
     9302   echo "$as_me:9302: \$? = $ac_status" >&5
    92699303   if (exit $ac_status) && test -s "$ac_outfile"; then
    92709304     # The compiler can only warn and ignore the option if not recognized
     
    95309564   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    95319565   -e 's:$: $lt_compiler_flag:'`
    9532    (eval echo "\"\$as_me:9532: $lt_compile\"" >&5)
     9566   (eval echo "\"\$as_me:9566: $lt_compile\"" >&5)
    95339567   (eval "$lt_compile" 2>conftest.err)
    95349568   ac_status=$?
    95359569   cat conftest.err >&5
    9536    echo "$as_me:9536: \$? = $ac_status" >&5
     9570   echo "$as_me:9570: \$? = $ac_status" >&5
    95379571   if (exit $ac_status) && test -s "$ac_outfile"; then
    95389572     # The compiler can only warn and ignore the option if not recognized
     
    96349668   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    96359669   -e 's:$: $lt_compiler_flag:'`
    9636    (eval echo "\"\$as_me:9636: $lt_compile\"" >&5)
     9670   (eval echo "\"\$as_me:9670: $lt_compile\"" >&5)
    96379671   (eval "$lt_compile" 2>out/conftest.err)
    96389672   ac_status=$?
    96399673   cat out/conftest.err >&5
    9640    echo "$as_me:9640: \$? = $ac_status" >&5
     9674   echo "$as_me:9674: \$? = $ac_status" >&5
    96419675   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    96429676   then
     
    1197912013  lt_status=$lt_dlunknown
    1198012014  cat > conftest.$ac_ext <<EOF
    11981 #line 11981 "configure"
     12015#line 12015 "configure"
    1198212016#include "confdefs.h"
    1198312017
     
    1207912113  lt_status=$lt_dlunknown
    1208012114  cat > conftest.$ac_ext <<EOF
    12081 #line 12081 "configure"
     12115#line 12115 "configure"
    1208212116#include "confdefs.h"
    1208312117
     
    1442314457   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1442414458   -e 's:$: $lt_compiler_flag:'`
    14425    (eval echo "\"\$as_me:14425: $lt_compile\"" >&5)
     14459   (eval echo "\"\$as_me:14459: $lt_compile\"" >&5)
    1442614460   (eval "$lt_compile" 2>conftest.err)
    1442714461   ac_status=$?
    1442814462   cat conftest.err >&5
    14429    echo "$as_me:14429: \$? = $ac_status" >&5
     14463   echo "$as_me:14463: \$? = $ac_status" >&5
    1443014464   if (exit $ac_status) && test -s "$ac_outfile"; then
    1443114465     # The compiler can only warn and ignore the option if not recognized
     
    1452714561   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1452814562   -e 's:$: $lt_compiler_flag:'`
    14529    (eval echo "\"\$as_me:14529: $lt_compile\"" >&5)
     14563   (eval echo "\"\$as_me:14563: $lt_compile\"" >&5)
    1453014564   (eval "$lt_compile" 2>out/conftest.err)
    1453114565   ac_status=$?
    1453214566   cat out/conftest.err >&5
    14533    echo "$as_me:14533: \$? = $ac_status" >&5
     14567   echo "$as_me:14567: \$? = $ac_status" >&5
    1453414568   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1453514569   then
     
    1609716131   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1609816132   -e 's:$: $lt_compiler_flag:'`
    16099    (eval echo "\"\$as_me:16099: $lt_compile\"" >&5)
     16133   (eval echo "\"\$as_me:16133: $lt_compile\"" >&5)
    1610016134   (eval "$lt_compile" 2>conftest.err)
    1610116135   ac_status=$?
    1610216136   cat conftest.err >&5
    16103    echo "$as_me:16103: \$? = $ac_status" >&5
     16137   echo "$as_me:16137: \$? = $ac_status" >&5
    1610416138   if (exit $ac_status) && test -s "$ac_outfile"; then
    1610516139     # The compiler can only warn and ignore the option if not recognized
     
    1620116235   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1620216236   -e 's:$: $lt_compiler_flag:'`
    16203    (eval echo "\"\$as_me:16203: $lt_compile\"" >&5)
     16237   (eval echo "\"\$as_me:16237: $lt_compile\"" >&5)
    1620416238   (eval "$lt_compile" 2>out/conftest.err)
    1620516239   ac_status=$?
    1620616240   cat out/conftest.err >&5
    16207    echo "$as_me:16207: \$? = $ac_status" >&5
     16241   echo "$as_me:16241: \$? = $ac_status" >&5
    1620816242   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1620916243   then
     
    1840818442   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1840918443   -e 's:$: $lt_compiler_flag:'`
    18410    (eval echo "\"\$as_me:18410: $lt_compile\"" >&5)
     18444   (eval echo "\"\$as_me:18444: $lt_compile\"" >&5)
    1841118445   (eval "$lt_compile" 2>conftest.err)
    1841218446   ac_status=$?
    1841318447   cat conftest.err >&5
    18414    echo "$as_me:18414: \$? = $ac_status" >&5
     18448   echo "$as_me:18448: \$? = $ac_status" >&5
    1841518449   if (exit $ac_status) && test -s "$ac_outfile"; then
    1841618450     # The compiler can only warn and ignore the option if not recognized
     
    1867618710   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1867718711   -e 's:$: $lt_compiler_flag:'`
    18678    (eval echo "\"\$as_me:18678: $lt_compile\"" >&5)
     18712   (eval echo "\"\$as_me:18712: $lt_compile\"" >&5)
    1867918713   (eval "$lt_compile" 2>conftest.err)
    1868018714   ac_status=$?
    1868118715   cat conftest.err >&5
    18682    echo "$as_me:18682: \$? = $ac_status" >&5
     18716   echo "$as_me:18716: \$? = $ac_status" >&5
    1868318717   if (exit $ac_status) && test -s "$ac_outfile"; then
    1868418718     # The compiler can only warn and ignore the option if not recognized
     
    1878018814   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1878118815   -e 's:$: $lt_compiler_flag:'`
    18782    (eval echo "\"\$as_me:18782: $lt_compile\"" >&5)
     18816   (eval echo "\"\$as_me:18816: $lt_compile\"" >&5)
    1878318817   (eval "$lt_compile" 2>out/conftest.err)
    1878418818   ac_status=$?
    1878518819   cat out/conftest.err >&5
    18786    echo "$as_me:18786: \$? = $ac_status" >&5
     18820   echo "$as_me:18820: \$? = $ac_status" >&5
    1878718821   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1878818822   then
     
    2203122065  use_pkgconfig="$enableval"
    2203222066else
    22033   use_pkgconfig=yes
     22067  if test x$coin_cc_is_cl = xtrue; then
     22068     use_pkgconfig=no
     22069   else
     22070     use_pkgconfig=yes
     22071   fi
    2203422072fi;
    2203522073
     
    2204122079echo "$as_me:$LINENO: checking for $ac_word" >&5
    2204222080echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    22043 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
     22081if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
    2204422082  echo $ECHO_N "(cached) $ECHO_C" >&6
    2204522083else
    22046   case $PKG_CONFIG in
    22047   [\\/]* | ?:[\\/]*)
    22048   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
    22049   ;;
    22050   *)
    22051   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     22084  if test -n "$PKG_CONFIG"; then
     22085  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
     22086else
     22087as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    2205222088for as_dir in $PATH
    2205322089do
     
    2205622092  for ac_exec_ext in '' $ac_executable_extensions; do
    2205722093  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    22058     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     22094    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
    2205922095    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    2206022096    break 2
     
    2206322099done
    2206422100
    22065   ;;
    22066 esac
    22067 fi
    22068 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
    22069 
     22101fi
     22102fi
     22103PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
    2207022104if test -n "$PKG_CONFIG"; then
    2207122105  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
     
    2207722111
    2207822112fi
    22079 if test -z "$ac_cv_path_PKG_CONFIG"; then
    22080   ac_pt_PKG_CONFIG=$PKG_CONFIG
     22113if test -z "$ac_cv_prog_PKG_CONFIG"; then
     22114  ac_ct_PKG_CONFIG=$PKG_CONFIG
    2208122115  # Extract the first word of "pkg-config", so it can be a program name with args.
    2208222116set dummy pkg-config; ac_word=$2
    2208322117echo "$as_me:$LINENO: checking for $ac_word" >&5
    2208422118echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    22085 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
     22119if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
    2208622120  echo $ECHO_N "(cached) $ECHO_C" >&6
    2208722121else
    22088   case $ac_pt_PKG_CONFIG in
    22089   [\\/]* | ?:[\\/]*)
    22090   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
    22091   ;;
    22092   *)
    22093   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     22122  if test -n "$ac_ct_PKG_CONFIG"; then
     22123  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
     22124else
     22125as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    2209422126for as_dir in $PATH
    2209522127do
     
    2209822130  for ac_exec_ext in '' $ac_executable_extensions; do
    2209922131  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    22100     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     22132    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
    2210122133    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    2210222134    break 2
     
    2210522137done
    2210622138
    22107   ;;
    22108 esac
    22109 fi
    22110 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
    22111 
    22112 if test -n "$ac_pt_PKG_CONFIG"; then
    22113   echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
    22114 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
     22139fi
     22140fi
     22141ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
     22142if test -n "$ac_ct_PKG_CONFIG"; then
     22143  echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
     22144echo "${ECHO_T}$ac_ct_PKG_CONFIG" >&6
    2211522145else
    2211622146  echo "$as_me:$LINENO: result: no" >&5
     
    2211822148fi
    2211922149
    22120   PKG_CONFIG=$ac_pt_PKG_CONFIG
    22121 else
    22122   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
     22150  PKG_CONFIG=$ac_ct_PKG_CONFIG
     22151else
     22152  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
    2212322153fi
    2212422154
     
    2888728917s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
    2888828918s,@PKG_CONFIG@,$PKG_CONFIG,;t t
    28889 s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
     28919s,@ac_ct_PKG_CONFIG@,$ac_ct_PKG_CONFIG,;t t
    2889028920s,@COIN_HAS_PKGCONFIG_TRUE@,$COIN_HAS_PKGCONFIG_TRUE,;t t
    2889128921s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
  • stable/0.4/Couenne/src

  • stable/0.4/Couenne/src/Makefile.in

    r795 r973  
    337337ac_ct_CXX = @ac_ct_CXX@
    338338ac_ct_F77 = @ac_ct_F77@
     339ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    339340ac_ct_RANLIB = @ac_ct_RANLIB@
    340341ac_ct_STRIP = @ac_ct_STRIP@
    341342ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    342 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    343343am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    344344am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/bound_tightening

  • stable/0.4/Couenne/src/bound_tightening/Makefile.in

    r766 r973  
    263263ac_ct_CXX = @ac_ct_CXX@
    264264ac_ct_F77 = @ac_ct_F77@
     265ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    265266ac_ct_RANLIB = @ac_ct_RANLIB@
    266267ac_ct_STRIP = @ac_ct_STRIP@
    267268ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    268 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    269269am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    270270am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/bound_tightening/twoImpliedBT/Makefile.in

    r783 r973  
    258258ac_ct_CXX = @ac_ct_CXX@
    259259ac_ct_F77 = @ac_ct_F77@
     260ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    260261ac_ct_RANLIB = @ac_ct_RANLIB@
    261262ac_ct_STRIP = @ac_ct_STRIP@
    262263ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    263 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    264264am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    265265am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/branch

  • stable/0.4/Couenne/src/branch/Makefile.in

    r766 r973  
    274274ac_ct_CXX = @ac_ct_CXX@
    275275ac_ct_F77 = @ac_ct_F77@
     276ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    276277ac_ct_RANLIB = @ac_ct_RANLIB@
    277278ac_ct_STRIP = @ac_ct_STRIP@
    278279ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    279 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    280280am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    281281am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/convex/Makefile.in

    r766 r973  
    259259ac_ct_CXX = @ac_ct_CXX@
    260260ac_ct_F77 = @ac_ct_F77@
     261ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    261262ac_ct_RANLIB = @ac_ct_RANLIB@
    262263ac_ct_STRIP = @ac_ct_STRIP@
    263264ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    264 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    265265am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    266266am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/cut/crossconv/Makefile.in

    r766 r973  
    255255ac_ct_CXX = @ac_ct_CXX@
    256256ac_ct_F77 = @ac_ct_F77@
     257ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    257258ac_ct_RANLIB = @ac_ct_RANLIB@
    258259ac_ct_STRIP = @ac_ct_STRIP@
    259260ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    260 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    261261am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    262262am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/cut/sdpcuts/Makefile.in

    r627 r973  
    258258ac_ct_CXX = @ac_ct_CXX@
    259259ac_ct_F77 = @ac_ct_F77@
     260ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    260261ac_ct_RANLIB = @ac_ct_RANLIB@
    261262ac_ct_STRIP = @ac_ct_STRIP@
    262263ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    263 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    264264am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    265265am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/disjunctive/Makefile.in

    r766 r973  
    258258ac_ct_CXX = @ac_ct_CXX@
    259259ac_ct_F77 = @ac_ct_F77@
     260ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    260261ac_ct_RANLIB = @ac_ct_RANLIB@
    261262ac_ct_STRIP = @ac_ct_STRIP@
    262263ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    263 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    264264am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    265265am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/expression/Makefile.in

    r766 r973  
    274274ac_ct_CXX = @ac_ct_CXX@
    275275ac_ct_F77 = @ac_ct_F77@
     276ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    276277ac_ct_RANLIB = @ac_ct_RANLIB@
    277278ac_ct_STRIP = @ac_ct_STRIP@
    278279ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    279 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    280280am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    281281am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/heuristics/Makefile.in

    r766 r973  
    269269ac_ct_CXX = @ac_ct_CXX@
    270270ac_ct_F77 = @ac_ct_F77@
     271ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    271272ac_ct_RANLIB = @ac_ct_RANLIB@
    272273ac_ct_STRIP = @ac_ct_STRIP@
    273274ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    274 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    275275am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    276276am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/interfaces/Makefile.in

    r766 r973  
    256256ac_ct_CXX = @ac_ct_CXX@
    257257ac_ct_F77 = @ac_ct_F77@
     258ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    258259ac_ct_RANLIB = @ac_ct_RANLIB@
    259260ac_ct_STRIP = @ac_ct_STRIP@
    260261ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    261 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    262262am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    263263am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/main/Makefile.am

    r795 r973  
    4646# This line is necessary to allow VPATH compilation
    4747DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I..
     48
     49########################################################################
     50#                     Installing manifest (MSVC++)                     #
     51########################################################################
     52
     53if COIN_CXX_IS_CL
     54install-exec-hook:
     55        test -s couenne.exe.manifest && \
     56        mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
     57        cp couenne.exe $(bindir)/couenne.exe
     58endif
     59
  • stable/0.4/Couenne/src/main/Makefile.in

    r795 r973  
    270270ac_ct_CXX = @ac_ct_CXX@
    271271ac_ct_F77 = @ac_ct_F77@
     272ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    272273ac_ct_RANLIB = @ac_ct_RANLIB@
    273274ac_ct_STRIP = @ac_ct_STRIP@
    274275ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    275 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    276276am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    277277am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    594594        @echo "This command is intended for maintainers to use"
    595595        @echo "it deletes files that may require special tools to rebuild."
     596@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    596597clean: clean-am
    597598
     
    618619
    619620install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
     621        @$(NORMAL_INSTALL)
     622        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    620623
    621624install-info: install-info-am
     
    652655        html-am info info-am install install-am install-binPROGRAMS \
    653656        install-data install-data-am install-exec install-exec-am \
    654         install-info install-info-am install-libLTLIBRARIES \
    655         install-man install-strip installcheck installcheck-am \
    656         installdirs maintainer-clean maintainer-clean-generic \
    657         mostlyclean mostlyclean-compile mostlyclean-generic \
    658         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    659         uninstall-am uninstall-binPROGRAMS uninstall-info-am \
    660         uninstall-libLTLIBRARIES
    661 
     657        install-exec-hook install-info install-info-am \
     658        install-libLTLIBRARIES install-man install-strip installcheck \
     659        installcheck-am installdirs maintainer-clean \
     660        maintainer-clean-generic mostlyclean mostlyclean-compile \
     661        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     662        tags uninstall uninstall-am uninstall-binPROGRAMS \
     663        uninstall-info-am uninstall-libLTLIBRARIES
     664
     665
     666########################################################################
     667#                     Installing manifest (MSVC++)                     #
     668########################################################################
     669
     670@COIN_CXX_IS_CL_TRUE@install-exec-hook:
     671@COIN_CXX_IS_CL_TRUE@   test -s couenne.exe.manifest && \
     672@COIN_CXX_IS_CL_TRUE@   mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
     673@COIN_CXX_IS_CL_TRUE@   cp couenne.exe $(bindir)/couenne.exe
    662674# Tell versions [3.59,3.63) of GNU make to not export all variables.
    663675# Otherwise a system limit (for SysV at least) may be exceeded.
  • stable/0.4/Couenne/src/problem/Makefile.in

    r766 r973  
    292292ac_ct_CXX = @ac_ct_CXX@
    293293ac_ct_F77 = @ac_ct_F77@
     294ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    294295ac_ct_RANLIB = @ac_ct_RANLIB@
    295296ac_ct_STRIP = @ac_ct_STRIP@
    296297ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    297 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    298298am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    299299am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/readnl/Makefile.in

    r766 r973  
    262262ac_ct_CXX = @ac_ct_CXX@
    263263ac_ct_F77 = @ac_ct_F77@
     264ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    264265ac_ct_RANLIB = @ac_ct_RANLIB@
    265266ac_ct_STRIP = @ac_ct_STRIP@
    266267ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    267 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    268268am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    269269am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/standardize/Makefile.in

    r766 r973  
    258258ac_ct_CXX = @ac_ct_CXX@
    259259ac_ct_F77 = @ac_ct_F77@
     260ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    260261ac_ct_RANLIB = @ac_ct_RANLIB@
    261262ac_ct_STRIP = @ac_ct_STRIP@
    262263ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    263 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    264264am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    265265am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/src/util/Makefile.in

    r766 r973  
    255255ac_ct_CXX = @ac_ct_CXX@
    256256ac_ct_F77 = @ac_ct_F77@
     257ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    257258ac_ct_RANLIB = @ac_ct_RANLIB@
    258259ac_ct_STRIP = @ac_ct_STRIP@
    259260ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    260 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    261261am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    262262am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  • stable/0.4/Couenne/test/Makefile.in

    r627 r973  
    238238ac_ct_CXX = @ac_ct_CXX@
    239239ac_ct_F77 = @ac_ct_F77@
     240ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    240241ac_ct_RANLIB = @ac_ct_RANLIB@
    241242ac_ct_STRIP = @ac_ct_STRIP@
    242243ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    243 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    244244am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    245245am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
Note: See TracChangeset for help on using the changeset viewer.