Changeset 162 for stable/2.1


Ignore:
Timestamp:
Sep 23, 2010 12:23:37 PM (10 years ago)
Author:
kulshres
Message:

merge stable version with revision 161

Location:
stable/2.1
Files:
2 added
56 edited

Legend:

Unmodified
Added
Removed
  • stable/2.1/ADOL-C/doc/version.tex

    r157 r162  
    11\newcommand{\packagename}{adolc}
    2 \newcommand{\packageversion}{2.1.9-stable}
     2\newcommand{\packageversion}{2.1.10-stable}
    33\newcommand{\packagetar}{\packagename-\packageversion}
  • stable/2.1/ADOL-C/examples/Makefile.am

    r116 r162  
    1717if SPARSE
    1818LDADD                   = -ladolc
    19 AM_LDFLAGS              = -L../src @COLPACK_LIBS@
     19AM_LDFLAGS              = -L../src
    2020AM_CPPFLAGS             += @COLPACK_CFLAGS@
    2121else
  • stable/2.1/ADOL-C/examples/Makefile.in

    r130 r162  
    281281@SPARSE_TRUE@LDADD = -ladolc
    282282@SPARSE_FALSE@AM_LDFLAGS = -L../src
    283 @SPARSE_TRUE@AM_LDFLAGS = -L../src @COLPACK_LIBS@
     283@SPARSE_TRUE@AM_LDFLAGS = -L../src
    284284INCLUDES = -I$(top_builddir)
    285285MAINTAINERCLEANFILES = Makefile.in *~ *.orig ADOLC-*.tap
  • stable/2.1/ADOL-C/examples/additional_examples/checkpointing/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                 = -ladolc @COLPACK_LIBS@
     18LDADD                 = -ladolc
    1919AM_LDFLAGS            = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/checkpointing/Makefile.in

    r130 r162  
    214214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215215@SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     216@SPARSE_TRUE@LDADD = -ladolc
    217217@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218218@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/detexam/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                = -ladolc @COLPACK_LIBS@
     18LDADD                = -ladolc
    1919AM_LDFLAGS           = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/detexam/Makefile.in

    r130 r162  
    218218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219219@SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     220@SPARSE_TRUE@LDADD = -ladolc
    221221@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222222@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/ext_diff_func/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                  = -ladolc @COLPACK_LIBS@
     18LDADD                  = -ladolc
    1919AM_LDFLAGS             = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/ext_diff_func/Makefile.in

    r130 r162  
    214214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215215@SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     216@SPARSE_TRUE@LDADD = -ladolc
    217217@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218218@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/fixpoint_exam/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                  = -ladolc @COLPACK_LIBS@
     18LDADD                  = -ladolc
    1919AM_LDFLAGS             = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/fixpoint_exam/Makefile.in

    r130 r162  
    214214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215215@SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     216@SPARSE_TRUE@LDADD = -ladolc
    217217@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218218@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/helm/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                = -ladolc @COLPACK_LIBS@
     18LDADD                = -ladolc
    1919AM_LDFLAGS           = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/helm/Makefile.in

    r130 r162  
    218218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219219@SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     220@SPARSE_TRUE@LDADD = -ladolc
    221221@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222222@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/hessmat/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                = -ladolc @COLPACK_LIBS@
     18LDADD                = -ladolc
    1919AM_LDFLAGS           = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/hessmat/Makefile.in

    r130 r162  
    214214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215215@SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     216@SPARSE_TRUE@LDADD = -ladolc
    217217@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218218@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/lighthouse/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                = -ladolc @COLPACK_LIBS@
     18LDADD                = -ladolc
    1919AM_LDFLAGS           = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/lighthouse/Makefile.in

    r130 r162  
    229229AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    230230@SPARSE_FALSE@LDADD = -ladolc
    231 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     231@SPARSE_TRUE@LDADD = -ladolc
    232232@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    233233@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/lufact/Makefile.am

    r116 r162  
    1717
    1818if SPARSE
    19 LDADD                = -ladolc @COLPACK_LIBS@
     19LDADD                = -ladolc
    2020AM_LDFLAGS           = -L../../../src
    2121else
  • stable/2.1/ADOL-C/examples/additional_examples/lufact/Makefile.in

    r130 r162  
    218218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219219@SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     220@SPARSE_TRUE@LDADD = -ladolc
    221221@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222222@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/ode/Makefile.am

    r116 r162  
    1717
    1818if SPARSE
    19 LDADD                = -ladolc @COLPACK_LIBS@
     19LDADD                = -ladolc
    2020AM_LDFLAGS           = -L../../../src
    2121else
  • stable/2.1/ADOL-C/examples/additional_examples/ode/Makefile.in

    r130 r162  
    226226AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    227227@SPARSE_FALSE@LDADD = -ladolc
    228 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     228@SPARSE_TRUE@LDADD = -ladolc
    229229@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    230230@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/openmp_exam/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                = -ladolc @COLPACK_LIBS@
     18LDADD                = -ladolc
    1919AM_LDFLAGS           = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/openmp_exam/Makefile.in

    r130 r162  
    218218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219219@SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     220@SPARSE_TRUE@LDADD = -ladolc
    221221@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222222@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/pow/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                = -ladolc @COLPACK_LIBS@
     18LDADD                = -ladolc
    1919AM_LDFLAGS           = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/pow/Makefile.in

    r130 r162  
    214214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215215@SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     216@SPARSE_TRUE@LDADD = -ladolc
    217217@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218218@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/scal/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                = -ladolc @COLPACK_LIBS@
     18LDADD                = -ladolc
    1919AM_LDFLAGS           = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/scal/Makefile.in

    r130 r162  
    214214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215215@SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     216@SPARSE_TRUE@LDADD = -ladolc
    217217@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218218@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/sparse/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                   = -ladolc @COLPACK_LIBS@
     18LDADD                   = -ladolc
    1919AM_LDFLAGS              = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/sparse/Makefile.in

    r130 r162  
    231231AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    232232@SPARSE_FALSE@LDADD = -ladolc
    233 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     233@SPARSE_TRUE@LDADD = -ladolc
    234234@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    235235@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/sparse/sparse_hessian.cpp

    r157 r162  
    8989        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    9090
     91    delete[] rind;
     92    delete[] cind;
     93    delete[] values;
     94
    9195    options[0] = 0;          /*                               safe mode (default) */
    9296    options[1] = 1;          /*                                   direct recovery */
     
    98102        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    99103
     104    delete[] rind;
     105    delete[] cind;
     106    delete[] values;
     107
    100108/*--------------------------------------------------------------------------*/
    101109/*  change value of x, but not the sparsity pattern                         */
     
    120128        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    121129
     130    delete[] rind;
     131    delete[] cind;
     132    delete[] values;
    122133
    123134/****************************************************************************/
  • stable/2.1/ADOL-C/examples/additional_examples/sparse/sparse_jacobian.cpp

    r157 r162  
    9494        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    9595
     96    delete[] rind;
     97    delete[] cind;
     98    delete[] values;
    9699/*--------------------------------------------------------------------------*/
    97100/*  same approach but using row compression                                 */
     
    108111        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    109112
     113    delete[] rind;
     114    delete[] cind;
     115    delete[] values;
    110116/*--------------------------------------------------------------------------*/
    111117/*  change value of x, but not the sparsity pattern                         */
     
    130136        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    131137
    132 
     138    delete[] rind;
     139    delete[] cind;
     140    delete[] values;
    133141/*--------------------------------------------------------------------------*/
    134142/*  same approach but using row compression                                 */
     
    145153        printf("%2d %2d %10.6f\n\n",rind[i],cind[i],values[i]);
    146154
     155    delete[] rind;
     156    delete[] cind;
     157    delete[] values;
    147158/****************************************************************************/
    148159/*******       sparse Jacobians, separate drivers             ***************/
  • stable/2.1/ADOL-C/examples/additional_examples/speelpenning/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                = -ladolc @COLPACK_LIBS@
     18LDADD                = -ladolc
    1919AM_LDFLAGS           = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/speelpenning/Makefile.in

    r130 r162  
    214214AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    215215@SPARSE_FALSE@LDADD = -ladolc
    216 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     216@SPARSE_TRUE@LDADD = -ladolc
    217217@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    218218@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/tapesave/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                = -ladolc @COLPACK_LIBS@
     18LDADD                = -ladolc
    1919AM_LDFLAGS           = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/tapesave/Makefile.in

    r130 r162  
    218218AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    219219@SPARSE_FALSE@LDADD = -ladolc
    220 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     220@SPARSE_TRUE@LDADD = -ladolc
    221221@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    222222@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/taylor/Makefile.am

    r116 r162  
    1616
    1717if SPARSE
    18 LDADD                = -ladolc @COLPACK_LIBS@
     18LDADD                = -ladolc
    1919AM_LDFLAGS           = -L../../../src
    2020else
  • stable/2.1/ADOL-C/examples/additional_examples/taylor/Makefile.in

    r130 r162  
    234234AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    235235@SPARSE_FALSE@LDADD = -ladolc
    236 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     236@SPARSE_TRUE@LDADD = -ladolc
    237237@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    238238@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/examples/additional_examples/timing/Makefile.am

    r116 r162  
    1717
    1818if SPARSE
    19 LDADD                   = -ladolc @COLPACK_LIBS@
     19LDADD                   = -ladolc
    2020AM_LDFLAGS              = -L../../../src
    2121else
  • stable/2.1/ADOL-C/examples/additional_examples/timing/Makefile.in

    r130 r162  
    304304AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src
    305305@SPARSE_FALSE@LDADD = -ladolc
    306 @SPARSE_TRUE@LDADD = -ladolc @COLPACK_LIBS@
     306@SPARSE_TRUE@LDADD = -ladolc
    307307@SPARSE_FALSE@AM_LDFLAGS = -L../../../src
    308308@SPARSE_TRUE@AM_LDFLAGS = -L../../../src
  • stable/2.1/ADOL-C/src/Makefile.am

    r116 r162  
    4444lib_LTLIBRARIES      = libadolc.la
    4545
    46 libadolc_la_LDFLAGS  = -version-info 2:1:1
     46libadolc_la_LDFLAGS  = -version-info 2:1:1 -no-undefined
     47
     48BUILT_SOURCES = $(top_builddir)/ADOL-C/src/adolc/adolc.h
     49
     50$(top_builddir)/ADOL-C/src/adolc/adolc.h:
     51        $(LN_S) $(top_srcdir)/ADOL-C/src adolc
    4752
    4853BUILT_SOURCES = $(top_builddir)/ADOL-C/src/adolc/adolc.h
  • stable/2.1/ADOL-C/src/Makefile.in

    r130 r162  
    335335
    336336lib_LTLIBRARIES = libadolc.la
    337 libadolc_la_LDFLAGS = -version-info 2:1:1 $(am__append_1)
     337libadolc_la_LDFLAGS = -version-info 2:1:1 -no-undefined \
     338        $(am__append_1)
    338339BUILT_SOURCES = $(top_builddir)/ADOL-C/src/adolc/adolc.h
    339340@SPARSE_FALSE@libadolc_la_SOURCES = adalloc.c malloc.c adouble.cpp \
     
    890891        $(LN_S) $(top_srcdir)/ADOL-C/src adolc
    891892
     893$(top_builddir)/ADOL-C/src/adolc/adolc.h:
     894        $(LN_S) $(top_srcdir)/ADOL-C/src adolc
     895
    892896# Tell versions [3.59,3.63) of GNU make to not export all variables.
    893897# Otherwise a system limit (for SysV at least) may be exceeded.
  • stable/2.1/ADOL-C/src/sparse/Makefile.am

    r157 r162  
    1313AM_CFLAGS                = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    1414AM_CXXFLAGS              = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    15 AM_LDFLAGS               = -no-undefined @COLPACK_LIBS@
    1615AM_CPPFLAGS               = -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
    1716
  • stable/2.1/ADOL-C/src/sparse/Makefile.in

    r157 r162  
    235235AM_CFLAGS = @ac_adolc_cflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    236236AM_CXXFLAGS = @ac_adolc_cxxflags@ -DADOLC_INTERNAL=1 -DSPARSE=1
    237 AM_LDFLAGS = -no-undefined @COLPACK_LIBS@
    238237AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C/src  @COLPACK_CFLAGS@
    239238INCLUDES = -I$(top_builddir)
  • stable/2.1/ADOL-C/src/sparse/sparsedrivers.cpp

    r157 r162  
    367367 
    368368      if (options[3] == 1)
    369        jr1d->RecoverD2Row_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     369       jr1d->RecoverD2Row_CoordinateFormat_unmanaged(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    370370     else
    371        jr1d->RecoverD2Cln_CoordinateFormat(g, sJinfos.B, sJinfos.JP, rind, cind, values);
     371       jr1d->RecoverD2Cln_CoordinateFormat_unmanaged(g, sJinfos.B, sJinfos.JP, rind, cind, values);
    372372
    373373    return ret_val;
     
    572572 
    573573     if (options[1] == 0)
    574        hr->IndirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     574       hr->IndirectRecover_CoordinateFormat_unmanaged(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    575575     else
    576        hr->DirectRecover_CoordinateFormat(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
     576       hr->DirectRecover_CoordinateFormat_unmanaged(g, sHinfos.Hcomp, sHinfos.HP, rind, cind, values);
    577577 
    578578    return ret_val;
     
    595595    int            indep,      /* number of independent variables         */
    596596    unsigned int ** HP)
     597#ifdef SPARSE
    597598{
    598599    SparseHessInfos sHinfos;
     
    611612    setTapeInfoHessSparse(tag, sHinfos);
    612613}
    613 
     614#else
     615{
     616    fprintf(DIAG_OUT, "ADOL-C error: function %s can only be used if sparse configuration option was used\n", __FUNCTION__);
     617    exit(-1);
     618}
     619#endif
    614620/*****************************************************************************/
    615621/*                                                    JACOBIAN BLOCK PATTERN */
  • stable/2.1/ADOL-C/test/Makefile.am

    r116 r162  
    1919INCLUDES                = -I$(top_builddir)/ADOL-C/src
    2020
    21 if SPARSE
    22 powexam_LDADD           = ../src/libadolc.la @COLPACK_LIBS@ $(ADDLIBS) $(CXXLIBS)
    23 speelpenning_LDADD = ../src/libadolc.la @COLPACK_LIBS@ $(ADDLIBS) $(CXXLIBS)
    24 else
    25 powexam_LDADD = ../src/libadolc.la $(ADDLIBS) $(CXXLIBS)
    26 speelpenning_LDADD = ../src/libadolc.la $(ADDLIBS) $(CXXLIBS)
    27 endif
    28 
     21powexam_LDADD           = ../src/libadolc.la
     22speelpenning_LDADD = ../src/libadolc.la
    2923
    3024
  • stable/2.1/ADOL-C/test/Makefile.in

    r130 r162  
    5454am_powexam_OBJECTS = powexam.$(OBJEXT)
    5555powexam_OBJECTS = $(am_powexam_OBJECTS)
    56 @SPARSE_FALSE@powexam_DEPENDENCIES = ../src/libadolc.la
    57 @SPARSE_TRUE@powexam_DEPENDENCIES = ../src/libadolc.la
     56powexam_DEPENDENCIES = ../src/libadolc.la
    5857am_speelpenning_OBJECTS = speelpenning.$(OBJEXT)
    5958speelpenning_OBJECTS = $(am_speelpenning_OBJECTS)
    60 @SPARSE_FALSE@speelpenning_DEPENDENCIES = ../src/libadolc.la
    61 @SPARSE_TRUE@speelpenning_DEPENDENCIES = ../src/libadolc.la
     59speelpenning_DEPENDENCIES = ../src/libadolc.la
    6260depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
    6361am__depfiles_maybe = depfiles
     
    216214powexam_SOURCES = powexam.cpp
    217215INCLUDES = -I$(top_builddir)/ADOL-C/src
    218 @SPARSE_FALSE@powexam_LDADD = ../src/libadolc.la $(ADDLIBS) $(CXXLIBS)
    219 @SPARSE_TRUE@powexam_LDADD = ../src/libadolc.la @COLPACK_LIBS@ $(ADDLIBS) $(CXXLIBS)
    220 @SPARSE_FALSE@speelpenning_LDADD = ../src/libadolc.la $(ADDLIBS) $(CXXLIBS)
    221 @SPARSE_TRUE@speelpenning_LDADD = ../src/libadolc.la @COLPACK_LIBS@ $(ADDLIBS) $(CXXLIBS)
     216powexam_LDADD = ../src/libadolc.la
     217speelpenning_LDADD = ../src/libadolc.la
    222218
    223219# Here list all include flags, relative to this "srcdir" directory.  This
  • stable/2.1/Makefile.am

    r130 r162  
    1313AUTOMAKE_OPTIONS     = foreign
    1414
    15 EXTRA_DIST           = TODO BUGS update_versions.sh \
     15EXTRA_DIST           = TODO BUGS LICENSE update_versions.sh \
    1616                       ADOL-C/doc/version.tex.in ADOL-C/doc/version.tex \
     17                       ADOL-C/doc/adolc-manual.pdf ADOL-C/doc/adolc-manual.ps \
     18                       ADOL-C/doc/adolc-manual.tex ADOL-C/doc/short_ref.pdf \
     19                       ADOL-C/doc/short_ref.ps ADOL-C/doc/short_ref.tex \
     20                       ADOL-C/doc/multiplexed.pdf ADOL-C/doc/multiplexed.eps \
     21                       ADOL-C/doc/tapeadv.pdf ADOL-C/doc/tapeadv.eps \
     22                       ADOL-C/doc/tapebasic.pdf ADOL-C/doc/tapebasic.eps \
     23                       ADOL-C/doc/tap_point.pdf ADOL-C/doc/tap_point.eps \
    1724                       autoconf/shave.in autoconf/shave-libtool.in \
    1825                       autoconf/dolt.m4 autoconf/shave.m4 \
     
    2532                       windows/vcredist_x86.exe windows/x64/vcredist_x64.exe \
    2633                       windows/installer.sh \
     34                       adolc.spec.in adolc.spec \
     35                       update_versions.sh \
    2736                       ThirdParty/ColPack/ColPack.vcxproj \
    2837                       ThirdParty/ColPack/colpack_vcxcompile.patch \
  • stable/2.1/Makefile.in

    r130 r162  
    3939subdir = .
    4040DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
    41         $(srcdir)/Makefile.in $(top_srcdir)/ADOL-C/doc/version.tex.in \
     41        $(srcdir)/Makefile.in $(srcdir)/adolc.spec.in \
     42        $(top_srcdir)/ADOL-C/doc/version.tex.in \
    4243        $(top_srcdir)/autoconf/shave-libtool.in \
    4344        $(top_srcdir)/autoconf/shave.in $(top_srcdir)/configure \
     
    6263        ADOL-C/doc/version.tex windows/sparse/config.h \
    6364        windows/nosparse/config.h windows/x64/sparse/config.h \
    64         windows/x64/nosparse/config.h
     65        windows/x64/nosparse/config.h adolc.spec
    6566CONFIG_CLEAN_VPATH_FILES =
    6667SOURCES =
     
    113114  done; \
    114115  reldir="$$dir2"
    115 DIST_ARCHIVES = $(distdir).tar.gz
     116DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
    116117GZIP_ENV = --best
    117118distuninstallcheck_listfiles = find . -type f -print
     
    257258top_srcdir = @top_srcdir@
    258259AUTOMAKE_OPTIONS = foreign
    259 EXTRA_DIST = TODO BUGS update_versions.sh \
     260EXTRA_DIST = TODO BUGS LICENSE update_versions.sh \
    260261                       ADOL-C/doc/version.tex.in ADOL-C/doc/version.tex \
     262                       ADOL-C/doc/adolc-manual.pdf ADOL-C/doc/adolc-manual.ps \
     263                       ADOL-C/doc/adolc-manual.tex ADOL-C/doc/short_ref.pdf \
     264                       ADOL-C/doc/short_ref.ps ADOL-C/doc/short_ref.tex \
     265                       ADOL-C/doc/multiplexed.pdf ADOL-C/doc/multiplexed.eps \
     266                       ADOL-C/doc/tapeadv.pdf ADOL-C/doc/tapeadv.eps \
     267                       ADOL-C/doc/tapebasic.pdf ADOL-C/doc/tapebasic.eps \
     268                       ADOL-C/doc/tap_point.pdf ADOL-C/doc/tap_point.eps \
    261269                       autoconf/shave.in autoconf/shave-libtool.in \
    262270                       autoconf/dolt.m4 autoconf/shave.m4 \
     
    269277                       windows/vcredist_x86.exe windows/x64/vcredist_x64.exe \
    270278                       windows/installer.sh \
     279                       adolc.spec.in adolc.spec \
     280                       update_versions.sh \
    271281                       ThirdParty/ColPack/ColPack.vcxproj \
    272282                       ThirdParty/ColPack/colpack_vcxcompile.patch \
     
    328338        cd $(top_builddir) && $(SHELL) ./config.status $@
    329339windows/x64/nosparse/config.h: $(top_builddir)/config.status $(top_srcdir)/windows/x64/nosparse/config.h.in
     340        cd $(top_builddir) && $(SHELL) ./config.status $@
     341adolc.spec: $(top_builddir)/config.status $(srcdir)/adolc.spec.in
    330342        cd $(top_builddir) && $(SHELL) ./config.status $@
    331343
     
    544556        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
    545557        $(am__remove_distdir)
    546 
    547558dist-bzip2: distdir
    548559        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
     
    572583dist dist-all: distdir
    573584        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
     585        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
    574586        $(am__remove_distdir)
    575587
  • stable/2.1/configure

    r157 r162  
    22# From configure.ac Revision.
    33# Guess values for system-dependent variables and create Makefiles.
    4 # Generated by GNU Autoconf 2.65 for adolc 2.1.9-stable.
     4# Generated by GNU Autoconf 2.65 for adolc 2.1.10-stable.
    55#
    66# Report bugs to <adol-c@list.coin-or.org>.
     
    703703PACKAGE_NAME='adolc'
    704704PACKAGE_TARNAME='adolc'
    705 PACKAGE_VERSION='2.1.9-stable'
    706 PACKAGE_STRING='adolc 2.1.9-stable'
     705PACKAGE_VERSION='2.1.10-stable'
     706PACKAGE_STRING='adolc 2.1.10-stable'
    707707PACKAGE_BUGREPORT='adol-c@list.coin-or.org'
    708708PACKAGE_URL=''
     
    14741474  # This message is too long to be a string in the A/UX 3.1 sh.
    14751475  cat <<_ACEOF
    1476 \`configure' configures adolc 2.1.9-stable to adapt to many kinds of systems.
     1476\`configure' configures adolc 2.1.10-stable to adapt to many kinds of systems.
    14771477
    14781478Usage: $0 [OPTION]... [VAR=VALUE]...
     
    15441544if test -n "$ac_init_help"; then
    15451545  case $ac_init_help in
    1546      short | recursive ) echo "Configuration of adolc 2.1.9-stable:";;
     1546     short | recursive ) echo "Configuration of adolc 2.1.10-stable:";;
    15471547   esac
    15481548  cat <<\_ACEOF
     
    15881588
    15891589  --with-colpack          path to the colpack library and headers
    1590                           [default=${PWD}/ThirdParty/ColPack]
     1590                          [default=${srcdir}/ThirdParty/ColPack]
    15911591  --with-openmp-flag=FLAG use FLAG to enable OpenMP at compile time
    15921592                          [default=none]
     
    16731673if $ac_init_version; then
    16741674  cat <<\_ACEOF
    1675 adolc configure 2.1.9-stable
     1675adolc configure 2.1.10-stable
    16761676generated by GNU Autoconf 2.65
    16771677
     
    23932393
    23942394} # ac_fn_c_check_header_mongrel
     2395
     2396# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
     2397# ---------------------------------------------------------
     2398# Tests whether HEADER exists, giving a warning if it cannot be compiled using
     2399# the include files in INCLUDES and setting the cache variable VAR
     2400# accordingly.
     2401ac_fn_cxx_check_header_mongrel ()
     2402{
     2403  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     2404  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     2405  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     2406$as_echo_n "checking for $2... " >&6; }
     2407if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     2408  $as_echo_n "(cached) " >&6
     2409fi
     2410eval ac_res=\$$3
     2411               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     2412$as_echo "$ac_res" >&6; }
     2413else
     2414  # Is the header compilable?
     2415{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
     2416$as_echo_n "checking $2 usability... " >&6; }
     2417cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     2418/* end confdefs.h.  */
     2419$4
     2420#include <$2>
     2421_ACEOF
     2422if ac_fn_cxx_try_compile "$LINENO"; then :
     2423  ac_header_compiler=yes
     2424else
     2425  ac_header_compiler=no
     2426fi
     2427rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     2428{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
     2429$as_echo "$ac_header_compiler" >&6; }
     2430
     2431# Is the header present?
     2432{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
     2433$as_echo_n "checking $2 presence... " >&6; }
     2434cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     2435/* end confdefs.h.  */
     2436#include <$2>
     2437_ACEOF
     2438if ac_fn_cxx_try_cpp "$LINENO"; then :
     2439  ac_header_preproc=yes
     2440else
     2441  ac_header_preproc=no
     2442fi
     2443rm -f conftest.err conftest.$ac_ext
     2444{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
     2445$as_echo "$ac_header_preproc" >&6; }
     2446
     2447# So?  What about this header?
     2448case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
     2449  yes:no: )
     2450    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
     2451$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
     2452    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
     2453$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     2454    ;;
     2455  no:yes:* )
     2456    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
     2457$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
     2458    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
     2459$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
     2460    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
     2461$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
     2462    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
     2463$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     2464    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
     2465$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     2466( cat <<\_ASBOX
     2467## -------------------------------------- ##
     2468## Report this to adol-c@list.coin-or.org ##
     2469## -------------------------------------- ##
     2470_ASBOX
     2471     ) | sed "s/^/$as_me: WARNING:     /" >&2
     2472    ;;
     2473esac
     2474  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
     2475$as_echo_n "checking for $2... " >&6; }
     2476if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
     2477  $as_echo_n "(cached) " >&6
     2478else
     2479  eval "$3=\$ac_header_compiler"
     2480fi
     2481eval ac_res=\$$3
     2482               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
     2483$as_echo "$ac_res" >&6; }
     2484fi
     2485  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
     2486
     2487} # ac_fn_cxx_check_header_mongrel
    23952488cat >config.log <<_ACEOF
    23962489This file contains any messages produced by compilers while
    23972490running configure, to aid debugging if configure makes a mistake.
    23982491
    2399 It was created by adolc $as_me 2.1.9-stable, which was
     2492It was created by adolc $as_me 2.1.10-stable, which was
    24002493generated by GNU Autoconf 2.65.  Invocation command line was
    24012494
     
    32103303# Define the identity of the package.
    32113304 PACKAGE='adolc'
    3212  VERSION='2.1.9-stable'
     3305 VERSION='2.1.10-stable'
    32133306
    32143307
     
    57905883  lt_cv_nm_interface="BSD nm"
    57915884  echo "int some_variable = 0;" > conftest.$ac_ext
    5792   (eval echo "\"\$as_me:5792: $ac_compile\"" >&5)
     5885  (eval echo "\"\$as_me:5885: $ac_compile\"" >&5)
    57935886  (eval "$ac_compile" 2>conftest.err)
    57945887  cat conftest.err >&5
    5795   (eval echo "\"\$as_me:5795: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
     5888  (eval echo "\"\$as_me:5888: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    57965889  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    57975890  cat conftest.err >&5
    5798   (eval echo "\"\$as_me:5798: output\"" >&5)
     5891  (eval echo "\"\$as_me:5891: output\"" >&5)
    57995892  cat conftest.out >&5
    58005893  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     
    69887081*-*-irix6*)
    69897082  # Find out which ABI we are using.
    6990   echo '#line 6990 "configure"' > conftest.$ac_ext
     7083  echo '#line 7083 "configure"' > conftest.$ac_ext
    69917084  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    69927085  (eval $ac_compile) 2>&5
     
    89028995   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    89038996   -e 's:$: $lt_compiler_flag:'`
    8904    (eval echo "\"\$as_me:8904: $lt_compile\"" >&5)
     8997   (eval echo "\"\$as_me:8997: $lt_compile\"" >&5)
    89058998   (eval "$lt_compile" 2>conftest.err)
    89068999   ac_status=$?
    89079000   cat conftest.err >&5
    8908    echo "$as_me:8908: \$? = $ac_status" >&5
     9001   echo "$as_me:9001: \$? = $ac_status" >&5
    89099002   if (exit $ac_status) && test -s "$ac_outfile"; then
    89109003     # The compiler can only warn and ignore the option if not recognized
     
    92419334   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    92429335   -e 's:$: $lt_compiler_flag:'`
    9243    (eval echo "\"\$as_me:9243: $lt_compile\"" >&5)
     9336   (eval echo "\"\$as_me:9336: $lt_compile\"" >&5)
    92449337   (eval "$lt_compile" 2>conftest.err)
    92459338   ac_status=$?
    92469339   cat conftest.err >&5
    9247    echo "$as_me:9247: \$? = $ac_status" >&5
     9340   echo "$as_me:9340: \$? = $ac_status" >&5
    92489341   if (exit $ac_status) && test -s "$ac_outfile"; then
    92499342     # The compiler can only warn and ignore the option if not recognized
     
    93469439   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93479440   -e 's:$: $lt_compiler_flag:'`
    9348    (eval echo "\"\$as_me:9348: $lt_compile\"" >&5)
     9441   (eval echo "\"\$as_me:9441: $lt_compile\"" >&5)
    93499442   (eval "$lt_compile" 2>out/conftest.err)
    93509443   ac_status=$?
    93519444   cat out/conftest.err >&5
    9352    echo "$as_me:9352: \$? = $ac_status" >&5
     9445   echo "$as_me:9445: \$? = $ac_status" >&5
    93539446   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    93549447   then
     
    94019494   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94029495   -e 's:$: $lt_compiler_flag:'`
    9403    (eval echo "\"\$as_me:9403: $lt_compile\"" >&5)
     9496   (eval echo "\"\$as_me:9496: $lt_compile\"" >&5)
    94049497   (eval "$lt_compile" 2>out/conftest.err)
    94059498   ac_status=$?
    94069499   cat out/conftest.err >&5
    9407    echo "$as_me:9407: \$? = $ac_status" >&5
     9500   echo "$as_me:9500: \$? = $ac_status" >&5
    94089501   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    94099502   then
     
    1176811861  lt_status=$lt_dlunknown
    1176911862  cat > conftest.$ac_ext <<_LT_EOF
    11770 #line 11770 "configure"
     11863#line 11863 "configure"
    1177111864#include "confdefs.h"
    1177211865
     
    1186411957  lt_status=$lt_dlunknown
    1186511958  cat > conftest.$ac_ext <<_LT_EOF
    11866 #line 11866 "configure"
     11959#line 11959 "configure"
    1186711960#include "confdefs.h"
    1186811961
     
    1382013913   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1382113914   -e 's:$: $lt_compiler_flag:'`
    13822    (eval echo "\"\$as_me:13822: $lt_compile\"" >&5)
     13915   (eval echo "\"\$as_me:13915: $lt_compile\"" >&5)
    1382313916   (eval "$lt_compile" 2>conftest.err)
    1382413917   ac_status=$?
    1382513918   cat conftest.err >&5
    13826    echo "$as_me:13826: \$? = $ac_status" >&5
     13919   echo "$as_me:13919: \$? = $ac_status" >&5
    1382713920   if (exit $ac_status) && test -s "$ac_outfile"; then
    1382813921     # The compiler can only warn and ignore the option if not recognized
     
    1391914012   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1392014013   -e 's:$: $lt_compiler_flag:'`
    13921    (eval echo "\"\$as_me:13921: $lt_compile\"" >&5)
     14014   (eval echo "\"\$as_me:14014: $lt_compile\"" >&5)
    1392214015   (eval "$lt_compile" 2>out/conftest.err)
    1392314016   ac_status=$?
    1392414017   cat out/conftest.err >&5
    13925    echo "$as_me:13925: \$? = $ac_status" >&5
     14018   echo "$as_me:14018: \$? = $ac_status" >&5
    1392614019   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1392714020   then
     
    1397114064   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1397214065   -e 's:$: $lt_compiler_flag:'`
    13973    (eval echo "\"\$as_me:13973: $lt_compile\"" >&5)
     14066   (eval echo "\"\$as_me:14066: $lt_compile\"" >&5)
    1397414067   (eval "$lt_compile" 2>out/conftest.err)
    1397514068   ac_status=$?
    1397614069   cat out/conftest.err >&5
    13977    echo "$as_me:13977: \$? = $ac_status" >&5
     14070   echo "$as_me:14070: \$? = $ac_status" >&5
    1397814071   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1397914072   then
     
    1515615249
    1515715250
    15158 if test "x$SIZEOF_VOID_P" = "x8" ; then
     15251if test "x$ac_cv_sizeof_void_p" = "x8" ; then
    1515915252   _lib=lib64
    1516015253else
     
    1581515908
    1581615909
    15817 $as_echo "#define ADOLC_PATCHLEVEL 9" >>confdefs.h
     15910$as_echo "#define ADOLC_PATCHLEVEL 10" >>confdefs.h
    1581815911
    1581915912ADOLC_VERSION=2
    1582015913ADOLC_SUBVERSION=1
    15821 ADOLC_PATCHLEVEL=9
     15914ADOLC_PATCHLEVEL=10
    1582215915
    1582315916
     
    1592616019fi
    1592716020
     16021abs_srcdir=`readlink -e ${ac_pwd}/${srcdir}`
    1592816022
    1592916023# Check whether --with-colpack was given.
     
    1593116025  withval=$with_colpack; colpack=$withval
    1593216026else
    15933   colpack=${PWD}/ThirdParty/ColPack
    15934 fi
    15935 
    15936 COLPACK_CFLAGS="-I$colpack/include"
    15937 COLPACK_LIBS="-L$colpack/${_lib} -lColPack -Wl,-rpath,$colpack/${_lib}"
    15938 save_CFLAGS="$CFLAGS"
    15939 save_LDFLAGS="$LDFLAGS"
    15940 CFLAGS="$CFLAGS $COLPACK_CFLAGS"
    15941 LDFLAGS="$LDFLAGS $COLPACK_LIBS"
    15942 echo "will test for linking with -lColPack from $colpack/${_lib}"
    15943 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack" >&5
    15944 $as_echo_n "checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack... " >&6; }
    15945 if test "${ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv+set}" = set; then :
    15946   $as_echo_n "(cached) " >&6
    15947 else
    15948   ac_check_lib_save_LIBS=$LIBS
    15949 LIBS="-lColPack  $LIBS"
    15950 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     16027  colpack=${abs_srcdir}/ThirdParty/ColPack
     16028fi
     16029
     16030
     16031if test "x${_lib}" != xlib ; then
     16032   dirlist="${_lib} lib build/${_lib} build/lib"
     16033else
     16034   dirlist="${_lib} build/${_lib}"
     16035fi
     16036
     16037ac_ext=cpp
     16038ac_cpp='$CXXCPP $CPPFLAGS'
     16039ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     16040ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     16041ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
     16042
     16043for dir in $dirlist ; do
     16044    unset ac_cv_header_ColPackHeaders_h
     16045    COLPACK_CFLAGS="-I$colpack/$dir/../include"
     16046    COLPACK_LIBDIR="$colpack/$dir"
     16047    COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR"
     16048    save_CPPFLAGS="$CPPFLAGS"
     16049    save_LDFLAGS="$LDFLAGS"
     16050    CPPFLAGS="$CPPFLAGS $COLPACK_CFLAGS"
     16051    LDFLAGS="$LDFLAGS $COLPACK_LIBS"
     16052    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ColPack in $COLPACK_LIBDIR" >&5
     16053$as_echo_n "checking for ColPack in $COLPACK_LIBDIR... " >&6; }
     16054
     16055ac_fn_cxx_check_header_mongrel "$LINENO" "ColPackHeaders.h" "ac_cv_header_ColPackHeaders_h" "$ac_includes_default"
     16056if test "x$ac_cv_header_ColPackHeaders_h" = x""yes; then :
     16057  have_colpackheaders=yes
     16058else
     16059  have_colpackheaders=no
     16060fi
     16061
     16062
     16063    if test x$have_colpackheaders = xyes ; then
     16064        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1595116065/* end confdefs.h.  */
    15952 
    15953 /* Override any GCC internal prototype to avoid an error.
    15954    Use char because int might match the return type of a GCC
    15955    builtin and then its argument prototype would still apply.  */
    15956 #ifdef __cplusplus
    15957 extern "C"
    15958 #endif
    15959 char _ZN7ColPack9GraphCore12GetInputFileEv ();
     16066#include <ColPackHeaders.h>
    1596016067int
    1596116068main ()
    1596216069{
    15963 return _ZN7ColPack9GraphCore12GetInputFileEv ();
     16070ColPack::GraphColoring g
    1596416071  ;
    1596516072  return 0;
    1596616073}
    1596716074_ACEOF
    15968 if ac_fn_c_try_link "$LINENO"; then :
    15969   ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=yes
    15970 else
    15971   ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=no
     16075if ac_fn_cxx_try_link "$LINENO"; then :
     16076  have_colpack=yes
     16077                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: linking with -lColPack succeeded" >&5
     16078$as_echo "linking with -lColPack succeeded" >&6; }
     16079else
     16080  have_colpack=no,
     16081                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: linking with -lColPack failed" >&5
     16082$as_echo "linking with -lColPack failed" >&6; }
    1597216083fi
    1597316084rm -f core conftest.err conftest.$ac_objext \
    1597416085    conftest$ac_exeext conftest.$ac_ext
    15975 LIBS=$ac_check_lib_save_LIBS
    15976 fi
    15977 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&5
    15978 $as_echo "$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&6; }
    15979 if test "x$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" = x""yes; then :
    15980   have_colpack=yes
    15981 else
    15982   have_colpack=no
    15983 fi
    15984 
    15985 CFLAGS="$save_CFLAGS"
    15986 LDFLAGS="$save_LDFLAGS"
    15987 if test x$have_colpack = xno -a "x${_lib}" != "xlib" ; then
    15988    unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
    15989    COLPACK_CFLAGS="-I$colpack/include"
    15990    COLPACK_LIBS="-L$colpack/lib -lColPack -Wl,-rpath,$colpack/build/lib"
    15991    save_CFLAGS="$CFLAGS"
    15992    save_LDFLAGS="$LDFLAGS"
    15993    CFLAGS="$CFLAGS $COLPACK_CFLAGS"
    15994    LDFLAGS="$LDFLAGS $COLPACK_LIBS"
    15995    echo "will test for linking with -lColPack from $colpack/lib"
    15996    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack" >&5
    15997 $as_echo_n "checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack... " >&6; }
    15998 if test "${ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv+set}" = set; then :
    15999   $as_echo_n "(cached) " >&6
    16000 else
    16001   ac_check_lib_save_LIBS=$LIBS
    16002 LIBS="-lColPack  $LIBS"
    16003 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    16004 /* end confdefs.h.  */
    16005 
    16006 /* Override any GCC internal prototype to avoid an error.
    16007    Use char because int might match the return type of a GCC
    16008    builtin and then its argument prototype would still apply.  */
    16009 #ifdef __cplusplus
    16010 extern "C"
    16011 #endif
    16012 char _ZN7ColPack9GraphCore12GetInputFileEv ();
    16013 int
    16014 main ()
    16015 {
    16016 return _ZN7ColPack9GraphCore12GetInputFileEv ();
    16017   ;
    16018   return 0;
    16019 }
    16020 _ACEOF
    16021 if ac_fn_c_try_link "$LINENO"; then :
    16022   ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=yes
    16023 else
    16024   ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=no
    16025 fi
    16026 rm -f core conftest.err conftest.$ac_objext \
    16027     conftest$ac_exeext conftest.$ac_ext
    16028 LIBS=$ac_check_lib_save_LIBS
    16029 fi
    16030 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&5
    16031 $as_echo "$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&6; }
    16032 if test "x$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" = x""yes; then :
    16033   have_colpack=yes
    16034 else
    16035   have_colpack=no
    16036 fi
    16037 
    16038    CFLAGS="$save_CFLAGS"
    16039    LDFLAGS="$save_LDFLAGS"
    16040 fi
    16041 if test x$have_colpack = xno ; then
    16042    unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
    16043    COLPACK_CFLAGS="-I$colpack/build/include"
    16044    COLPACK_LIBS="-L$colpack/build/${_lib} -lColPack -Wl,-rpath,$colpack/build/${_lib}"
    16045    save_CFLAGS="$CFLAGS"
    16046    save_LDFLAGS="$LDFLAGS"
    16047    CFLAGS="$CFLAGS $COLPACK_CFLAGS"
    16048    LDFLAGS="$LDFLAGS $COLPACK_LIBS"
    16049    echo "will test for linking with -lColPack from $colpack/build/${_lib}"
    16050    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack" >&5
    16051 $as_echo_n "checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack... " >&6; }
    16052 if test "${ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv+set}" = set; then :
    16053   $as_echo_n "(cached) " >&6
    16054 else
    16055   ac_check_lib_save_LIBS=$LIBS
    16056 LIBS="-lColPack  $LIBS"
    16057 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    16058 /* end confdefs.h.  */
    16059 
    16060 /* Override any GCC internal prototype to avoid an error.
    16061    Use char because int might match the return type of a GCC
    16062    builtin and then its argument prototype would still apply.  */
    16063 #ifdef __cplusplus
    16064 extern "C"
    16065 #endif
    16066 char _ZN7ColPack9GraphCore12GetInputFileEv ();
    16067 int
    16068 main ()
    16069 {
    16070 return _ZN7ColPack9GraphCore12GetInputFileEv ();
    16071   ;
    16072   return 0;
    16073 }
    16074 _ACEOF
    16075 if ac_fn_c_try_link "$LINENO"; then :
    16076   ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=yes
    16077 else
    16078   ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=no
    16079 fi
    16080 rm -f core conftest.err conftest.$ac_objext \
    16081     conftest$ac_exeext conftest.$ac_ext
    16082 LIBS=$ac_check_lib_save_LIBS
    16083 fi
    16084 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&5
    16085 $as_echo "$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&6; }
    16086 if test "x$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" = x""yes; then :
    16087   have_colpack=yes
    16088 else
    16089   have_colpack=no
    16090 fi
    16091 
    16092    CFLAGS="$save_CFLAGS"
    16093    LDFLAGS="$save_LDFLAGS"
    16094 fi
    16095 if test x$have_colpack = xno -a "x${_lib}" != "xlib" ; then
    16096    unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
    16097    COLPACK_CFLAGS="-I$colpack/build/include"
    16098    COLPACK_LIBS="-L$colpack/build/lib -lColPack -Wl,-rpath,$colpack/build/lib"
    16099    save_CFLAGS="$CFLAGS"
    16100    save_LDFLAGS="$LDFLAGS"
    16101    CFLAGS="$CFLAGS $COLPACK_CFLAGS"
    16102    LDFLAGS="$LDFLAGS $COLPACK_LIBS"
    16103    echo "will test for linking with -lColPack from $colpack/build/lib"
    16104    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack" >&5
    16105 $as_echo_n "checking for _ZN7ColPack9GraphCore12GetInputFileEv in -lColPack... " >&6; }
    16106 if test "${ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv+set}" = set; then :
    16107   $as_echo_n "(cached) " >&6
    16108 else
    16109   ac_check_lib_save_LIBS=$LIBS
    16110 LIBS="-lColPack  $LIBS"
    16111 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    16112 /* end confdefs.h.  */
    16113 
    16114 /* Override any GCC internal prototype to avoid an error.
    16115    Use char because int might match the return type of a GCC
    16116    builtin and then its argument prototype would still apply.  */
    16117 #ifdef __cplusplus
    16118 extern "C"
    16119 #endif
    16120 char _ZN7ColPack9GraphCore12GetInputFileEv ();
    16121 int
    16122 main ()
    16123 {
    16124 return _ZN7ColPack9GraphCore12GetInputFileEv ();
    16125   ;
    16126   return 0;
    16127 }
    16128 _ACEOF
    16129 if ac_fn_c_try_link "$LINENO"; then :
    16130   ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=yes
    16131 else
    16132   ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv=no
    16133 fi
    16134 rm -f core conftest.err conftest.$ac_objext \
    16135     conftest$ac_exeext conftest.$ac_ext
    16136 LIBS=$ac_check_lib_save_LIBS
    16137 fi
    16138 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&5
    16139 $as_echo "$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" >&6; }
    16140 if test "x$ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv" = x""yes; then :
    16141   have_colpack=yes
    16142 else
    16143   have_colpack=no
    16144 fi
    16145 
    16146    CFLAGS="$save_CFLAGS"
    16147    LDFLAGS="$save_LDFLAGS"
    16148 fi
     16086    else
     16087        have_colpack=no
     16088    fi
     16089    CPPFLAGS="$save_CPPFLAGS"
     16090    LDFLAGS="$save_LDFLAGS"
     16091    if test x$have_colpack = xyes ; then
     16092        break
     16093    fi
     16094done
     16095ac_ext=c
     16096ac_cpp='$CPP $CPPFLAGS'
     16097ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     16098ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     16099ac_compiler_gnu=$ac_cv_c_compiler_gnu
     16100
    1614916101 if test x$have_colpack = xyes; then
    1615016102  HAVE_LIBCOLPACK_TRUE=
     
    1615616108
    1615716109if test x$have_colpack = xyes; then
     16110   # test if the directories exists and what is the real path
     16111   # if not then we found ColPack in some standard location
     16112   # and these variables are useless
     16113   COLPACK_LIBDIR=`readlink -e $COLPACK_LIBDIR`
     16114   if test -n $COLPACK_LIBDIR ; then
     16115      colpack_incdir=`readlink -e $COLPACK_LIBDIR/../include`
     16116      if test -n $colpack_incdir ; then
     16117         COLPACK_CFLAGS="-I$colpack_incdir"
     16118      else
     16119         COLPACK_CFLAGS=""
     16120      fi
     16121      COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR"
     16122   else
     16123      COLPACK_CFLAGS=""
     16124      COLPACK_LIBS=""
     16125   fi
     16126   # if the real path to ColPack is inside the ${srcdir}
     16127   # then we should statically link all ColPack objects inside libadolc
     16128   # it is likely that the srcdir is not needed anymore after make install
     16129   # and thus deleted thus no more ColPack to dynamically link to
     16130   # an external ColPack path is less likely to be removed
     16131   if echo $COLPACK_LIBDIR | grep -q ^${abs_srcdir} ; then
     16132       echo will link ColPack static as it was found in the source directory
     16133       test -d $COLPACK_LIBDIR/.tmp && rm -rf $COLPACK_LIBDIR/.tmp
     16134       mkdir -p $COLPACK_LIBDIR/.tmp/
     16135       mkdir -p $COLPACK_LIBDIR/.tmp/.libs
     16136       ( cd $COLPACK_LIBDIR/.tmp/ ; $AR x ../libColPack.a ; cp *.o .libs/
     16137         for i in *.o ; do j=`echo $i | sed 's/\.o/\.lo/' `
     16138                 cat >$j <<EOF
     16139# $j - a libtool object file
     16140# Generated by doltcompile, not libtool
     16141pic_object='.libs/$i'
     16142non_pic_object='$i'
     16143EOF
     16144        done
     16145        )
     16146       COLPACK_LIBS=`find "$COLPACK_LIBDIR/.tmp" -name \*.lo -printf "%p "`
     16147   fi
    1615816148   sparse=yes
    16159    echo "will build sparse drivers as -lColPack found"
     16149   echo "will build sparse drivers as linking with -lColPack succeeded"
    1616016150fi
    1616116151 if test x${sparse} = xyes; then
     
    1643716427
    1643816428# output
    16439 ac_config_files="$ac_config_files Makefile autoconf/shave-libtool autoconf/shave ADOL-C/Makefile ADOL-C/src/Makefile ADOL-C/src/drivers/Makefile ADOL-C/src/sparse/Makefile ADOL-C/src/tapedoc/Makefile ADOL-C/doc/version.tex ADOL-C/examples/Makefile ADOL-C/examples/additional_examples/Makefile ADOL-C/examples/additional_examples/clock/Makefile ADOL-C/examples/additional_examples/checkpointing/Makefile ADOL-C/examples/additional_examples/ext_diff_func/Makefile ADOL-C/examples/additional_examples/fixpoint_exam/Makefile ADOL-C/examples/additional_examples/hessmat/Makefile ADOL-C/examples/additional_examples/lufact/Makefile ADOL-C/examples/additional_examples/openmp_exam/Makefile ADOL-C/examples/additional_examples/scal/Makefile ADOL-C/examples/additional_examples/speelpenning/Makefile ADOL-C/examples/additional_examples/taylor/Makefile ADOL-C/examples/additional_examples/detexam/Makefile ADOL-C/examples/additional_examples/helm/Makefile ADOL-C/examples/additional_examples/lighthouse/Makefile ADOL-C/examples/additional_examples/ode/Makefile ADOL-C/examples/additional_examples/sparse/Makefile ADOL-C/examples/additional_examples/tapesave/Makefile ADOL-C/examples/additional_examples/pow/Makefile ADOL-C/examples/additional_examples/timing/Makefile ADOL-C/test/Makefile windows/sparse/config.h windows/nosparse/config.h windows/x64/sparse/config.h windows/x64/nosparse/config.h"
     16429ac_config_files="$ac_config_files Makefile autoconf/shave-libtool autoconf/shave ADOL-C/Makefile ADOL-C/src/Makefile ADOL-C/src/drivers/Makefile ADOL-C/src/sparse/Makefile ADOL-C/src/tapedoc/Makefile ADOL-C/doc/version.tex ADOL-C/examples/Makefile ADOL-C/examples/additional_examples/Makefile ADOL-C/examples/additional_examples/clock/Makefile ADOL-C/examples/additional_examples/checkpointing/Makefile ADOL-C/examples/additional_examples/ext_diff_func/Makefile ADOL-C/examples/additional_examples/fixpoint_exam/Makefile ADOL-C/examples/additional_examples/hessmat/Makefile ADOL-C/examples/additional_examples/lufact/Makefile ADOL-C/examples/additional_examples/openmp_exam/Makefile ADOL-C/examples/additional_examples/scal/Makefile ADOL-C/examples/additional_examples/speelpenning/Makefile ADOL-C/examples/additional_examples/taylor/Makefile ADOL-C/examples/additional_examples/detexam/Makefile ADOL-C/examples/additional_examples/helm/Makefile ADOL-C/examples/additional_examples/lighthouse/Makefile ADOL-C/examples/additional_examples/ode/Makefile ADOL-C/examples/additional_examples/sparse/Makefile ADOL-C/examples/additional_examples/tapesave/Makefile ADOL-C/examples/additional_examples/pow/Makefile ADOL-C/examples/additional_examples/timing/Makefile ADOL-C/test/Makefile windows/sparse/config.h windows/nosparse/config.h windows/x64/sparse/config.h windows/x64/nosparse/config.h adolc.spec"
    1644016430
    1644116431
     
    1698916979# values after options handling.
    1699016980ac_log="
    16991 This file was extended by adolc $as_me 2.1.9-stable, which was
     16981This file was extended by adolc $as_me 2.1.10-stable, which was
    1699216982generated by GNU Autoconf 2.65.  Invocation command line was
    1699316983
     
    1705517045ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    1705617046ac_cs_version="\\
    17057 adolc config.status 2.1.9-stable
     17047adolc config.status 2.1.10-stable
    1705817048configured by $0, generated by GNU Autoconf 2.65,
    1705917049  with options \\"\$ac_cs_config\\"
     
    1756717557    "windows/x64/sparse/config.h") CONFIG_FILES="$CONFIG_FILES windows/x64/sparse/config.h" ;;
    1756817558    "windows/x64/nosparse/config.h") CONFIG_FILES="$CONFIG_FILES windows/x64/nosparse/config.h" ;;
     17559    "adolc.spec") CONFIG_FILES="$CONFIG_FILES adolc.spec" ;;
    1756917560
    1757017561  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  • stable/2.1/configure.ac

    r157 r162  
    1010define([ADOLC_VER], [2])
    1111define([ADOLC_SUB], [1])
    12 define([ADOLC_LVL], [9])
     12define([ADOLC_LVL], [10])
    1313
    1414AC_PREREQ(2.57)
     
    2121AC_CONFIG_HEADERS([ADOL-C/src/config.h])
    2222AC_PREFIX_DEFAULT(${HOME}/adolc_base)
    23 AM_INIT_AUTOMAKE
     23AM_INIT_AUTOMAKE([dist-bzip2])
    2424
    2525if test "x$CFLAGS" == x ; then
     
    4646
    4747AC_CHECK_SIZEOF([void *])
    48 if test "x$SIZEOF_VOID_P" = "x8" ; then
     48if test "x$ac_cv_sizeof_void_p" = "x8" ; then
    4949   _lib=lib64
    5050else
     
    151151            [sparse="no"
    152152             AC_MSG_RESULT(no)])
     153abs_srcdir=`readlink -e ${ac_pwd}/${srcdir}`
    153154AC_ARG_WITH(colpack,
    154155        [
    155 AS_HELP_STRING([--with-colpack],[path to the colpack library and headers [default=${PWD}/ThirdParty/ColPack]])],
     156AS_HELP_STRING([--with-colpack],[path to the colpack library and headers [default=${srcdir}/ThirdParty/ColPack]])],
    156157                [colpack=$withval],
    157                 [colpack=${PWD}/ThirdParty/ColPack])
    158 COLPACK_CFLAGS="-I$colpack/include"
    159 COLPACK_LIBS="-L$colpack/${_lib} -lColPack -Wl,-rpath,$colpack/${_lib}"
    160 save_CFLAGS="$CFLAGS"
    161 save_LDFLAGS="$LDFLAGS"
    162 CFLAGS="$CFLAGS $COLPACK_CFLAGS"
    163 LDFLAGS="$LDFLAGS $COLPACK_LIBS"
    164 echo "will test for linking with -lColPack from $colpack/${_lib}"
    165 AC_CHECK_LIB([ColPack], [_ZN7ColPack9GraphCore12GetInputFileEv], [have_colpack=yes], [have_colpack=no])
    166 CFLAGS="$save_CFLAGS"
    167 LDFLAGS="$save_LDFLAGS"
    168 if test x$have_colpack = xno -a "x${_lib}" != "xlib" ; then
    169    unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
    170    COLPACK_CFLAGS="-I$colpack/include"
    171    COLPACK_LIBS="-L$colpack/lib -lColPack -Wl,-rpath,$colpack/build/lib"
    172    save_CFLAGS="$CFLAGS"
    173    save_LDFLAGS="$LDFLAGS"
    174    CFLAGS="$CFLAGS $COLPACK_CFLAGS"
    175    LDFLAGS="$LDFLAGS $COLPACK_LIBS"
    176    echo "will test for linking with -lColPack from $colpack/lib"
    177    AC_CHECK_LIB([ColPack], [_ZN7ColPack9GraphCore12GetInputFileEv], [have_colpack=yes], [have_colpack=no])
    178    CFLAGS="$save_CFLAGS"
    179    LDFLAGS="$save_LDFLAGS"
    180 fi
    181 if test x$have_colpack = xno ; then
    182    unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
    183    COLPACK_CFLAGS="-I$colpack/build/include"
    184    COLPACK_LIBS="-L$colpack/build/${_lib} -lColPack -Wl,-rpath,$colpack/build/${_lib}"
    185    save_CFLAGS="$CFLAGS"
    186    save_LDFLAGS="$LDFLAGS"
    187    CFLAGS="$CFLAGS $COLPACK_CFLAGS"
    188    LDFLAGS="$LDFLAGS $COLPACK_LIBS"
    189    echo "will test for linking with -lColPack from $colpack/build/${_lib}"
    190    AC_CHECK_LIB([ColPack], [_ZN7ColPack9GraphCore12GetInputFileEv], [have_colpack=yes], [have_colpack=no])
    191    CFLAGS="$save_CFLAGS"
    192    LDFLAGS="$save_LDFLAGS"
    193 fi
    194 if test x$have_colpack = xno -a "x${_lib}" != "xlib" ; then
    195    unset ac_cv_lib_ColPack__ZN7ColPack9GraphCore12GetInputFileEv
    196    COLPACK_CFLAGS="-I$colpack/build/include"
    197    COLPACK_LIBS="-L$colpack/build/lib -lColPack -Wl,-rpath,$colpack/build/lib"
    198    save_CFLAGS="$CFLAGS"
    199    save_LDFLAGS="$LDFLAGS"
    200    CFLAGS="$CFLAGS $COLPACK_CFLAGS"
    201    LDFLAGS="$LDFLAGS $COLPACK_LIBS"
    202    echo "will test for linking with -lColPack from $colpack/build/lib"
    203    AC_CHECK_LIB([ColPack], [_ZN7ColPack9GraphCore12GetInputFileEv], [have_colpack=yes], [have_colpack=no])
    204    CFLAGS="$save_CFLAGS"
    205    LDFLAGS="$save_LDFLAGS"
    206 fi
     158                [colpack=${abs_srcdir}/ThirdParty/ColPack])
     159
     160if test "x${_lib}" != xlib ; then
     161   dirlist="${_lib} lib build/${_lib} build/lib"
     162else
     163   dirlist="${_lib} build/${_lib}"
     164fi
     165
     166AC_LANG_PUSH([C++])
     167for dir in $dirlist ; do
     168    unset ac_cv_header_ColPackHeaders_h
     169    COLPACK_CFLAGS="-I$colpack/$dir/../include"
     170    COLPACK_LIBDIR="$colpack/$dir"
     171    COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR"
     172    save_CPPFLAGS="$CPPFLAGS"
     173    save_LDFLAGS="$LDFLAGS"
     174    CPPFLAGS="$CPPFLAGS $COLPACK_CFLAGS"
     175    LDFLAGS="$LDFLAGS $COLPACK_LIBS"
     176    AC_MSG_CHECKING(for ColPack in $COLPACK_LIBDIR)
     177    AC_CHECK_HEADER([ColPackHeaders.h],[have_colpackheaders=yes],[have_colpackheaders=no])
     178    if test x$have_colpackheaders = xyes ; then
     179        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ColPackHeaders.h>],
     180                          [ColPack::GraphColoring g])],
     181                       [have_colpack=yes
     182                        AC_MSG_RESULT(linking with -lColPack succeeded)],
     183                       [have_colpack=no,
     184                        AC_MSG_RESULT(linking with -lColPack failed)])
     185    else
     186        have_colpack=no
     187    fi
     188    CPPFLAGS="$save_CPPFLAGS"
     189    LDFLAGS="$save_LDFLAGS"
     190    if test x$have_colpack = xyes ; then
     191        break
     192    fi
     193done
     194AC_LANG_POP([C++])
    207195AM_CONDITIONAL(HAVE_LIBCOLPACK,[test x$have_colpack = xyes])
    208196if test x$have_colpack = xyes; then
     197   # test if the directories exists and what is the real path
     198   # if not then we found ColPack in some standard location
     199   # and these variables are useless
     200   COLPACK_LIBDIR=`readlink -e $COLPACK_LIBDIR`
     201   if test -n $COLPACK_LIBDIR ; then
     202      colpack_incdir=`readlink -e $COLPACK_LIBDIR/../include`
     203      if test -n $colpack_incdir ; then
     204         COLPACK_CFLAGS="-I$colpack_incdir"
     205      else
     206         COLPACK_CFLAGS=""
     207      fi
     208      COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR"
     209   else
     210      COLPACK_CFLAGS=""
     211      COLPACK_LIBS=""
     212   fi
     213   # if the real path to ColPack is inside the ${srcdir}
     214   # then we should statically link all ColPack objects inside libadolc
     215   # it is likely that the srcdir is not needed anymore after make install
     216   # and thus deleted thus no more ColPack to dynamically link to
     217   # an external ColPack path is less likely to be removed
     218   if echo $COLPACK_LIBDIR | grep -q ^${abs_srcdir} ; then
     219       echo will link ColPack static as it was found in the source directory
     220       test -d $COLPACK_LIBDIR/.tmp && rm -rf $COLPACK_LIBDIR/.tmp
     221       mkdir -p $COLPACK_LIBDIR/.tmp/
     222       mkdir -p $COLPACK_LIBDIR/.tmp/.libs
     223       ( cd $COLPACK_LIBDIR/.tmp/ ; $AR x ../libColPack.a ; cp *.o .libs/
     224         for i in *.o ; do j=`echo $i | sed 's/\.o/\.lo/' `
     225                 cat >$j <<EOF
     226# $j - a libtool object file
     227# Generated by doltcompile, not libtool
     228pic_object='.libs/$i'
     229non_pic_object='$i'
     230EOF
     231        done
     232        )
     233       COLPACK_LIBS=`find "$COLPACK_LIBDIR/.tmp" -name \*.lo -printf "%p "`
     234   fi
    209235   sparse=yes
    210    echo "will build sparse drivers as -lColPack found"
     236   echo "will build sparse drivers as linking with -lColPack succeeded"
    211237fi
    212238AM_CONDITIONAL(SPARSE,[test x${sparse} = xyes])
     
    399425                windows/x64/sparse/config.h
    400426                windows/x64/nosparse/config.h
     427                adolc.spec
    401428)
    402429
  • stable/2.1/windows/nosparse/config.h

    r157 r162  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 9
     14#define ADOLC_PATCHLEVEL 10
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.9-stable"
     119#define PACKAGE_STRING "adolc 2.1.10-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.9-stable"
     125#define PACKAGE_VERSION "2.1.10-stable"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.9-stable"
     140#define VERSION "2.1.10-stable"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
  • stable/2.1/windows/sparse/config.h

    r157 r162  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 9
     14#define ADOLC_PATCHLEVEL 10
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.9-stable"
     119#define PACKAGE_STRING "adolc 2.1.10-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.9-stable"
     125#define PACKAGE_VERSION "2.1.10-stable"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.9-stable"
     140#define VERSION "2.1.10-stable"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
  • stable/2.1/windows/x64/nosparse/config.h

    r157 r162  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 9
     14#define ADOLC_PATCHLEVEL 10
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.9-stable"
     119#define PACKAGE_STRING "adolc 2.1.10-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.9-stable"
     125#define PACKAGE_VERSION "2.1.10-stable"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.9-stable"
     140#define VERSION "2.1.10-stable"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
  • stable/2.1/windows/x64/sparse/config.h

    r157 r162  
    1212
    1313/* ADOL-C Patchlevel */
    14 #define ADOLC_PATCHLEVEL 9
     14#define ADOLC_PATCHLEVEL 10
    1515
    1616/* ADOL-C safe extern mode */
     
    117117
    118118/* Define to the full name and version of this package. */
    119 #define PACKAGE_STRING "adolc 2.1.9-stable"
     119#define PACKAGE_STRING "adolc 2.1.10-stable"
    120120
    121121/* Define to the one symbol short name of this package. */
     
    123123
    124124/* Define to the version of this package. */
    125 #define PACKAGE_VERSION "2.1.9-stable"
     125#define PACKAGE_VERSION "2.1.10-stable"
    126126
    127127/* The size of `void *', as computed by sizeof. */
     
    138138
    139139/* Version number of package */
    140 #define VERSION "2.1.9-stable"
     140#define VERSION "2.1.10-stable"
    141141
    142142/* Define to empty if `const' does not conform to ANSI C. */
Note: See TracChangeset for help on using the changeset viewer.