Changeset 2542


Ignore:
Timestamp:
Feb 12, 2012 9:55:14 AM (9 years ago)
Author:
stefan
Message:

assume sources in coinhsl subdirectory; change version number to 1.4, so we can check for version >= 1.3 in Ipopt

Location:
ThirdParty/HSL/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk/INSTALL.HSL

    r2462 r2542  
    4646  tar xf coinhsl-x.y.z.tar
    4747
    48 Then copy the directories for all HSL codes that you want to use
    49 (e.g., mc19, ma27, ma28, hsl_ma77) and the directory named "common"
    50 to this directory before running the `configure' script.
    51 The configuration script will detect which source files you have
    52 and prepare the Makefile accordingly.
     48Then rename the directory coinhsl-x.y.z to coinhsl, or set a symbolic link:
     49  ln -s coinhsl-x.y.z coinhsl
     50
     51The configuration script will then detect which source files are available
     52in your coinhsl package and prepare the Makefile accordingly.
    5353
    5454Note, that in difference to previous versions of ThirdParty/HSL, the
  • ThirdParty/HSL/trunk/Makefile.am

    r2484 r2542  
    1616lib_LTLIBRARIES = libcoinhsl.la
    1717
    18 libcoinhsl_la_SOURCES = common/deps.f
     18libcoinhsl_la_SOURCES = coinhsl/common/deps.f
    1919
    2020if COIN_HAS_MC19
    21   libcoinhsl_la_SOURCES += mc19/mc19d.f
     21  libcoinhsl_la_SOURCES += coinhsl/mc19/mc19d.f
    2222endif
    2323
    2424if COIN_HAS_MA27
    25   libcoinhsl_la_SOURCES += ma27/ma27d.f
     25  libcoinhsl_la_SOURCES += coinhsl/ma27/ma27d.f
    2626endif
    2727
    2828if COIN_HAS_MA28
    29   libcoinhsl_la_SOURCES += ma28/ma28d.f
     29  libcoinhsl_la_SOURCES += coinhsl/ma28/ma28d.f
    3030endif
    3131
    3232if COIN_HAS_MA57
    33   libcoinhsl_la_SOURCES += ma57/ma57d.f
     33  libcoinhsl_la_SOURCES += coinhsl/ma57/ma57d.f
    3434endif
    3535
    3636if COIN_HAS_DEPSF90
    37   libcoinhsl_la_SOURCES += common/deps90.f90
     37  libcoinhsl_la_SOURCES += coinhsl/common/deps90.f90
    3838endif
    3939
    4040if COIN_HAS_HSL_MC68
    41   libcoinhsl_la_SOURCES += hsl_mc68/hsl_mc68i.f90 hsl_mc68/C/hsl_mc68i_ciface.f90
    42   includecoin_HEADERS += hsl_mc68/C/hsl_mc68i.h
     41  libcoinhsl_la_SOURCES += coinhsl/hsl_mc68/hsl_mc68i.f90 coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90
     42  includecoin_HEADERS += coinhsl/hsl_mc68/C/hsl_mc68i.h
    4343endif
    4444
    4545if COIN_HAS_HSL_MA77
    46   libcoinhsl_la_SOURCES += hsl_ma77/hsl_ma77d.f90
     46  libcoinhsl_la_SOURCES += coinhsl/hsl_ma77/hsl_ma77d.f90
    4747  nodist_includecoin_HEADERS = hsl_ma77_double.mod
    4848endif
    4949
    5050if COIN_HAS_HSL_MA86
    51   libcoinhsl_la_SOURCES += hsl_ma86/hsl_ma86d.f90 hsl_ma86/C/hsl_ma86d_ciface.f90
    52   includecoin_HEADERS += hsl_ma86/C/hsl_ma86d.h
     51  libcoinhsl_la_SOURCES += coinhsl/hsl_ma86/hsl_ma86d.f90 coinhsl/hsl_ma86/C/hsl_ma86d_ciface.f90
     52  includecoin_HEADERS += coinhsl/hsl_ma86/C/hsl_ma86d.h
    5353endif
    5454
    5555if COIN_HAS_HSL_MA97
    56   libcoinhsl_la_SOURCES += hsl_ma97/hsl_ma97d.f90 hsl_ma97/C/hsl_ma97d_ciface.f90
    57   includecoin_HEADERS += hsl_ma97/C/hsl_ma97d.h
     56  libcoinhsl_la_SOURCES += coinhsl/hsl_ma97/hsl_ma97d.f90 coinhsl/hsl_ma97/C/hsl_ma97d_ciface.f90
     57  includecoin_HEADERS += coinhsl/hsl_ma97/C/hsl_ma97d.h
    5858endif
    5959
  • ThirdParty/HSL/trunk/Makefile.in

    r2484 r2542  
    5353build_triplet = @build@
    5454host_triplet = @host@
    55 @BUILD_COINHSL_TRUE@@COIN_HAS_MC19_TRUE@am__append_1 = mc19/mc19d.f
    56 @BUILD_COINHSL_TRUE@@COIN_HAS_MA27_TRUE@am__append_2 = ma27/ma27d.f
    57 @BUILD_COINHSL_TRUE@@COIN_HAS_MA28_TRUE@am__append_3 = ma28/ma28d.f
    58 @BUILD_COINHSL_TRUE@@COIN_HAS_MA57_TRUE@am__append_4 = ma57/ma57d.f
    59 @BUILD_COINHSL_TRUE@@COIN_HAS_DEPSF90_TRUE@am__append_5 = common/deps90.f90
    60 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__append_6 = hsl_mc68/hsl_mc68i.f90 hsl_mc68/C/hsl_mc68i_ciface.f90
    61 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__append_7 = hsl_mc68/C/hsl_mc68i.h
    62 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@am__append_8 = hsl_ma77/hsl_ma77d.f90
    63 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA86_TRUE@am__append_9 = hsl_ma86/hsl_ma86d.f90 hsl_ma86/C/hsl_ma86d_ciface.f90
    64 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA86_TRUE@am__append_10 = hsl_ma86/C/hsl_ma86d.h
    65 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@am__append_11 = hsl_ma97/hsl_ma97d.f90 hsl_ma97/C/hsl_ma97d_ciface.f90
    66 @BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@am__append_12 = hsl_ma97/C/hsl_ma97d.h
     55@BUILD_COINHSL_TRUE@@COIN_HAS_MC19_TRUE@am__append_1 = coinhsl/mc19/mc19d.f
     56@BUILD_COINHSL_TRUE@@COIN_HAS_MA27_TRUE@am__append_2 = coinhsl/ma27/ma27d.f
     57@BUILD_COINHSL_TRUE@@COIN_HAS_MA28_TRUE@am__append_3 = coinhsl/ma28/ma28d.f
     58@BUILD_COINHSL_TRUE@@COIN_HAS_MA57_TRUE@am__append_4 = coinhsl/ma57/ma57d.f
     59@BUILD_COINHSL_TRUE@@COIN_HAS_DEPSF90_TRUE@am__append_5 = coinhsl/common/deps90.f90
     60@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__append_6 = coinhsl/hsl_mc68/hsl_mc68i.f90 coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90
     61@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MC68_TRUE@am__append_7 = coinhsl/hsl_mc68/C/hsl_mc68i.h
     62@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA77_TRUE@am__append_8 = coinhsl/hsl_ma77/hsl_ma77d.f90
     63@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA86_TRUE@am__append_9 = coinhsl/hsl_ma86/hsl_ma86d.f90 coinhsl/hsl_ma86/C/hsl_ma86d_ciface.f90
     64@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA86_TRUE@am__append_10 = coinhsl/hsl_ma86/C/hsl_ma86d.h
     65@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@am__append_11 = coinhsl/hsl_ma97/hsl_ma97d.f90 coinhsl/hsl_ma97/C/hsl_ma97d_ciface.f90
     66@BUILD_COINHSL_TRUE@@COIN_HAS_HSL_MA97_TRUE@am__append_12 = coinhsl/hsl_ma97/C/hsl_ma97d.h
    6767@BUILD_COINHSL_TRUE@@COIN_HAS_METIS_FALSE@am__append_13 = metis_dummy.c
    6868DIST_COMMON = $(am__configure_deps) $(am__includecoin_HEADERS_DIST) \
     
    9696LTLIBRARIES = $(lib_LTLIBRARIES)
    9797libcoinhsl_la_LIBADD =
    98 am__libcoinhsl_la_SOURCES_DIST = common/deps.f mc19/mc19d.f \
    99         ma27/ma27d.f ma28/ma28d.f ma57/ma57d.f common/deps90.f90 \
    100         hsl_mc68/hsl_mc68i.f90 hsl_mc68/C/hsl_mc68i_ciface.f90 \
    101         hsl_ma77/hsl_ma77d.f90 hsl_ma86/hsl_ma86d.f90 \
    102         hsl_ma86/C/hsl_ma86d_ciface.f90 hsl_ma97/hsl_ma97d.f90 \
    103         hsl_ma97/C/hsl_ma97d_ciface.f90 metis_dummy.c
     98am__libcoinhsl_la_SOURCES_DIST = coinhsl/common/deps.f \
     99        coinhsl/mc19/mc19d.f coinhsl/ma27/ma27d.f coinhsl/ma28/ma28d.f \
     100        coinhsl/ma57/ma57d.f coinhsl/common/deps90.f90 \
     101        coinhsl/hsl_mc68/hsl_mc68i.f90 \
     102        coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90 \
     103        coinhsl/hsl_ma77/hsl_ma77d.f90 coinhsl/hsl_ma86/hsl_ma86d.f90 \
     104        coinhsl/hsl_ma86/C/hsl_ma86d_ciface.f90 \
     105        coinhsl/hsl_ma97/hsl_ma97d.f90 \
     106        coinhsl/hsl_ma97/C/hsl_ma97d_ciface.f90 metis_dummy.c
    104107@BUILD_COINHSL_TRUE@@COIN_HAS_MC19_TRUE@am__objects_1 = mc19d.lo
    105108@BUILD_COINHSL_TRUE@@COIN_HAS_MA27_TRUE@am__objects_2 = ma27d.lo
     
    153156pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    154157DATA = $(pkgconfiglib_DATA)
    155 am__includecoin_HEADERS_DIST = hsl_mc68/C/hsl_mc68i.h \
    156         hsl_ma86/C/hsl_ma86d.h hsl_ma97/C/hsl_ma97d.h
     158am__includecoin_HEADERS_DIST = coinhsl/hsl_mc68/C/hsl_mc68i.h \
     159        coinhsl/hsl_ma86/C/hsl_ma86d.h coinhsl/hsl_ma97/C/hsl_ma97d.h
    157160includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
    158161nodist_includecoinHEADERS_INSTALL = $(INSTALL_HEADER)
     
    377380@BUILD_COINHSL_TRUE@    $(am__append_10) $(am__append_12)
    378381@BUILD_COINHSL_TRUE@lib_LTLIBRARIES = libcoinhsl.la
    379 @BUILD_COINHSL_TRUE@libcoinhsl_la_SOURCES = common/deps.f \
     382@BUILD_COINHSL_TRUE@libcoinhsl_la_SOURCES = coinhsl/common/deps.f \
    380383@BUILD_COINHSL_TRUE@    $(am__append_1) $(am__append_2) \
    381384@BUILD_COINHSL_TRUE@    $(am__append_3) $(am__append_4) \
     
    538541        $(LTF77COMPILE) -c -o $@ $<
    539542
    540 deps.lo: common/deps.f
    541         $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o deps.lo `test -f 'common/deps.f' || echo '$(srcdir)/'`common/deps.f
    542 
    543 mc19d.lo: mc19/mc19d.f
    544         $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o mc19d.lo `test -f 'mc19/mc19d.f' || echo '$(srcdir)/'`mc19/mc19d.f
    545 
    546 ma27d.lo: ma27/ma27d.f
    547         $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o ma27d.lo `test -f 'ma27/ma27d.f' || echo '$(srcdir)/'`ma27/ma27d.f
    548 
    549 ma28d.lo: ma28/ma28d.f
    550         $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o ma28d.lo `test -f 'ma28/ma28d.f' || echo '$(srcdir)/'`ma28/ma28d.f
    551 
    552 ma57d.lo: ma57/ma57d.f
    553         $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o ma57d.lo `test -f 'ma57/ma57d.f' || echo '$(srcdir)/'`ma57/ma57d.f
     543deps.lo: coinhsl/common/deps.f
     544        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o deps.lo `test -f 'coinhsl/common/deps.f' || echo '$(srcdir)/'`coinhsl/common/deps.f
     545
     546mc19d.lo: coinhsl/mc19/mc19d.f
     547        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o mc19d.lo `test -f 'coinhsl/mc19/mc19d.f' || echo '$(srcdir)/'`coinhsl/mc19/mc19d.f
     548
     549ma27d.lo: coinhsl/ma27/ma27d.f
     550        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o ma27d.lo `test -f 'coinhsl/ma27/ma27d.f' || echo '$(srcdir)/'`coinhsl/ma27/ma27d.f
     551
     552ma28d.lo: coinhsl/ma28/ma28d.f
     553        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o ma28d.lo `test -f 'coinhsl/ma28/ma28d.f' || echo '$(srcdir)/'`coinhsl/ma28/ma28d.f
     554
     555ma57d.lo: coinhsl/ma57/ma57d.f
     556        $(LIBTOOL) --tag=F77 --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o ma57d.lo `test -f 'coinhsl/ma57/ma57d.f' || echo '$(srcdir)/'`coinhsl/ma57/ma57d.f
    554557
    555558.f90.o:
     
    562565        $(LTFCCOMPILE) -c -o $@ $<
    563566
    564 deps90.lo: common/deps90.f90
    565         $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o deps90.lo `test -f 'common/deps90.f90' || echo '$(srcdir)/'`common/deps90.f90
    566 
    567 hsl_mc68i.lo: hsl_mc68/hsl_mc68i.f90
    568         $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_mc68i.lo `test -f 'hsl_mc68/hsl_mc68i.f90' || echo '$(srcdir)/'`hsl_mc68/hsl_mc68i.f90
    569 
    570 @BUILD_COINHSL_FALSE@hsl_mc68i_ciface.lo: hsl_mc68/C/hsl_mc68i_ciface.f90
    571         $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_mc68i_ciface.lo `test -f 'hsl_mc68/C/hsl_mc68i_ciface.f90' || echo '$(srcdir)/'`hsl_mc68/C/hsl_mc68i_ciface.f90
    572 
    573 hsl_ma77d.lo: hsl_ma77/hsl_ma77d.f90
    574         $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma77d.lo `test -f 'hsl_ma77/hsl_ma77d.f90' || echo '$(srcdir)/'`hsl_ma77/hsl_ma77d.f90
    575 
    576 hsl_ma86d.lo: hsl_ma86/hsl_ma86d.f90
    577         $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma86d.lo `test -f 'hsl_ma86/hsl_ma86d.f90' || echo '$(srcdir)/'`hsl_ma86/hsl_ma86d.f90
    578 
    579 @BUILD_COINHSL_FALSE@hsl_ma86d_ciface.lo: hsl_ma86/C/hsl_ma86d_ciface.f90
    580         $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma86d_ciface.lo `test -f 'hsl_ma86/C/hsl_ma86d_ciface.f90' || echo '$(srcdir)/'`hsl_ma86/C/hsl_ma86d_ciface.f90
    581 
    582 hsl_ma97d.lo: hsl_ma97/hsl_ma97d.f90
    583         $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma97d.lo `test -f 'hsl_ma97/hsl_ma97d.f90' || echo '$(srcdir)/'`hsl_ma97/hsl_ma97d.f90
    584 
    585 @BUILD_COINHSL_FALSE@hsl_ma97d_ciface.lo: hsl_ma97/C/hsl_ma97d_ciface.f90
    586         $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma97d_ciface.lo `test -f 'hsl_ma97/C/hsl_ma97d_ciface.f90' || echo '$(srcdir)/'`hsl_ma97/C/hsl_ma97d_ciface.f90
     567deps90.lo: coinhsl/common/deps90.f90
     568        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o deps90.lo `test -f 'coinhsl/common/deps90.f90' || echo '$(srcdir)/'`coinhsl/common/deps90.f90
     569
     570hsl_mc68i.lo: coinhsl/hsl_mc68/hsl_mc68i.f90
     571        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_mc68i.lo `test -f 'coinhsl/hsl_mc68/hsl_mc68i.f90' || echo '$(srcdir)/'`coinhsl/hsl_mc68/hsl_mc68i.f90
     572
     573@BUILD_COINHSL_FALSE@hsl_mc68i_ciface.lo: coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90
     574        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_mc68i_ciface.lo `test -f 'coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90' || echo '$(srcdir)/'`coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90
     575
     576hsl_ma77d.lo: coinhsl/hsl_ma77/hsl_ma77d.f90
     577        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma77d.lo `test -f 'coinhsl/hsl_ma77/hsl_ma77d.f90' || echo '$(srcdir)/'`coinhsl/hsl_ma77/hsl_ma77d.f90
     578
     579hsl_ma86d.lo: coinhsl/hsl_ma86/hsl_ma86d.f90
     580        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma86d.lo `test -f 'coinhsl/hsl_ma86/hsl_ma86d.f90' || echo '$(srcdir)/'`coinhsl/hsl_ma86/hsl_ma86d.f90
     581
     582@BUILD_COINHSL_FALSE@hsl_ma86d_ciface.lo: coinhsl/hsl_ma86/C/hsl_ma86d_ciface.f90
     583        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma86d_ciface.lo `test -f 'coinhsl/hsl_ma86/C/hsl_ma86d_ciface.f90' || echo '$(srcdir)/'`coinhsl/hsl_ma86/C/hsl_ma86d_ciface.f90
     584
     585hsl_ma97d.lo: coinhsl/hsl_ma97/hsl_ma97d.f90
     586        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma97d.lo `test -f 'coinhsl/hsl_ma97/hsl_ma97d.f90' || echo '$(srcdir)/'`coinhsl/hsl_ma97/hsl_ma97d.f90
     587
     588@BUILD_COINHSL_FALSE@hsl_ma97d_ciface.lo: coinhsl/hsl_ma97/C/hsl_ma97d_ciface.f90
     589        $(LIBTOOL) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o hsl_ma97d_ciface.lo `test -f 'coinhsl/hsl_ma97/C/hsl_ma97d_ciface.f90' || echo '$(srcdir)/'`coinhsl/hsl_ma97/C/hsl_ma97d_ciface.f90
    587590
    588591mostlyclean-libtool:
     
    698701        $(am__remove_distdir)
    699702        mkdir $(distdir)
    700         $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/hsl_ma86/C $(distdir)/hsl_ma97/C $(distdir)/hsl_mc68/C
     703        $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/coinhsl/hsl_ma86/C $(distdir)/coinhsl/hsl_ma97/C $(distdir)/coinhsl/hsl_mc68/C
    701704        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    702705        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • ThirdParty/HSL/trunk/configure

    r2484 r2542  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.59 for ThirdPartyHSL trunk.
     3# Generated by GNU Autoconf 2.59 for ThirdPartyHSL 1.4.
    44#
    55# Report bugs to <http://projects.coin-or.org/BuildTools/newticket>.
     
    430430PACKAGE_NAME='ThirdPartyHSL'
    431431PACKAGE_TARNAME='thirdpartyhsl'
    432 PACKAGE_VERSION='trunk'
    433 PACKAGE_STRING='ThirdPartyHSL trunk'
     432PACKAGE_VERSION='1.4'
     433PACKAGE_STRING='ThirdPartyHSL 1.4'
    434434PACKAGE_BUGREPORT='http://projects.coin-or.org/BuildTools/newticket'
    435435
    436 ac_unique_file="configure.ac"
     436ac_unique_file="coinhsl/common/deps.f"
    437437ac_default_prefix=`pwd`
    438438# Factoring default headers for most tests.
     
    10101010  # This message is too long to be a string in the A/UX 3.1 sh.
    10111011  cat <<_ACEOF
    1012 \`configure' configures ThirdPartyHSL trunk to adapt to many kinds of systems.
     1012\`configure' configures ThirdPartyHSL 1.4 to adapt to many kinds of systems.
    10131013
    10141014Usage: $0 [OPTION]... [VAR=VALUE]...
     
    10761076if test -n "$ac_init_help"; then
    10771077  case $ac_init_help in
    1078      short | recursive ) echo "Configuration of ThirdPartyHSL trunk:";;
     1078     short | recursive ) echo "Configuration of ThirdPartyHSL 1.4:";;
    10791079   esac
    10801080  cat <<\_ACEOF
     
    12571257if $ac_init_version; then
    12581258  cat <<\_ACEOF
    1259 ThirdPartyHSL configure trunk
     1259ThirdPartyHSL configure 1.4
    12601260generated by GNU Autoconf 2.59
    12611261
     
    12771277running configure, to aid debugging if configure makes a mistake.
    12781278
    1279 It was created by ThirdPartyHSL $as_me trunk, which was
     1279It was created by ThirdPartyHSL $as_me 1.4, which was
    12801280generated by GNU Autoconf 2.59.  Invocation command line was
    12811281
     
    16181618# List one file in the package so that the configure script can test
    16191619# whether the package is actually there
    1620 # Here we don't know yet which files are actually provided...
    16211620
    16221621
     
    34823481
    34833482# Provide some information about the compiler.
    3484 echo "$as_me:3484:" \
     3483echo "$as_me:3483:" \
    34853484     "checking for Fortran 77 compiler version" >&5
    34863485ac_compiler=`set X $ac_compile; echo $2`
     
    42554254ac_save_FFLAGS=$FFLAGS
    42564255FFLAGS="$FFLAGS $ac_verb"
    4257 (eval echo $as_me:4257: \"$ac_link\") >&5
     4256(eval echo $as_me:4256: \"$ac_link\") >&5
    42584257ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    42594258echo "$ac_f77_v_output" >&5
     
    43334332ac_save_FFLAGS=$FFLAGS
    43344333FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4335 (eval echo $as_me:4335: \"$ac_link\") >&5
     4334(eval echo $as_me:4334: \"$ac_link\") >&5
    43364335ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    43374336echo "$ac_f77_v_output" >&5
     
    52115210
    52125211# Provide some information about the compiler.
    5213 echo "$as_me:5213:" \
     5212echo "$as_me:5212:" \
    52145213     "checking for Fortran compiler version" >&5
    52155214ac_compiler=`set X $ac_compile; echo $2`
     
    57965795# Define the identity of the package.
    57975796 PACKAGE='thirdpartyhsl'
    5798  VERSION='trunk'
     5797 VERSION='1.4'
    57995798
    58005799
     
    69836982*-*-irix6*)
    69846983  # Find out which ABI we are using.
    6985   echo '#line 6985 "configure"' > conftest.$ac_ext
     6984  echo '#line 6984 "configure"' > conftest.$ac_ext
    69866985  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    69876986  (eval $ac_compile) 2>&5
     
    94609459   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94619460   -e 's:$: $lt_compiler_flag:'`
    9462    (eval echo "\"\$as_me:9462: $lt_compile\"" >&5)
     9461   (eval echo "\"\$as_me:9461: $lt_compile\"" >&5)
    94639462   (eval "$lt_compile" 2>conftest.err)
    94649463   ac_status=$?
    94659464   cat conftest.err >&5
    9466    echo "$as_me:9466: \$? = $ac_status" >&5
     9465   echo "$as_me:9465: \$? = $ac_status" >&5
    94679466   if (exit $ac_status) && test -s "$ac_outfile"; then
    94689467     # The compiler can only warn and ignore the option if not recognized
     
    97289727   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    97299728   -e 's:$: $lt_compiler_flag:'`
    9730    (eval echo "\"\$as_me:9730: $lt_compile\"" >&5)
     9729   (eval echo "\"\$as_me:9729: $lt_compile\"" >&5)
    97319730   (eval "$lt_compile" 2>conftest.err)
    97329731   ac_status=$?
    97339732   cat conftest.err >&5
    9734    echo "$as_me:9734: \$? = $ac_status" >&5
     9733   echo "$as_me:9733: \$? = $ac_status" >&5
    97359734   if (exit $ac_status) && test -s "$ac_outfile"; then
    97369735     # The compiler can only warn and ignore the option if not recognized
     
    98329831   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    98339832   -e 's:$: $lt_compiler_flag:'`
    9834    (eval echo "\"\$as_me:9834: $lt_compile\"" >&5)
     9833   (eval echo "\"\$as_me:9833: $lt_compile\"" >&5)
    98359834   (eval "$lt_compile" 2>out/conftest.err)
    98369835   ac_status=$?
    98379836   cat out/conftest.err >&5
    9838    echo "$as_me:9838: \$? = $ac_status" >&5
     9837   echo "$as_me:9837: \$? = $ac_status" >&5
    98399838   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    98409839   then
     
    1224912248  lt_status=$lt_dlunknown
    1225012249  cat > conftest.$ac_ext <<EOF
    12251 #line 12251 "configure"
     12250#line 12250 "configure"
    1225212251#include "confdefs.h"
    1225312252
     
    1234912348  lt_status=$lt_dlunknown
    1235012349  cat > conftest.$ac_ext <<EOF
    12351 #line 12351 "configure"
     12350#line 12350 "configure"
    1235212351#include "confdefs.h"
    1235312352
     
    1470914708   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1471014709   -e 's:$: $lt_compiler_flag:'`
    14711    (eval echo "\"\$as_me:14711: $lt_compile\"" >&5)
     14710   (eval echo "\"\$as_me:14710: $lt_compile\"" >&5)
    1471214711   (eval "$lt_compile" 2>conftest.err)
    1471314712   ac_status=$?
    1471414713   cat conftest.err >&5
    14715    echo "$as_me:14715: \$? = $ac_status" >&5
     14714   echo "$as_me:14714: \$? = $ac_status" >&5
    1471614715   if (exit $ac_status) && test -s "$ac_outfile"; then
    1471714716     # The compiler can only warn and ignore the option if not recognized
     
    1481314812   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1481414813   -e 's:$: $lt_compiler_flag:'`
    14815    (eval echo "\"\$as_me:14815: $lt_compile\"" >&5)
     14814   (eval echo "\"\$as_me:14814: $lt_compile\"" >&5)
    1481614815   (eval "$lt_compile" 2>out/conftest.err)
    1481714816   ac_status=$?
    1481814817   cat out/conftest.err >&5
    14819    echo "$as_me:14819: \$? = $ac_status" >&5
     14818   echo "$as_me:14818: \$? = $ac_status" >&5
    1482014819   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1482114820   then
     
    1638316382   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1638416383   -e 's:$: $lt_compiler_flag:'`
    16385    (eval echo "\"\$as_me:16385: $lt_compile\"" >&5)
     16384   (eval echo "\"\$as_me:16384: $lt_compile\"" >&5)
    1638616385   (eval "$lt_compile" 2>conftest.err)
    1638716386   ac_status=$?
    1638816387   cat conftest.err >&5
    16389    echo "$as_me:16389: \$? = $ac_status" >&5
     16388   echo "$as_me:16388: \$? = $ac_status" >&5
    1639016389   if (exit $ac_status) && test -s "$ac_outfile"; then
    1639116390     # The compiler can only warn and ignore the option if not recognized
     
    1648716486   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1648816487   -e 's:$: $lt_compiler_flag:'`
    16489    (eval echo "\"\$as_me:16489: $lt_compile\"" >&5)
     16488   (eval echo "\"\$as_me:16488: $lt_compile\"" >&5)
    1649016489   (eval "$lt_compile" 2>out/conftest.err)
    1649116490   ac_status=$?
    1649216491   cat out/conftest.err >&5
    16493    echo "$as_me:16493: \$? = $ac_status" >&5
     16492   echo "$as_me:16492: \$? = $ac_status" >&5
    1649416493   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1649516494   then
     
    1869418693   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1869518694   -e 's:$: $lt_compiler_flag:'`
    18696    (eval echo "\"\$as_me:18696: $lt_compile\"" >&5)
     18695   (eval echo "\"\$as_me:18695: $lt_compile\"" >&5)
    1869718696   (eval "$lt_compile" 2>conftest.err)
    1869818697   ac_status=$?
    1869918698   cat conftest.err >&5
    18700    echo "$as_me:18700: \$? = $ac_status" >&5
     18699   echo "$as_me:18699: \$? = $ac_status" >&5
    1870118700   if (exit $ac_status) && test -s "$ac_outfile"; then
    1870218701     # The compiler can only warn and ignore the option if not recognized
     
    1896218961   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1896318962   -e 's:$: $lt_compiler_flag:'`
    18964    (eval echo "\"\$as_me:18964: $lt_compile\"" >&5)
     18963   (eval echo "\"\$as_me:18963: $lt_compile\"" >&5)
    1896518964   (eval "$lt_compile" 2>conftest.err)
    1896618965   ac_status=$?
    1896718966   cat conftest.err >&5
    18968    echo "$as_me:18968: \$? = $ac_status" >&5
     18967   echo "$as_me:18967: \$? = $ac_status" >&5
    1896918968   if (exit $ac_status) && test -s "$ac_outfile"; then
    1897018969     # The compiler can only warn and ignore the option if not recognized
     
    1906619065   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1906719066   -e 's:$: $lt_compiler_flag:'`
    19068    (eval echo "\"\$as_me:19068: $lt_compile\"" >&5)
     19067   (eval echo "\"\$as_me:19067: $lt_compile\"" >&5)
    1906919068   (eval "$lt_compile" 2>out/conftest.err)
    1907019069   ac_status=$?
    1907119070   cat out/conftest.err >&5
    19072    echo "$as_me:19072: \$? = $ac_status" >&5
     19071   echo "$as_me:19071: \$? = $ac_status" >&5
    1907319072   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1907419073   then
     
    2205322052echo "$as_me:$LINENO: checking for MC19" >&5
    2205422053echo $ECHO_N "checking for MC19... $ECHO_C" >&6
    22055 if test -r $srcdir/mc19/mc19d.f; then
     22054if test -r $srcdir/coinhsl/mc19/mc19d.f; then
    2205622055
    2205722056cat >>confdefs.h <<\_ACEOF
     
    2208222081echo "$as_me:$LINENO: checking for MA27" >&5
    2208322082echo $ECHO_N "checking for MA27... $ECHO_C" >&6
    22084 if test -r $srcdir/ma27/ma27d.f; then
     22083if test -r $srcdir/coinhsl/ma27/ma27d.f; then
    2208522084
    2208622085cat >>confdefs.h <<\_ACEOF
     
    2211122110echo "$as_me:$LINENO: checking for MA28" >&5
    2211222111echo $ECHO_N "checking for MA28... $ECHO_C" >&6
    22113 if test -r $srcdir/ma28/ma28d.f; then
     22112if test -r $srcdir/coinhsl/ma28/ma28d.f; then
    2211422113
    2211522114cat >>confdefs.h <<\_ACEOF
     
    2214022139echo "$as_me:$LINENO: checking for MA57" >&5
    2214122140echo $ECHO_N "checking for MA57... $ECHO_C" >&6
    22142 if test -r $srcdir/ma57/ma57d.f; then
     22141if test -r $srcdir/coinhsl/ma57/ma57d.f; then
    2214322142
    2214422143cat >>confdefs.h <<\_ACEOF
     
    2217022169   echo "$as_me:$LINENO: checking for MA77" >&5
    2217122170echo $ECHO_N "checking for MA77... $ECHO_C" >&6
    22172    if test -r $srcdir/hsl_ma77/hsl_ma77d.f90; then
     22171   if test -r $srcdir/coinhsl/hsl_ma77/hsl_ma77d.f90; then
    2217322172
    2217422173cat >>confdefs.h <<\_ACEOF
     
    2220322202   echo "$as_me:$LINENO: checking for MA86" >&5
    2220422203echo $ECHO_N "checking for MA86... $ECHO_C" >&6
    22205    if test -r $srcdir/hsl_ma86/hsl_ma86d.f90; then
     22204   if test -r $srcdir/coinhsl/hsl_ma86/hsl_ma86d.f90; then
    2220622205
    2220722206cat >>confdefs.h <<\_ACEOF
     
    2223622235   echo "$as_me:$LINENO: checking for MA97" >&5
    2223722236echo $ECHO_N "checking for MA97... $ECHO_C" >&6
    22238    if test -r $srcdir/hsl_ma97/hsl_ma97d.f90; then
     22237   if test -r $srcdir/coinhsl/hsl_ma97/hsl_ma97d.f90; then
    2223922238
    2224022239cat >>confdefs.h <<\_ACEOF
     
    2227022269  echo "$as_me:$LINENO: checking for MC68" >&5
    2227122270echo $ECHO_N "checking for MC68... $ECHO_C" >&6
    22272   if test -r $srcdir/hsl_mc68/C/hsl_mc68i_ciface.f90; then
     22271  if test -r $srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90; then
    2227322272
    2227422273cat >>confdefs.h <<\_ACEOF
     
    2229922298fi
    2230022299
    22301 
    22302 # all codes depend on deps.f
    22303 if test $coin_has_something = yes ; then
    22304   echo "$as_me:$LINENO: checking for deps.f" >&5
    22305 echo $ECHO_N "checking for deps.f... $ECHO_C" >&6
    22306   if test -r $srcdir/common/deps.f; then
    22307   coin_has_depsf=yes
    22308   :
    22309 else
    22310   coin_has_depsf=no
    22311   :
    22312 fi
    22313 
    22314   echo "$as_me:$LINENO: result: $coin_has_depsf" >&5
    22315 echo "${ECHO_T}$coin_has_depsf" >&6
    22316   if test $coin_has_depsf = no; then
    22317     { { echo "$as_me:$LINENO: error: Required file common/deps.f not found" >&5
    22318 echo "$as_me: error: Required file common/deps.f not found" >&2;}
    22319    { (exit 1); exit 1; }; }
    22320   fi
    22321 fi
    2232222300
    2232322301# the F90 codes depend on deps90.f90
     
    2232522303  echo "$as_me:$LINENO: checking for deps90.f90" >&5
    2232622304echo $ECHO_N "checking for deps90.f90... $ECHO_C" >&6
    22327   if test -r $srcdir/common/deps90.f90; then
     22305  if test -r $srcdir/coinhsl/common/deps90.f90; then
    2232822306  coin_has_depsf90=yes
    2232922307  :
     
    2702927007cat >&5 <<_CSEOF
    2703027008
    27031 This file was extended by ThirdPartyHSL $as_me trunk, which was
     27009This file was extended by ThirdPartyHSL $as_me 1.4, which was
    2703227010generated by GNU Autoconf 2.59.  Invocation command line was
    2703327011
     
    2709227070cat >>$CONFIG_STATUS <<_ACEOF
    2709327071ac_cs_version="\\
    27094 ThirdPartyHSL config.status trunk
     27072ThirdPartyHSL config.status 1.4
    2709527073configured by $0, generated by GNU Autoconf 2.59,
    2709627074  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  • ThirdParty/HSL/trunk/configure.ac

    r2469 r2542  
    1313AC_PREREQ(2.59)
    1414
    15 AC_INIT([ThirdPartyHSL],[trunk],[http://projects.coin-or.org/BuildTools/newticket])
     15AC_INIT([ThirdPartyHSL],[1.4],[http://projects.coin-or.org/BuildTools/newticket])
    1616
    1717AC_COPYRIGHT([
     
    2323# List one file in the package so that the configure script can test
    2424# whether the package is actually there
    25 # Here we don't know yet which files are actually provided...
    26 AC_CONFIG_SRCDIR(configure.ac)
     25AC_CONFIG_SRCDIR([coinhsl/common/deps.f])
    2726
    2827# Where should everything be installed by default?  Here, we want it
     
    101100AC_DEFUN([MY_CHECK_HSLFILE],
    102101[AC_MSG_CHECKING([for m4_toupper(m4_bpatsubst($1, hsl_))])
    103 AC_COIN_CHECK_FILE([$srcdir/$1/$1d.f],
     102AC_COIN_CHECK_FILE([$srcdir/coinhsl/$1/$1d.f],
    104103                    [AC_DEFINE(m4_toupper(COINHSL_HAS_$1), [1], Define to 1 if m4_toupper(m4_bpatsubst($1, hsl_)) is available.)
    105104                     coin_has_something=yes
     
    113112[if test $have_f90 = yes; then
    114113   AC_MSG_CHECKING([for m4_toupper(m4_bpatsubst($1, hsl_))])
    115    AC_COIN_CHECK_FILE([$srcdir/$1/$1d.f90],
     114   AC_COIN_CHECK_FILE([$srcdir/coinhsl/$1/$1d.f90],
    116115                      [AC_DEFINE([COINHSL_HAS_]m4_toupper(m4_bpatsubst($1, hsl_)), [1], Define to 1 if m4_toupper(m4_bpatsubst($1, hsl_)) is available.)
    117116                       coin_has_something=yes
     
    135134if test $have_f90 = yes; then
    136135  AC_MSG_CHECKING([for MC68])
    137   AC_COIN_CHECK_FILE([$srcdir/hsl_mc68/C/hsl_mc68i_ciface.f90],
     136  AC_COIN_CHECK_FILE([$srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90],
    138137                     [AC_DEFINE(COINHSL_HAS_MC68, [1], Define to 1 if MC68 is available.)
    139138                      coin_has_something=yes
     
    146145AM_CONDITIONAL(COIN_HAS_HSL_MC68,[test $coin_has_hsl_mc68 = yes])
    147146
    148 # all codes depend on deps.f
    149 if test $coin_has_something = yes ; then
    150   AC_MSG_CHECKING([for deps.f])
    151   AC_COIN_CHECK_FILE([$srcdir/common/deps.f],
    152                      [coin_has_depsf=yes],
    153                      [coin_has_depsf=no])
    154   AC_MSG_RESULT($coin_has_depsf)
    155   if test $coin_has_depsf = no; then
    156     AC_MSG_ERROR([Required file common/deps.f not found])
    157   fi
    158 fi
    159 
    160147# the F90 codes depend on deps90.f90
    161148if test $coin_has_hsl_mc68$coin_has_hsl_ma77$coin_has_hsl_ma86$coin_has_hsl_ma97 != nononono ; then
    162149  AC_MSG_CHECKING([for deps90.f90])
    163   AC_COIN_CHECK_FILE([$srcdir/common/deps90.f90],
     150  AC_COIN_CHECK_FILE([$srcdir/coinhsl/common/deps90.f90],
    164151                     [coin_has_depsf90=yes],
    165152                     [coin_has_depsf90=no])
Note: See TracChangeset for help on using the changeset viewer.