Changeset 2461


Ignore:
Timestamp:
Oct 3, 2011 6:08:43 AM (8 years ago)
Author:
stefan
Message:

add checks for deps.f and deps90.f90

Location:
ThirdParty/HSL/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk/Makefile.am

    r2458 r2461  
    3434endif
    3535
    36 if COIN_HAS_HSL_F90
     36if COIN_HAS_DEPSF90
    3737  libcoinhsl_la_SOURCES += common/deps90.f90
    3838endif
  • ThirdParty/HSL/trunk/Makefile.in

    r2458 r2461  
    5757@BUILD_COINHSL_TRUE@@COIN_HAS_MA28_TRUE@am__append_3 = ma28/ma28d.f
    5858@BUILD_COINHSL_TRUE@@COIN_HAS_MA57_TRUE@am__append_4 = ma57/ma57d.f
    59 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_F90_TRUE@am__append_5 = common/deps90.f90
     59@BUILD_COINHSL_TRUE@@COIN_HAS_DEPSF90_TRUE@am__append_5 = common/deps90.f90
    6060@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__append_6 = hsl_mc68/C/hsl_mc68i_ciface.f90
    6161@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__append_7 = hsl_mc68/C/hsl_mc68i.h
     
    104104@BUILD_COINHSL_TRUE@@COIN_HAS_MA28_TRUE@am__objects_3 = ma28d.lo
    105105@BUILD_COINHSL_TRUE@@COIN_HAS_MA57_TRUE@am__objects_4 = ma57d.lo
    106 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_F90_TRUE@am__objects_5 = deps90.lo
     106@BUILD_COINHSL_TRUE@@COIN_HAS_DEPSF90_TRUE@am__objects_5 = deps90.lo
    107107@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__objects_6 = hsl_mc68i_ciface.lo
    108108@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@am__objects_7 =  \
     
    189189COIN_HAS_BLAS_FALSE = @COIN_HAS_BLAS_FALSE@
    190190COIN_HAS_BLAS_TRUE = @COIN_HAS_BLAS_TRUE@
    191 COIN_HAS_HSL_F90_FALSE = @COIN_HAS_HSL_F90_FALSE@
    192 COIN_HAS_HSL_F90_TRUE = @COIN_HAS_HSL_F90_TRUE@
     191COIN_HAS_DEPSF90_FALSE = @COIN_HAS_DEPSF90_FALSE@
     192COIN_HAS_DEPSF90_TRUE = @COIN_HAS_DEPSF90_TRUE@
    193193COIN_HAS_HSL_MA77_FALSE = @COIN_HAS_HSL_MA77_FALSE@
    194194COIN_HAS_HSL_MA77_TRUE = @COIN_HAS_HSL_MA77_TRUE@
  • ThirdParty/HSL/trunk/configure

    r2458 r2461  
    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_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE COIN_HAS_MA28_TRUE COIN_HAS_MA28_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE COIN_HAS_HSL_MA77_TRUE COIN_HAS_HSL_MA77_FALSE COIN_HAS_HSL_MA86_TRUE COIN_HAS_HSL_MA86_FALSE COIN_HAS_HSL_MA97_TRUE COIN_HAS_HSL_MA97_FALSE COIN_HAS_HSL_MC68_TRUE COIN_HAS_HSL_MC68_FALSE BLAS_LIBS BLAS_CFLAGS BLAS_DATA BLAS_DEPENDENCIES BLAS_LIBS_INSTALLED BLAS_CFLAGS_INSTALLED BLAS_DATA_INSTALLED HSL_CFLAGS HSL_LIBS HSL_PCLIBS HSL_PCREQUIRES HSL_DEPENDENCIES HSL_CFLAGS_INSTALLED HSL_LIBS_INSTALLED COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA METIS_DEPENDENCIES METIS_LIBS_INSTALLED METIS_CFLAGS_INSTALLED METIS_DATA_INSTALLED COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE COIN_HAS_HSL_F90_TRUE COIN_HAS_HSL_F90_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_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE COIN_HAS_MA28_TRUE COIN_HAS_MA28_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE COIN_HAS_HSL_MA77_TRUE COIN_HAS_HSL_MA77_FALSE COIN_HAS_HSL_MA86_TRUE COIN_HAS_HSL_MA86_FALSE COIN_HAS_HSL_MA97_TRUE COIN_HAS_HSL_MA97_FALSE COIN_HAS_HSL_MC68_TRUE COIN_HAS_HSL_MC68_FALSE COIN_HAS_DEPSF90_TRUE COIN_HAS_DEPSF90_FALSE BLAS_LIBS BLAS_CFLAGS BLAS_DATA BLAS_DEPENDENCIES BLAS_LIBS_INSTALLED BLAS_CFLAGS_INSTALLED BLAS_DATA_INSTALLED HSL_CFLAGS HSL_LIBS HSL_PCLIBS HSL_PCREQUIRES HSL_DEPENDENCIES HSL_CFLAGS_INSTALLED HSL_LIBS_INSTALLED COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA METIS_DEPENDENCIES METIS_LIBS_INSTALLED METIS_CFLAGS_INSTALLED METIS_DATA_INSTALLED COIN_HAS_METIS_TRUE COIN_HAS_METIS_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
     
    2229322293
    2229422294
     22295# all codes depend on deps.f
     22296if test $coin_has_something = yes ; then
     22297  echo "$as_me:$LINENO: checking for deps.f" >&5
     22298echo $ECHO_N "checking for deps.f... $ECHO_C" >&6
     22299  if test -r $srcdir/common/deps.f; then
     22300  coin_has_depsf=yes
     22301  :
     22302else
     22303  coin_has_depsf=no
     22304  :
     22305fi
     22306
     22307  echo "$as_me:$LINENO: result: $coin_has_depsf" >&5
     22308echo "${ECHO_T}$coin_has_depsf" >&6
     22309  if test $coin_has_depsf = no; then
     22310    { { echo "$as_me:$LINENO: error: Required file common/deps.f not found" >&5
     22311echo "$as_me: error: Required file common/deps.f not found" >&2;}
     22312   { (exit 1); exit 1; }; }
     22313  fi
     22314fi
     22315
     22316# the F90 codes depend on deps90.f90
     22317if test $coin_has_hsl_mc68$coin_has_hsl_ma77$coin_has_hsl_ma86$coin_has_hsl_ma97 != nononono ; then
     22318  echo "$as_me:$LINENO: checking for deps90.f90" >&5
     22319echo $ECHO_N "checking for deps90.f90... $ECHO_C" >&6
     22320  if test -r $srcdir/common/deps90.f90; then
     22321  coin_has_depsf90=yes
     22322  :
     22323else
     22324  coin_has_depsf90=no
     22325  :
     22326fi
     22327
     22328  echo "$as_me:$LINENO: result: $coin_has_depsf90" >&5
     22329echo "${ECHO_T}$coin_has_depsf90" >&6
     22330  if test $coin_has_depsf90 = no; then
     22331    { { echo "$as_me:$LINENO: error: Required file common/deps90.f90 not found" >&5
     22332echo "$as_me: error: Required file common/deps90.f90 not found" >&2;}
     22333   { (exit 1); exit 1; }; }
     22334  fi
     22335else
     22336  coin_has_depsf90=no
     22337fi
     22338
     22339
     22340if test $coin_has_depsf90 = yes; then
     22341  COIN_HAS_DEPSF90_TRUE=
     22342  COIN_HAS_DEPSF90_FALSE='#'
     22343else
     22344  COIN_HAS_DEPSF90_TRUE='#'
     22345  COIN_HAS_DEPSF90_FALSE=
     22346fi
     22347
     22348
    2229522349# MA57, MA77, and MA86 require BLAS
    2229622350if test $coin_has_ma57$coin_has_hsl_ma77$coin_has_hsl_ma86 != nonono ; then
     
    2620726261
    2620826262fi
    26209 
    26210 
    26211 
    26212 if test $coin_has_hsl_mc68$coin_has_hsl_ma77$coin_has_hsl_ma86$coin_has_hsl_ma97 != nononono; then
    26213   COIN_HAS_HSL_F90_TRUE=
    26214   COIN_HAS_HSL_F90_FALSE='#'
    26215 else
    26216   COIN_HAS_HSL_F90_TRUE='#'
    26217   COIN_HAS_HSL_F90_FALSE=
    26218 fi
    26219 
    2622026263
    2622126264#############################################################################
     
    2661626659   { (exit 1); exit 1; }; }
    2661726660fi
     26661if test -z "${COIN_HAS_DEPSF90_TRUE}" && test -z "${COIN_HAS_DEPSF90_FALSE}"; then
     26662  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_DEPSF90\" was never defined.
     26663Usually this means the macro was only invoked conditionally." >&5
     26664echo "$as_me: error: conditional \"COIN_HAS_DEPSF90\" was never defined.
     26665Usually this means the macro was only invoked conditionally." >&2;}
     26666   { (exit 1); exit 1; }; }
     26667fi
    2661826668if test -z "${COIN_HAS_BLAS_TRUE}" && test -z "${COIN_HAS_BLAS_FALSE}"; then
    2661926669  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_BLAS\" was never defined.
     
    2666926719Usually this means the macro was only invoked conditionally." >&5
    2667026720echo "$as_me: error: conditional \"COIN_HAS_METIS\" was never defined.
    26671 Usually this means the macro was only invoked conditionally." >&2;}
    26672    { (exit 1); exit 1; }; }
    26673 fi
    26674 if test -z "${COIN_HAS_HSL_F90_TRUE}" && test -z "${COIN_HAS_HSL_F90_FALSE}"; then
    26675   { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_HSL_F90\" was never defined.
    26676 Usually this means the macro was only invoked conditionally." >&5
    26677 echo "$as_me: error: conditional \"COIN_HAS_HSL_F90\" was never defined.
    2667826721Usually this means the macro was only invoked conditionally." >&2;}
    2667926722   { (exit 1); exit 1; }; }
     
    2736827411s,@COIN_HAS_HSL_MC68_TRUE@,$COIN_HAS_HSL_MC68_TRUE,;t t
    2736927412s,@COIN_HAS_HSL_MC68_FALSE@,$COIN_HAS_HSL_MC68_FALSE,;t t
     27413s,@COIN_HAS_DEPSF90_TRUE@,$COIN_HAS_DEPSF90_TRUE,;t t
     27414s,@COIN_HAS_DEPSF90_FALSE@,$COIN_HAS_DEPSF90_FALSE,;t t
    2737027415s,@BLAS_LIBS@,$BLAS_LIBS,;t t
    2737127416s,@BLAS_CFLAGS@,$BLAS_CFLAGS,;t t
     
    2739327438s,@COIN_HAS_METIS_TRUE@,$COIN_HAS_METIS_TRUE,;t t
    2739427439s,@COIN_HAS_METIS_FALSE@,$COIN_HAS_METIS_FALSE,;t t
    27395 s,@COIN_HAS_HSL_F90_TRUE@,$COIN_HAS_HSL_F90_TRUE,;t t
    27396 s,@COIN_HAS_HSL_F90_FALSE@,$COIN_HAS_HSL_F90_FALSE,;t t
    2739727440s,@F77_SHARED_CMD@,$F77_SHARED_CMD,;t t
    2739827441s,@F77_DLL_LINKFLAGS@,$F77_DLL_LINKFLAGS,;t t
  • ThirdParty/HSL/trunk/configure.ac

    r2458 r2461  
    150150AM_CONDITIONAL(COIN_HAS_HSL_MC68,[test $coin_has_hsl_mc68 = yes])
    151151
     152# all codes depend on deps.f
     153if test $coin_has_something = yes ; then
     154  AC_MSG_CHECKING([for deps.f])
     155  AC_COIN_CHECK_FILE([$srcdir/common/deps.f],
     156                     [coin_has_depsf=yes],
     157                     [coin_has_depsf=no])
     158  AC_MSG_RESULT($coin_has_depsf)
     159  if test $coin_has_depsf = no; then
     160    AC_MSG_ERROR([Required file common/deps.f not found])
     161  fi
     162fi
     163
     164# the F90 codes depend on deps90.f90
     165if test $coin_has_hsl_mc68$coin_has_hsl_ma77$coin_has_hsl_ma86$coin_has_hsl_ma97 != nononono ; then
     166  AC_MSG_CHECKING([for deps90.f90])
     167  AC_COIN_CHECK_FILE([$srcdir/common/deps90.f90],
     168                     [coin_has_depsf90=yes],
     169                     [coin_has_depsf90=no])
     170  AC_MSG_RESULT($coin_has_depsf90)
     171  if test $coin_has_depsf90 = no; then
     172    AC_MSG_ERROR([Required file common/deps90.f90 not found])
     173  fi
     174else
     175  coin_has_depsf90=no
     176fi
     177AM_CONDITIONAL(COIN_HAS_DEPSF90,[test $coin_has_depsf90 = yes])
     178
    152179# MA57, MA77, and MA86 require BLAS
    153180if test $coin_has_ma57$coin_has_hsl_ma77$coin_has_hsl_ma86 != nonono ; then
     
    169196  AM_CONDITIONAL(COIN_HAS_METIS, [test 0 = 1])
    170197fi
    171 
    172 AM_CONDITIONAL(COIN_HAS_HSL_F90,[test $coin_has_hsl_mc68$coin_has_hsl_ma77$coin_has_hsl_ma86$coin_has_hsl_ma97 != nononono])
    173198
    174199#############################################################################
Note: See TracChangeset for help on using the changeset viewer.