Changeset 981

Show
Ignore:
Timestamp:
10/22/08 09:36:28 (3 months ago)
Author:
feuillard
Message:

MERGE: merging from trunk into feuillard/devel (rev. 951:979)
feuillard/devel> svn merge -r 951:979 https://.../trunk

Synchronization with trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/feuillard/devel/bootstrap

    r818 r981  
    3434 
    3535submodules="lib python gui doc validation" 
     36test $# -ne 0 && submodules=$* 
    3637configdir="./config" 
    3738#otconfigdir="./include/openturns" 
    …… 
    6162#libtoolize --force --copy --ltdl --ltdl-tar 
    6263#libtoolize --force --copy 
    63 #libtoolize --automake 1>libtoolize.log 2>&1 
     64#libtoolize --automake --copy 1>libtoolize.log 2>&1 
    6465#echo "OK" 
    6566 

  • branches/feuillard/devel/configure.ac

    r936 r981  
    3030# Initialize Autoconf 
    3131AC_INIT([OpenTURNS platform], 
    32         [0.12.1], 
     32        [0.12.2], 
    3333        [bugs@openturns.org], 
    3434        [openturns]) 

  • branches/feuillard/devel/doc/bootstrap

    r698 r981  
    5757#libtoolize --force --copy --ltdl --ltdl-tar 
    5858#libtoolize --force --copy 
    59 #libtoolize --automake 1>libtoolize.log 2>&1 
     59#libtoolize --automake --copy 1>libtoolize.log 2>&1 
    6060#echo "OK" 
    6161 

  • branches/feuillard/devel/doc/configure.ac

    r936 r981  
    3030# Initialize Autoconf 
    3131AC_INIT([OpenTURNS platform documentation], 
    32         [0.12.1], 
     32        [0.12.2], 
    3333        [bugs@openturns.org], 
    3434        [openturns]) 

  • branches/feuillard/devel/doc/src/GenericInformation.tex

    r936 r981  
    1 \Large{\strut\\[2em]\bf Open TURNS version 0.11.2}\\ 
     1\Large{\strut\\[2em]\bf Open TURNS version 0.12.0}\\ 
    22\vspace*{2cm} 
    33 
    …… 
    55 
    66\vspace*{2cm} 
    7 \includegraphics[width=12cm]{/home/lapointe/Projects/OpenTURNS/platform/subversion/devel/doc/src/logoOpenTURNS.jpg} 
     7\includegraphics[width=12cm]{/home/ivan/OpenTURNS/dutka/devel/doc/src/logoOpenTURNS.jpg} 

  • branches/feuillard/devel/doc/src/UseCasesGuide/OpenTURNS_UseCasesGuide.tex

    r936 r981  
    10331033   # Create the correlation matrix R of the  normal copula  
    10341034   # from the Spearman correlation matrix S 
    1035    R = NormalCopula.getNormalCorrelationFromSpearmanCorrelation(S) 
     1035   R = NormalCopula.GetNormalCorrelationFromSpearmanCorrelation(S) 
    10361036     
    10371037   # Create the normal copula from the R correlation matrix 
    …… 
    14761476  # CARE : if the dimension is >1 
    14771477  # For example, with dimension 2, at pointVector=(2.3, 4.5) 
    1478   pointVector = NumeriaclPoint(2) 
     1478  pointVector = NumericalPoint(2) 
    14791479  pointVector[0] = 2.3 
    14801480  pointVector[1] = 4.5 
    …… 
    21142114 
    21152115    # Get the p-value of the Smirnov Test 
    2116     print "p-value of the Smirnov Test = ", resultSmirnov.getPvalue() 
     2116    print "p-value of the Smirnov Test = ", resultSmirnov.getPValue() 
    21172117 
    21182118    # Get the p-value threshold of the  Test 
    …… 
    21872187 
    21882188    # Get the p-value of the  Test 
    2189     print "p-value of the  Test = ", resultChiSquared.getPvalue() 
     2189    print "p-value of the  Test = ", resultChiSquared.getPValue() 
    21902190 
    21912191    # Get the p-value threshold of the ChiSquared Test 
    …… 
    22042204 
    22052205    # Get the p-value of the Pearson Test 
    2206     print "p-value of the Pearson Test = ", resultPearson.getPvalue() 
     2206    print "p-value of the Pearson Test = ", resultPearson.getPValue() 
    22072207 
    22082208    # Get the p-value threshold of the  Test 
    …… 
    22212221 
    22222222    # Get the p-value of the Spearman Test 
    2223     print "p-value of the Spearman Test = ", resultSpearman.getPvalue() 
     2223    print "p-value of the Spearman Test = ", resultSpearman.getPValue() 
    22242224 
    22252225    # Get the p-value threshold of the  Test 
    …… 
    22862286 
    22872287    # Get the p-value of the Pearson Test 
    2288         print "p-value of the Pearson Test = ", resultPartialPearson[i].getPvalue() 
     2288        print "p-value of the Pearson Test = ", resultPartialPearson[i].getPValue() 
    22892289 
    22902290    # Get the p-value threshold of the  Test 
    …… 
    23222322 
    23232323    # Get the p-value of the Spearman Test 
    2324         print "p-value of the Spearman Test = ", resultPartialSpearman[i].getPvalue() 
     2324        print "p-value of the Spearman Test = ", resultPartialSpearman[i].getPValue() 
    23252325 
    23262326    # Get the p-value threshold of the  Test 
    …… 
    23902390 
    23912391    # Get the p-value of the Regression Test 
    2392     print "p-value of the Regression Test = ", resultPartialRegression[i].getPvalue() 
     2392    print "p-value of the Regression Test = ", resultPartialRegression[i].getPValue() 
    23932393 
    23942394    # Get the p-value threshold of the  Test 
    …… 
    24802480    # p-value : probability (test variable decision > test variable decision evaluated on the samples) 
    24812481    # Test = True (=1) <=> p-value > p-value threshold 
    2482     resultKolmogorov =  FittingTest().Kolmogorov(sample, estimatedBetaDistribution, 0.95) 
     2482    resultKolmogorov =  FittingTest.Kolmogorov(sample, Distribution(estimatedBetaDistribution), 0.95) 
    24832483 
    24842484    # Print result of the Kolmogorov Test 
    …… 
    24862486 
    24872487    # Get the p-value of the Kolmogorov Test 
    2488     print "p-value of the Kolmogorov Test = ", resultKolmogorov.getPvalue() 
     2488    print "p-value of the Kolmogorov Test = ", resultKolmogorov.getPValue() 
    24892489 
    24902490    # Get the p-value threshold of the Kolmogorov Test 
    …… 
    25362536    # Test = True (=1) <=> p-value > p-value threshold 
    25372537    # Number of parameters estimated from sample : 1 
    2538     resultChiSquared =  FittingTest().ChiSquared(sample, estimatedPoissonDistribution, 0.95, 1) 
     2538    resultChiSquared =  FittingTest.ChiSquared(sample, Distribution(estimatedPoissonDistribution), 0.95, 1) 
    25392539 
    25402540    # Print result of the ChiSquared Test 
    …… 
    25422542 
    25432543    # Get the p-value threshold of the ChiSquared Test 
    2544     print "p-value threshold = ", resultChiSquared.getPvalue() 
     2544    print "p-value threshold = ", resultChiSquared.getPValue() 
    25452545 
    25462546    # Get the p-value threshold (corresponding to the confidence level) of the ChiSquared Test 
    …… 
    26732673 
    26742674    # Get the p-value of the Anderson Darling Test 
    2675     print "p-value of the Anderson Darling Test = ", resultAndersonDarling.getPvalue() 
     2675    print "p-value of the Anderson Darling Test = ", resultAndersonDarling.getPValue() 
    26762676 
    26772677    # Get the p-value threshold of the Anderson Darling Test 
    …… 
    26902690 
    26912691    # Get the p-value of the Cramer Von Mises Test 
    2692     print "p-value of the Cramer Von Mises Test = ", resultCramerVonMises.getPvalue() 
     2692    print "p-value of the Cramer Von Mises Test = ", resultCramerVonMises.getPValue() 
    26932693 
    26942694    # Get the p-value threshold of the Cramer Von Mises Test 
    …… 
    32563256    # Get the p-value of the LMRSquared Test  
    32573257    # CARE : it is NOT a probability here! but the R^2 value 
    3258     print "p-value of the LMRSquared Test = ", resultLMRSquared1.getPvalue() 
     3258    print "p-value of the LMRSquared Test = ", resultLMRSquared1.getPValue() 
    32593259 
    32603260    # Get the p-value threshold of the LMRSquared Test 
    …… 
    32843284    # Get the p-value of the LMAdjustedRSquared Test 
    32853285    # CARE : it is NOT a probability here! but the R^2 value 
    3286     print "p-value of the LMAdjustedRSquared Test = ", resultLMAdjustedRSquared1.getPvalue() 
     3286    print "p-value of the LMAdjustedRSquared Test = ", resultLMAdjustedRSquared1.getPValue() 
    32873287 
    32883288    # Get the p-value threshold of the LMAdjustedRSquared Test 
    …… 
    33083308 
    33093309    # Get the p-value of the  LMFisherTest 
    3310     print "p-value of the LMFisher Test = ", resultLMFisher1.getPvalue() 
     3310    print "p-value of the LMFisher Test = ", resultLMFisher1.getPValue() 
    33113311 
    33123312    # Get the p-value threshold of the LMFisher Test 
    …… 
    33313331 
    33323332    # Get the p-value of the  LMResidualMeanTest 
    3333     print "p-value of the LMResidualMean Test = ", resultLMResidualMean1.getPvalue() 
     3333    print "p-value of the LMResidualMean Test = ", resultLMResidualMean1.getPValue() 
    33343334 
    33353335    # Get the p-value threshold of the LMResidualMean Test 
    …… 
    39763976    inputIncrease[1] = "F" 
    39773977 
    3978 # Describe the output vector of dimension 1 
     3978# Describe the output vector of dimension 4 
    39793979    outputIncrease = Description(4) 
    39803980    outputIncrease[0] = "E"  
    …… 
    39873987    formulas[0] = "E" 
    39883988    formulas[1] = "F" 
    3989     formulas[2] = X2 
    3990     formulas[3] = X3 
     3989    formulas[2] = str(X2) 
     3990    formulas[3] = str(X3) 
    39913991    print "formulas=" , formulas  
    39923992 
    …… 
    51455145# Create a NearestPoint algorithm with Cobyla  
    51465146    myCobyla = Cobyla() 
    5147     # Give default specific parameters to the Cobyla algoithm 
    5148     myCobyla.setSpecificParameters(CobylaSpecificParameters()) 
    5149     print "Specific Parameters of Cobyla = ", myCobyla.getSpecificParameters() 
     5147 
     5148    # The Cobyla algorithm has default specific parameters 
     5149    # To get them, write 
     5150    print "Default Parameters of Cobyla = ", myCobyla.getSpecificParameters() 
     5151 
     5152    # It is possible to change the default values of the specific parameters :  
     5153    # For that, create the object CobylaSpecificParameters() 
     5154    myCobylaSpecificParameters = CobylaSpecificParameters() 
     5155    # Then change the values of the parameters : for example, the RhoBeg parameter 
     5156    myCobylaSpecificParameters.setRhoBeg(myValue) 
     5157    # Give these new parameters to the Cobyla algoithm 
     5158    myCobyla.setSpecificParameters(myCobylaSpecificParameters) 
    51505159 
    51515160# We could have created a NearestPoint algorithm with AbdoRackwitz  
    51525161    # myAbdoRackwitz = AbdoRackwitz() 
    5153     # myAbdoRackwitz.setSpecificParameters(AbdoRackwitzSpecificParameters()) 
    5154     # print "Specific Parameters of AbdoRackwitz = ", myAbdoRackwitz.getSpecificParameters() 
    51555162 
    51565163# We could have created a NearestPoint algorithm with SQP  
    51575164    # mySQP = SQP() 
    5158     # mySQP.setSpecificParameters(SQPSpecificParameters()) 
    5159     # print "Specific Parameters of SQP = ", mySQP.getSpecificParameters() 
    5160  
    5161 # Change the parameters of the algorithm 
     5165 
     5166# Change the general parameters of the algorithm 
    51625167    myCobyla.setMaximumIterationsNumber(100) 
    51635168    myCobyla.setMaximumAbsoluteError(1.0e-10) 
    …… 
    53995404# Create a NearestPoint algorithm with Cobyla  
    54005405    myCobyla = Cobyla() 
    5401     # Give default specific parameters to the Cobyla algoithm 
    5402     myCobyla.setSpecificParameters(CobylaSpecificParameters()) 
    5403     print "Specific Parameters of Cobyla = ", myCobyla.getSpecificParameters() 
     5406 
     5407    # The Cobyla algorithm has default specific parameters 
     5408    # To get them, write 
     5409    print "Default Parameters of Cobyla = ", myCobyla.getSpecificParameters() 
     5410 
     5411    # It is possible to change the default values of the specific parameters :  
     5412    # For that, create the object CobylaSpecificParameters() 
     5413    myCobylaSpecificParameters = CobylaSpecificParameters() 
     5414    # Then change the values of the parameters : for example, the RhoBeg parameter 
     5415    myCobylaSpecificParameters.setRhoBeg(myValue) 
     5416    # Give these new parameters to the Cobyla algoithm 
     5417    myCobyla.setSpecificParameters(myCobylaSpecificParameters) 
    54045418 
    54055419# We could have created a NearestPoint algorithm with AbdoRackwitz  
    54065420    # myAbdoRackwitz = AbdoRackwitz() 
    5407     # myAbdoRackwitz.setSpecificParameters(AbdoRackwitzSpecificParameters()) 
    5408  
    5409 # Change the parameters of the algorithm 
     5421 
     5422# We could have created a NearestPoint algorithm with SQP  
     5423    # mySQP = SQP() 
     5424 
     5425# Change the general parameters of the algorithm 
    54105426    myCobyla.setMaximumIterationsNumber(100) 
    54115427    myCobyla.setMaximumAbsoluteError(1.0e-10) 
    …… 
    55945610    \item[$\bullet$]  Variance of the MonteCarlo probability estimator 
    55955611    \item[type] : NumericalScalar 
     5612    \item[$\bullet$]  the input and output samples used during the algorithm, and the values of the probability estimator and its variance 
     5613    \item[type] : NumericalSample 
    55965614  \end{description} 
    55975615} 
    …… 
    57205738# stored according to the History Strategy specified 
    57215739# and used to draw the convergence graph 
    5722     myAlgo.getConvergenceStrategy().getSample() 
     5740    estimator_variance_sample = myAlgo.getConvergenceStrategy().getSample() 
    57235741\end{lstlisting} 
    57245742\espace 
    …… 
    69126930# We create a NearestPoint algorithm  
    69136931myCobyla = Cobyla() 
    6914 myCobyla.setSpecificParameters(CobylaSpecificParameters()) 
    69156932myCobyla.setMaximumIterationsNumber(1000) 
    69166933myCobyla.setMaximumAbsoluteError(1.0e-10) 

  • branches/feuillard/devel/doc/src/UserManual/Distribution_UserManual.tex

    r936 r981  
    20092009        \item[Some methods :]  \strut  
    20102010                \begin{description} 
    2011                         \item $getNormalCorrelationFromKendallCorrelation$ 
    2012                                         \begin{description} 
    2013                                                 \item[Usage :] $NormalCopulagetNormalCorrelationFromKendallCorrelation(K)$ 
     2011                        \item $GetNormalCorrelationFromKendallCorrelation$ 
     2012                                        \begin{description} 
     2013                                                \item[Usage :] $NormaCopula.GetNormalCorrelationFromKendallCorrelation(K)$ 
    20142014                                                \item[Arguments :] $K$ : a CorrelationMatrix, it must be the Kendall correlation matrix of the considered random vector 
    20152015                                                \item[Value :] a CorrelationMatrix, the correlation matrix of the normal copula evaluated from the Kendall correlation matrix $K$ 
    …… 
    20172017                        \bigskip 
    20182018                                 
    2019                         \item $getNormalCorrelationFromSpearmanCorrelation$ 
    2020                                         \begin{description} 
    2021                                                 \item[Usage :] $NormalCopula.getNormalCorrelationFromSpearmanCorrelation(S)$ 
     2019                        \item $GetNormalCorrelationFromSpearmanCorrelation$ 
     2020                                        \begin{description} 
     2021                                                \item[Usage :] $NormalCopula.GetNormalCorrelationFromSpearmanCorrelation(S)$ 
    20222022                                                \item[Arguments :]$S$ : a CorrelationMatrix, it must be the Spearman correlation matrix of the considered random vector 
    20232023                                                \item[Value :] a CorrelationMatrix, the correlation matrix of the normal copula evaluated from the Spearman correlation matrix $S$ 

  • branches/feuillard/devel/doc/src/UserManual/Graphs_UserManual.tex

    r936 r981  
    8787                                                \item[Usage :] $getBoundingBox()$ 
    8888                                                \item[Arguments :] none 
    89                                                 \item[Value :] a NumericalPoint of dimension 4, the bounding box of the drawable element, wich is a rectangle determined by its low and left corner (P1) and its high and right corner (P2). The BoundingBox is (XP1,YP1, XP2, YP2). 
     89                                                \item[Value :] a NumericalPoint of dimension 4, the bounding box of the drawable element, wich is a rectangle determined by its range along X and its range along Y. The BoundingBox is  $(x_{min}, x_{max}, y_{min}, y_{max})$. 
    9090                                        \end{description} 
    9191                \bigskip 
    …… 
    202202                                                \item[Usage :] $getBoundingBox()$ 
    203203                                                \item[Arguments :] none 
    204                                                 \item[Value :] a NumericalPoint of dimension 4, the bounding bow of the drawable element, wich is a rectangle determined by its low and left corner (P1)and its high and right corner (P2). The BoundingBox is (XP1,YP1, XP2, YP2). 
     204                                                \item[Value :] a NumericalPoint of dimension 4, the bounding bow of the drawable element, wich is a rectangle determined by its range along X and its range along Y. The BoundingBox is $(x_{min}, x_{max}, y_{min}, y_{max})$. 
    205205                                        \end{description} 
    206206                \bigskip 

  • branches/feuillard/devel/gui/bootstrap

    r698 r981  
    5757#libtoolize --force --copy --ltdl --ltdl-tar 
    5858#libtoolize --force --copy 
    59 libtoolize --automake 1>libtoolize.log 2>&1 
     59libtoolize --automake --copy 1>libtoolize.log 2>&1 
    6060echo "OK" 
    6161 

  • branches/feuillard/devel/gui/config/common.am

    r936 r981  
    3333AM_FFLAGS   = $(OT_FFLAGS) 
    3434AM_CXXFLAGS = $(OT_CXXFLAGS) 
     35 
     36if WITH_BOOST 
     37AM_CPPFLAGS += $(BOOST_CPPFLAGS) 
     38endif 

  • branches/feuillard/devel/gui/configure.ac

    r936 r981  
    3030# Initialize Autoconf 
    3131AC_INIT([OpenTURNS platform GUI], 
    32         [0.12.1], 
     32        [0.12.2], 
    3333        [bugs@openturns.org], 
    3434        [openturns]) 
    …… 
    4040AC_CONFIG_AUX_DIR([config]) 
    4141AC_SUBST([ac_aux_dir]) 
     42AC_CONFIG_MACRO_DIR([m4]) 
    4243 
    4344# Initialize Automake 
    …… 
    99100OT_CHECK_DOT 
    100101 
     102# Check for BOOST 
     103OT_CHECK_BOOST 
     104 
    101105# Get object default name 
    102106OT_GET_OBJECT_DEFAULT_NAME 
    …… 
    133137test "x$WITH_DOXYGEN" = x1   && sum_doxygen=OK   || sum_doxygen="no * (optional)" 
    134138test "x$WITH_DOT" = x1       && sum_dot=OK       || sum_dot="no * (optional)" 
     139test "x$WITH_BOOST" = x1     && sum_boost=OK     || sum_dot="no * (MANDATORY)" 
    135140test "x$have_qt" = xyes      && sum_qt=OK        || sum_qt="no * (MANDATORY)" 
    136141 
    …… 
    147152  Doxygen              ${sum_doxygen} 
    148153  dot                  ${sum_dot} 
     154  BOOST                ${sum_boost} 
    149155  Qt                   ${sum_qt} 
    150156EOT 

  • branches/feuillard/devel/lib/bootstrap

    r698 r981  
    5656#libtoolize --force --copy --ltdl --ltdl-tar 
    5757#libtoolize --force --copy 
    58 libtoolize --automake 1>libtoolize.log 2>&1 
     58libtoolize --automake --copy 1>libtoolize.log 2>&1 
    5959echo "OK" 
    6060 

  • branches/feuillard/devel/lib/config/common.am

    r953 r981  
    3737AM_FFLAGS   = $(OT_FFLAGS) 
    3838AM_CXXFLAGS = $(OT_CXXFLAGS) 
     39 
     40if WITH_BOOST 
     41AM_CPPFLAGS += $(BOOST_CPPFLAGS) 
     42endif 

  • branches/feuillard/devel/lib/configure.ac

    r953 r981  
    3030# Initialize Autoconf 
    3131AC_INIT([OpenTURNS platform library], 
    32         [0.12.1], 
     32        [0.12.2], 
    3333        [bugs@openturns.org], 
    3434        [openturns]) 
    …… 
    4040AC_CONFIG_AUX_DIR([config]) 
    4141AC_SUBST([ac_aux_dir]) 
     42AC_CONFIG_MACRO_DIR([m4]) 
    4243 
    4344# chooze our own configuration file for inclusion in source files 
    …… 
    268269           Makefile 
    269270           m4/Makefile 
     271           m4/examples/configure.ac 
    270272           etc/Makefile 
    271273           etc/openturns.conf 

  • branches/feuillard/devel/lib/etc/openturns.conf.in

    r953 r981  
    33  You can edit its content, or better override it by providing 
    44  your own file : 
    5    * either copy this file in $HOME/openturns/etc/configuration 
     5   * either copy this file in $HOME/openturns/etc 
    66     and edit this one with your defaults 
    77   * or put a modified copy of this file in your favorite path and 
    …… 
    1818  <real-regexp-shortcut      value="\R"            /> 
    1919  <integer-regexp-shortcut   value="\I"            /> 
     20  <separator-regexp-shortcut value="\S"            /> 
    2021  <cache-max-size            value="1024"          /> 
    2122 

  • branches/feuillard/devel/lib/m4/Makefile.am

    r631 r981  
    4343        } > package.m4 
    4444        @echo "Creating package.m4" 
     45 
     46examplesdir      = $(pkgdatadir)/examples 
     47examplesM4dir    = $(pkgdatadir)/examples/m4 
     48 
     49dataFiles        = examples/Makefile.am 
     50dataFiles       += examples/bootstrap 
     51dataFiles       += examples/README 
     52dataFiles       += examples/AUTHORS 
     53m4Files          = examples/m4/ot_check_boost.m4 
     54m4Files         += examples/m4/ot_check_openturns.m4 
     55m4Files         += examples/m4/ot_check_qt.m4 
     56m4Files         += examples/m4/bnv_have_qt.m4 
     57 
     58examples_DATA    = examples/configure.ac 
     59examples_DATA   += $(dataFiles) 
     60examplesM4_DATA  = $(m4Files) 
     61 
     62EXTRA_DIST      += examples/configure.ac.in 
     63EXTRA_DIST      += $(dataFiles) 
     64EXTRA_DIST      += $(m4Files) 
     65 
     66install-data-hook: 
     67        -( cd $(examplesdir) && chmod +x bootstrap && ./bootstrap ) 
     68 
     69uninstall-hook: 
     70        rm -rf $(examplesdir)/COPYING 
     71        rm -rf $(examplesdir)/NEWS 
     72        rm -rf $(examplesdir)/ChangeLog 
     73        rm -rf $(examplesdir)/INSTALL 
     74        rm -rf $(examplesdir)/Makefile.in 
     75        rm -rf $(examplesdir)/configure 
     76        rm -rf $(examplesdir)/*.m4 
     77        rm -rf $(examplesdir)/autom4te.cache 
     78        rm -rf $(examplesdir)/config 
     79        rm -rf $(examplesdir)/m4 
     80 
     81examples/configure.ac : configure-stamp-h 
     82configure-stamp-h : examples/configure.ac.in $(top_builddir)/config.status 
     83        (cd $(top_builddir) && CONFIG_FILES=m4/examples/configure.ac ./config.status) 
     84        echo > $@ 
     85 
     86DISTCLEANFILES = configure-stamp-h  

  • branches/feuillard/devel/lib/m4/ot_check_boost.m4

    r936 r981  
    3636  WITH_BOOST=0 
    3737 
     38  saved_CPPFLAGS=$CPPFLAGS 
     39 
     40  #BOOST_CPPFLAGS="-DBOOST_SP_USE_PTHREADS" 
     41  BOOST_CPPFLAGS= 
     42  CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" 
    3843  AC_CHECK_HEADER([boost/shared_ptr.hpp], [boost_shared_ptr_header_file_found=yes], [boost_shared_ptr_header_file_found=no]) 
    3944  test $boost_shared_ptr_header_file_found = yes || AC_MSG_ERROR([BOOST header file NOT found.]) 
    …… 
    4146  WITH_BOOST=1 
    4247 
     48  CPPFLAGS=$saved_CPPFLAGS 
     49 
    4350  AC_LANG_POP([C++]) 
     51 
     52  AC_SUBST(BOOST_CPPFLAGS) 
     53  AM_CONDITIONAL(WITH_BOOST, test $WITH_BOOST = 1) 
    4454]) 

  • branches/feuillard/devel/lib/src/Base/Common/Makefile.am

    r953 r981  
    4848&n