Changeset 210


Ignore:
Timestamp:
Jan 30, 2007 4:42:09 PM (14 years ago)
Author:
andreasw
Message:

add support for MA28

Location:
ThirdParty/HSL/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/HSL/trunk/Makefile.am

    r51 r210  
    1 # Copyright (C) 2003, 2006 International Business Machines and others
     1# Copyright (C) 2003, 2007 International Business Machines and others
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
    … …  
    2525endif
    2626
     27if COIN_HAS_MA28
     28  nodist_libcoinhsl_la_SOURCES += ma28ad.f ma30ad.f mc13dd.f mc20ad.f \
     29        mc21ad.f mc22ad.f mc23ad.f mc24ad.f
     30endif
     31
    2732libcoinhsl_la_LDFLAGS = $(LT_LDFLAGS)
    2833

  • ThirdParty/HSL/trunk/Makefile.in

    r143 r210  
    1515@SET_MAKE@
    1616
    17 # Copyright (C) 2003, 2006 International Business Machines and others
     17# Copyright (C) 2003, 2007 International Business Machines and others
    1818# All Rights Reserved.
    1919# This file is distributed under the Common Public License.
    … …  
    5454@COIN_HAS_MA57_TRUE@am__append_2 = ma57ad.f
    5555@COIN_HAS_MC19_TRUE@am__append_3 = mc19ad.f
     56@COIN_HAS_MA28_TRUE@am__append_4 = ma28ad.f ma30ad.f mc13dd.f mc20ad.f \
     57@COIN_HAS_MA28_TRUE@    mc21ad.f mc22ad.f mc23ad.f mc24ad.f
     58
    5659DIST_COMMON = $(am__configure_deps) \
    5760        $(srcdir)/../../BuildTools/Makemain.inc \
    … …  
    6063        $(srcdir)/../../missing $(srcdir)/Makefile.am \
    6164        $(srcdir)/Makefile.in $(top_srcdir)/configure
    62 @HAVE_EXTERNALS_TRUE@am__append_4 = Externals
    63 @HAVE_EXTERNALS_TRUE@am__append_5 = .Externals-stamp
     65@HAVE_EXTERNALS_TRUE@am__append_5 = Externals
     66@HAVE_EXTERNALS_TRUE@am__append_6 = .Externals-stamp
    6467subdir = .
    6568ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    7780@COIN_HAS_MA57_TRUE@am__objects_2 = ma57ad.lo
    7881@COIN_HAS_MC19_TRUE@am__objects_3 = mc19ad.lo
     82@COIN_HAS_MA28_TRUE@am__objects_4 = ma28ad.lo ma30ad.lo mc13dd.lo \
     83@COIN_HAS_MA28_TRUE@    mc20ad.lo mc21ad.lo mc22ad.lo mc23ad.lo \
     84@COIN_HAS_MA28_TRUE@    mc24ad.lo
    7985nodist_libcoinhsl_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
    80         $(am__objects_3)
     86        $(am__objects_3) $(am__objects_4)
    8187libcoinhsl_la_OBJECTS = $(nodist_libcoinhsl_la_OBJECTS)
    8288DEFAULT_INCLUDES = -I. -I$(srcdir)
    … …  
    124130COIN_HAS_MA27_FALSE = @COIN_HAS_MA27_FALSE@
    125131COIN_HAS_MA27_TRUE = @COIN_HAS_MA27_TRUE@
     132COIN_HAS_MA28_FALSE = @COIN_HAS_MA28_FALSE@
     133COIN_HAS_MA28_TRUE = @COIN_HAS_MA28_TRUE@
    126134COIN_HAS_MA57_FALSE = @COIN_HAS_MA57_FALSE@
    127135COIN_HAS_MA57_TRUE = @COIN_HAS_MA57_TRUE@
    … …  
    237245target_alias = @target_alias@
    238246AUTOMAKE_OPTIONS = foreign
    239 EXTRA_DIST = INSTALL.HSL $(am__append_4)
     247EXTRA_DIST = INSTALL.HSL $(am__append_5)
    240248noinst_LTLIBRARIES = libcoinhsl.la
    241249nodist_libcoinhsl_la_SOURCES = $(am__append_1) $(am__append_2) \
    242         $(am__append_3)
     250        $(am__append_3) $(am__append_4)
    243251libcoinhsl_la_LDFLAGS = $(LT_LDFLAGS)
    244252
    … …  
    248256
    249257# Files that are generated and should be cleaned with make distclean
    250 DISTCLEANFILES = $(am__append_5) $(VPATH_DISTCLEANFILES)
     258DISTCLEANFILES = $(am__append_6) $(VPATH_DISTCLEANFILES)
    251259all: all-am
    252260

  • ThirdParty/HSL/trunk/configure

    r202 r210  
    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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 EGREP 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 LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL RPATH_FLAGS LT_LDFLAGS COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE COIN_HAS_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE LIBEXT VPATH_DISTCLEANFILES 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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 EGREP 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 LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL RPATH_FLAGS LT_LDFLAGS COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE COIN_HAS_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE COIN_HAS_MA28_TRUE COIN_HAS_MA28_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
    … …  
    2022720227fi
    2022820228
     20229as_ac_File=`echo "ac_cv_file_$srcdir/ma28ad.f" | $as_tr_sh`
     20230echo "$as_me:$LINENO: checking for $srcdir/ma28ad.f" >&5
     20231echo $ECHO_N "checking for $srcdir/ma28ad.f... $ECHO_C" >&6
     20232if eval "test \"\${$as_ac_File+set}\" = set"; then
     20233  echo $ECHO_N "(cached) $ECHO_C" >&6
     20234else
     20235  test "$cross_compiling" = yes &&
     20236  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
     20237echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
     20238   { (exit 1); exit 1; }; }
     20239if test -r "$srcdir/ma28ad.f"; then
     20240  eval "$as_ac_File=yes"
     20241else
     20242  eval "$as_ac_File=no"
     20243fi
     20244fi
     20245echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
     20246echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
     20247if test `eval echo '${'$as_ac_File'}'` = yes; then
     20248  hsl_files="$hsl_files ma28ad.f"
     20249                         coin_has_ma28ad=yes
     20250else
     20251  coin_has_ma28ad=no
     20252fi
     20253
     20254
     20255
     20256if test $coin_has_ma28ad = yes; then
     20257  COIN_HAS_MA28_TRUE=
     20258  COIN_HAS_MA28_FALSE='#'
     20259else
     20260  COIN_HAS_MA28_TRUE='#'
     20261  COIN_HAS_MA28_FALSE=
     20262fi
     20263
    2022920264
    2023020265#############################################################################
    … …  
    2043620471Usually this means the macro was only invoked conditionally." >&5
    2043720472echo "$as_me: error: conditional \"COIN_HAS_MA57\" was never defined.
     20473Usually this means the macro was only invoked conditionally." >&2;}
     20474   { (exit 1); exit 1; }; }
     20475fi
     20476if test -z "${COIN_HAS_MA28_TRUE}" && test -z "${COIN_HAS_MA28_FALSE}"; then
     20477  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_MA28\" was never defined.
     20478Usually this means the macro was only invoked conditionally." >&5
     20479echo "$as_me: error: conditional \"COIN_HAS_MA28\" was never defined.
    2043820480Usually this means the macro was only invoked conditionally." >&2;}
    2043920481   { (exit 1); exit 1; }; }
    … …  
    2106521107s,@COIN_HAS_MA57_TRUE@,$COIN_HAS_MA57_TRUE,;t t
    2106621108s,@COIN_HAS_MA57_FALSE@,$COIN_HAS_MA57_FALSE,;t t
     21109s,@COIN_HAS_MA28_TRUE@,$COIN_HAS_MA28_TRUE,;t t
     21110s,@COIN_HAS_MA28_FALSE@,$COIN_HAS_MA28_FALSE,;t t
    2106721111s,@LIBEXT@,$LIBEXT,;t t
    2106821112s,@VPATH_DISTCLEANFILES@,$VPATH_DISTCLEANFILES,;t t

  • ThirdParty/HSL/trunk/configure.ac

    r93 r210  
    7777MY_CHECK_HSLFILE(mc19ad,MC19)
    7878MY_CHECK_HSLFILE(ma57ad,MA57)
     79MY_CHECK_HSLFILE(ma28ad,MA28)
    7980
    8081#############################################################################
Note: See TracChangeset for help on using the changeset viewer.