Changeset 2568 for ThirdParty


Ignore:
Timestamp:
Jun 8, 2012 9:11:42 AM (8 years ago)
Author:
stefan
Message:

add define COINHSL_HAS_METIS for MA77 interface in current Ipopt/trunk, i.e., for using HSL 1.3 with Ipopt > 3.10 (patch contributed by Tony Kelman)

Location:
ThirdParty/HSL/stable/1.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/stable/1.3/config.h.in

    r2435 r2568  
    1515/* Define to 1 if MC19 is available. */
    1616#undef COINHSL_HAS_MC19
     17
     18/* Define to 1 if METIS is available */
     19#undef COINHSL_HAS_METIS
    1720
    1821/* SVN revision number of project */
  • ThirdParty/HSL/stable/1.3/config_coinhsl.h.in

    r2312 r2568  
    1919#undef COINHSL_HAS_MC19
    2020
     21/* Define to 1 if METIS is available */
     22#undef COINHSL_HAS_METIS
     23
    2124/* Version number of project */
    2225#undef COINHSL_VERSION
  • ThirdParty/HSL/stable/1.3/configure

    r2520 r2568  
    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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion COINHSL_SVN_REV 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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 ac_ct_F77 FFLAGS MPIF77 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED FLIBS EGREP FC FCFLAGS ac_ct_FC 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA METIS_DEPENDENCIES METIS_LIBS_INSTALLED METIS_CFLAGS_INSTALLED METIS_DATA_INSTALLED HSL_CFLAGS HSL_LIBS HSL_PCLIBS HSL_PCREQUIRES HSL_DEPENDENCIES HSL_CFLAGS_INSTALLED HSL_LIBS_INSTALLED COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE BLAS_LIBS BLAS_CFLAGS BLAS_DATA BLAS_DEPENDENCIES BLAS_LIBS_INSTALLED BLAS_CFLAGS_INSTALLED BLAS_DATA_INSTALLED COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_HAS_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA28_TRUE COIN_HAS_MA28_FALSE COIN_HAS_MA77_TRUE COIN_HAS_MA77_FALSE F77_SHARED_CMD F77_DLL_LINKFLAGS HSL_SHARED_LIB EXPORT_SYMBOLS DEFFILE INSTALL_LOADABLE_LIBRARY_TRUE INSTALL_LOADABLE_LIBRARY_FALSE NEED_DEFFILE_TRUE NEED_DEFFILE_FALSE EXTRA_SHARED_COMMAND_TRUE EXTRA_SHARED_COMMAND_FALSE BUILD_COINHSL_TRUE BUILD_COINHSL_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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion COINHSL_SVN_REV 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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 ac_ct_F77 FFLAGS MPIF77 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED FLIBS EGREP FC FCFLAGS ac_ct_FC 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA METIS_DEPENDENCIES METIS_LIBS_INSTALLED METIS_CFLAGS_INSTALLED METIS_DATA_INSTALLED HSL_CFLAGS HSL_LIBS HSL_PCLIBS HSL_PCREQUIRES HSL_DEPENDENCIES HSL_CFLAGS_INSTALLED HSL_LIBS_INSTALLED COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE BLAS_LIBS BLAS_CFLAGS BLAS_DATA BLAS_DEPENDENCIES BLAS_LIBS_INSTALLED BLAS_CFLAGS_INSTALLED BLAS_DATA_INSTALLED COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_HAS_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA28_TRUE COIN_HAS_MA28_FALSE COIN_HAS_MA77_TRUE COIN_HAS_MA77_FALSE F77_SHARED_CMD F77_DLL_LINKFLAGS HSL_SHARED_LIB EXPORT_SYMBOLS DEFFILE INSTALL_LOADABLE_LIBRARY_TRUE INSTALL_LOADABLE_LIBRARY_FALSE NEED_DEFFILE_TRUE NEED_DEFFILE_FALSE EXTRA_SHARED_COMMAND_TRUE EXTRA_SHARED_COMMAND_FALSE BUILD_COINHSL_TRUE BUILD_COINHSL_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2209522095fi
    2209622096
    22097 if test -r $srcdir/ma57ad.f; then
    22098   hsl_files="$hsl_files ma57ad.f"
    22099 
    22100 cat >>confdefs.h <<\_ACEOF
    22101 #define COINHSL_HAS_MA57 1
    22102 _ACEOF
    22103 
    22104                      coin_has_something=yes
    22105                      coin_has_ma57ad=yes
    22106   :
    22107 else
    22108   coin_has_ma57ad=no
    22109   :
    22110 fi
    22111 
    22112 
    22113 
    22114 if test $coin_has_ma57ad = yes; then
    22115   COIN_HAS_MA57_TRUE=
    22116   COIN_HAS_MA57_FALSE='#'
    22117 else
    22118   COIN_HAS_MA57_TRUE='#'
    22119   COIN_HAS_MA57_FALSE=
    22120 fi
    22121 
    22122 if test $coin_has_ma57ad = yes; then
    2212322097
    2212422098echo "$as_me:$LINENO: checking for COIN-OR package Metis" >&5
     
    2263222606
    2263322607
     22608if test $coin_has_metis = yes ; then
     22609
     22610cat >>confdefs.h <<\_ACEOF
     22611#define COINHSL_HAS_METIS 1
     22612_ACEOF
     22613
     22614fi
     22615
     22616if test -r $srcdir/ma57ad.f; then
     22617  hsl_files="$hsl_files ma57ad.f"
     22618
     22619cat >>confdefs.h <<\_ACEOF
     22620#define COINHSL_HAS_MA57 1
     22621_ACEOF
     22622
     22623                     coin_has_something=yes
     22624                     coin_has_ma57ad=yes
     22625  :
     22626else
     22627  coin_has_ma57ad=no
     22628  :
     22629fi
     22630
     22631
     22632
     22633if test $coin_has_ma57ad = yes; then
     22634  COIN_HAS_MA57_TRUE=
     22635  COIN_HAS_MA57_FALSE='#'
     22636else
     22637  COIN_HAS_MA57_TRUE='#'
     22638  COIN_HAS_MA57_FALSE=
     22639fi
     22640
     22641if test $coin_has_ma57ad = yes; then
    2263422642  if test $coin_has_metis != yes ; then
    2263522643    { { echo "$as_me:$LINENO: error: MA57 requires METIS, which is not found." >&5
     
    2644926457   { (exit 1); exit 1; }; }
    2645026458fi
    26451 if test -z "${COIN_HAS_MA57_TRUE}" && test -z "${COIN_HAS_MA57_FALSE}"; then
    26452   { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_MA57\" was never defined.
    26453 Usually this means the macro was only invoked conditionally." >&5
    26454 echo "$as_me: error: conditional \"COIN_HAS_MA57\" was never defined.
    26455 Usually this means the macro was only invoked conditionally." >&2;}
    26456    { (exit 1); exit 1; }; }
    26457 fi
    2645826459if test -z "${COIN_HAS_METIS_TRUE}" && test -z "${COIN_HAS_METIS_FALSE}"; then
    2645926460  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_METIS\" was never defined.
     
    2646726468Usually this means the macro was only invoked conditionally." >&5
    2646826469echo "$as_me: error: conditional \"COIN_HAS_METIS\" was never defined.
     26470Usually this means the macro was only invoked conditionally." >&2;}
     26471   { (exit 1); exit 1; }; }
     26472fi
     26473if test -z "${COIN_HAS_MA57_TRUE}" && test -z "${COIN_HAS_MA57_FALSE}"; then
     26474  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_MA57\" was never defined.
     26475Usually this means the macro was only invoked conditionally." >&5
     26476echo "$as_me: error: conditional \"COIN_HAS_MA57\" was never defined.
    2646926477Usually this means the macro was only invoked conditionally." >&2;}
    2647026478   { (exit 1); exit 1; }; }
     
    2720827216s,@COIN_HAS_MA27_TRUE@,$COIN_HAS_MA27_TRUE,;t t
    2720927217s,@COIN_HAS_MA27_FALSE@,$COIN_HAS_MA27_FALSE,;t t
    27210 s,@COIN_HAS_MA57_TRUE@,$COIN_HAS_MA57_TRUE,;t t
    27211 s,@COIN_HAS_MA57_FALSE@,$COIN_HAS_MA57_FALSE,;t t
    2721227218s,@METIS_LIBS@,$METIS_LIBS,;t t
    2721327219s,@METIS_CFLAGS@,$METIS_CFLAGS,;t t
     
    2722627232s,@COIN_HAS_METIS_TRUE@,$COIN_HAS_METIS_TRUE,;t t
    2722727233s,@COIN_HAS_METIS_FALSE@,$COIN_HAS_METIS_FALSE,;t t
     27234s,@COIN_HAS_MA57_TRUE@,$COIN_HAS_MA57_TRUE,;t t
     27235s,@COIN_HAS_MA57_FALSE@,$COIN_HAS_MA57_FALSE,;t t
    2722827236s,@BLAS_LIBS@,$BLAS_LIBS,;t t
    2722927237s,@BLAS_CFLAGS@,$BLAS_CFLAGS,;t t
  • ThirdParty/HSL/stable/1.3/configure.ac

    r2520 r2568  
    136136fi
    137137
     138AC_COIN_CHECK_PACKAGE(Metis, [coinmetis], HSL)
     139if test $coin_has_metis = yes ; then
     140  AC_DEFINE(COINHSL_HAS_METIS, [1], Define to 1 if METIS is available)
     141fi
     142
    138143MY_CHECK_HSLFILE(ma57ad,MA57)
    139144if test $coin_has_ma57ad = yes; then
    140   AC_COIN_CHECK_PACKAGE(Metis, [coinmetis], HSL)
    141145  if test $coin_has_metis != yes ; then
    142146    AC_MSG_ERROR([MA57 requires METIS, which is not found.])
Note: See TracChangeset for help on using the changeset viewer.