Changeset 3b35e7


Ignore:
Timestamp:
Aug 20, 2014, 12:59:14 PM (10 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
0c74aa
Parents:
3a33e3
git-author:
Frederik Heber <heber@…> (08/17/14 19:07:34)
git-committer:
Frederik Heber <heber@…> (08/20/14 12:59:14)
Message:

Fixes due to update to Ubuntu 14.04.

  • subdir-objects is default behavior for automake.
  • INCLUDES is deprecated (in favor of AM_CPPFLAGS), made sure that every .._CPPFLAGS includes AM_CPPFLAGS.
  • updated boost.m4 (serial 22), re-added missing macros.
  • qwt.m4 does not use QString in constructor, as it pulls in QtCore dependency.
  • VectorUnitTest lacked libboost_system dep.
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified LinearAlgebra/src/LinearAlgebra/Makefile.am

    r3a33e3 r3b35e7  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src
    5 
    64AM_LDFLAGS = -ldl
    7 AM_CPPFLAGS = $(BOOST_CPPFLAGS) ${CodePatterns_CFLAGS}
     5AM_CPPFLAGS = -I$(top_srcdir)/src $(BOOST_CPPFLAGS) ${CodePatterns_CFLAGS}
    86
    97LINALGSOURCE = \
  • TabularUnified LinearAlgebra/src/unittests/Makefile.am

    r3a33e3 r3b35e7  
    22# Also indentation by a single tab
    33
    4 INCLUDES = -I$(top_srcdir)/src/LinearAlgebra
    5 
    64AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    7 AM_CPPFLAGS = $(CPPUNIT_CFLAGS) $(BOOST_CPPFLAGS) ${CodePatterns_CFLAGS}
     5AM_CPPFLAGS = -I$(top_srcdir)/src/LinearAlgebra $(CPPUNIT_CFLAGS) $(BOOST_CPPFLAGS) ${CodePatterns_CFLAGS}
    86
    97if CONDCPPUNIT
     
    9593        VectorUnitTest.cpp \
    9694        VectorUnitTest.hpp
    97 VectorUnitTest_LDADD = ${GSLLIBS}
     95VectorUnitTest_LDADD = ${GSLLIBS} \
     96        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
    9897
    9998VectorSetUnitTest_SOURCES = UnitTestMain.cpp \
  • TabularUnified configure.ac

    r3a33e3 r3b35e7  
    1313# color-tests: us coloring to indicate success/failure when available
    1414# tar-pax: use newer tar implementation with longer filename (>99 chars)
    15 AM_INIT_AUTOMAKE([dist-bzip2 1.5 parallel-tests color-tests tar-pax])
     15AM_INIT_AUTOMAKE([dist-bzip2 1.5 parallel-tests color-tests tar-pax subdir-objects])
    1616
    1717# Checks for programs.
  • TabularUnified m4/boost.m4

    r3a33e3 r3b35e7  
    11# boost.m4: Locate Boost headers and libraries for autoconf-based projects.
    2 # Copyright (C) 2007, 2008, 2009, 2010, 2011  Benoit Sigoure <tsuna@lrde.epita.fr>
     2# Copyright (C) 2007-2011, 2014  Benoit Sigoure <tsuna@lrde.epita.fr>
    33#
    44# This program is free software: you can redistribute it and/or modify
     
    2323
    2424m4_define([_BOOST_SERIAL], [m4_translit([
    25 # serial 16
     25# serial 22
    2626], [#
    2727], [])])
     
    6060# value of any macro.
    6161m4_define([_BOOST_SED_CPP],
    62 [AC_LANG_PREPROC_REQUIRE()dnl
     62[AC_LANG_PUSH([C++])dnl
     63AC_LANG_PREPROC_REQUIRE()dnl
    6364AC_REQUIRE([AC_PROG_SED])dnl
    6465AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])])
     
    7879  [$4])
    7980rm -rf conftest*
    80 ])# AC_EGREP_CPP
     81AC_LANG_POP([C++])dnl
     82])# _BOOST_SED_CPP
    8183
    8284
     
    135137    # If the user provided a value to --with-boost, use it and only it.
    136138    case $with_boost in #(
    137       ''|yes) set x '' /usr/local/include /usr/include \
    138               /opt/local/include /opt/include \
    139               C:/Boost/include;; #(
     139      ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \
     140                 /usr/include C:/Boost/include;; #(
    140141      *)      set x "$with_boost/include" "$with_boost";;
    141142    esac
     
    223224])# BOOST_REQUIRE
    224225
     226
    225227# BOOST_STATIC()
    226228# --------------
     
    229231AC_DEFUN([BOOST_STATIC],
    230232  [AC_ARG_ENABLE([static-boost],
    231      [AC_HELP_STRING([--enable-static-boost],
     233     [AS_HELP_STRING([--enable-static-boost],
    232234               [Prefer the static boost libraries over the shared ones [no]])],
    233235     [enable_static_boost=yes],
    234236     [enable_static_boost=no])])# BOOST_STATIC
     237
    235238
    236239# BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND])
     
    266269
    267270
    268 # BOOST_FIND_LIB([LIB-NAME], [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
    269 #                [CXX-PROLOGUE])
    270 # -------------------------------------------------------------------------
    271 # Look for the Boost library LIB-NAME (e.g., LIB-NAME = `thread', for
    272 # libboost_thread).  Check that HEADER-NAME works and check that
    273 # libboost_LIB-NAME can link with the code CXX-TEST.  The optional argument
    274 # CXX-PROLOGUE can be used to include some C++ code before the `main'
    275 # function.
     271# BOOST_FIND_LIBS([COMPONENT-NAME], [CANDIDATE-LIB-NAMES],
     272#                 [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
     273#                 [CXX-PROLOGUE])
     274# --------------------------------------------------------------
     275# Look for the Boost library COMPONENT-NAME (e.g., `thread', for
     276# libboost_thread) under the possible CANDIDATE-LIB-NAMES (e.g.,
     277# "thread_win32 thread").  Check that HEADER-NAME works and check that
     278# libboost_LIB-NAME can link with the code CXX-TEST.  The optional
     279# argument CXX-PROLOGUE can be used to include some C++ code before
     280# the `main' function.
    276281#
    277282# Invokes BOOST_FIND_HEADER([HEADER-NAME]) (see above).
     
    287292# ...  If you want to make sure you have a specific version of Boost
    288293# (eg, >= 1.33) you *must* invoke BOOST_REQUIRE before this macro.
    289 AC_DEFUN([BOOST_FIND_LIB],
     294AC_DEFUN([BOOST_FIND_LIBS],
    290295[AC_REQUIRE([BOOST_REQUIRE])dnl
    291296AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl
     
    301306AS_VAR_PUSHDEF([Boost_lib_LDPATH], [boost_cv_lib_$1_LDPATH])dnl
    302307AS_VAR_PUSHDEF([Boost_lib_LIBS], [boost_cv_lib_$1_LIBS])dnl
    303 BOOST_FIND_HEADER([$3])
     308BOOST_FIND_HEADER([$4])
    304309boost_save_CPPFLAGS=$CPPFLAGS
    305310CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
    306 # Now let's try to find the library.  The algorithm is as follows: first look
    307 # for a given library name according to the user's PREFERRED-RT-OPT.  For each
    308 # library name, we prefer to use the ones that carry the tag (toolset name).
    309 # Each library is searched through the various standard paths were Boost is
    310 # usually installed.  If we can't find the standard variants, we try to
    311 # enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist
    312 # but there's -obviously- libboost_threads-mt.dylib).
    313311AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib],
    314   [Boost_lib=no
    315   case "$2" in #(
    316     mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
    317     mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$2" : 'Xmt-*\(.*\)'`;; #(
    318     *) boost_mt=; boost_rtopt=$2;;
     312               [_BOOST_FIND_LIBS($@)])
     313case $Boost_lib in #(
     314  (no) _AC_MSG_LOG_CONFTEST
     315    AC_MSG_ERROR([cannot find the flags to link with Boost $1])
     316    ;;
     317esac
     318AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl
     319AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl
     320AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl
     321AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl
     322CPPFLAGS=$boost_save_CPPFLAGS
     323AS_VAR_POPDEF([Boost_lib])dnl
     324AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl
     325AS_VAR_POPDEF([Boost_lib_LDPATH])dnl
     326AS_VAR_POPDEF([Boost_lib_LIBS])dnl
     327AC_LANG_POP([C++])dnl
     328fi
     329])
     330
     331
     332# BOOST_FIND_LIB([LIB-NAME],
     333#                [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
     334#                [CXX-PROLOGUE])
     335# --------------------------------------------------------------
     336# Backward compatibility wrapper for BOOST_FIND_LIBS.
     337AC_DEFUN([BOOST_FIND_LIB],
     338[BOOST_FIND_LIBS([$1], $@)])
     339
     340
     341# _BOOST_FIND_LIBS([LIB-NAME], [CANDIDATE-LIB-NAMES],
     342#                 [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST],
     343#                 [CXX-PROLOGUE])
     344# --------------------------------------------------------------
     345# Real implementation of BOOST_FIND_LIBS: rely on these local macros:
     346# Boost_lib, Boost_lib_LDFLAGS, Boost_lib_LDPATH, Boost_lib_LIBS
     347#
     348# The algorithm is as follows: first look for a given library name
     349# according to the user's PREFERRED-RT-OPT.  For each library name, we
     350# prefer to use the ones that carry the tag (toolset name).  Each
     351# library is searched through the various standard paths were Boost is
     352# usually installed.  If we can't find the standard variants, we try
     353# to enforce -mt (for instance on MacOSX, libboost_thread.dylib
     354# doesn't exist but there's -obviously- libboost_thread-mt.dylib).
     355AC_DEFUN([_BOOST_FIND_LIBS],
     356[Boost_lib=no
     357  case "$3" in #(
     358    (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
     359    (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$3" : 'Xmt-*\(.*\)'`;; #(
     360    (*) boost_mt=; boost_rtopt=$3;;
    319361  esac
    320362  if test $enable_static_boost = yes; then
     
    323365  # Find the proper debug variant depending on what we've been asked to find.
    324366  case $boost_rtopt in #(
    325     *d*) boost_rt_d=$boost_rtopt;; #(
    326     *[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn')
     367    (*d*) boost_rt_d=$boost_rtopt;; #(
     368    (*[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn')
    327369      boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
    328     *) boost_rt_d='-d';;
     370    (*) boost_rt_d='-d';;
    329371  esac
    330372  # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
     
    337379  boost_save_ac_objext=$ac_objext
    338380  # Generate the test file.
    339   AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$3>
    340 $5], [$4])])
     381  AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$4>
     382$6], [$5])])
    341383dnl Optimization hacks: compiling C++ is slow, especially with Boost.  What
    342384dnl we're trying to do here is guess the right combination of link flags
     
    360402  ac_objext=$boost_save_ac_objext
    361403  boost_failed_libs=
    362 # Don't bother to ident the 6 nested for loops, only the 2 innermost ones
    363 # matter.
     404# Don't bother to ident the following nested for loops, only the 2
     405# innermost ones matter.
     406for boost_lib_ in $2; do
    364407for boost_tag_ in -$boost_cv_lib_tag ''; do
    365408for boost_ver_ in -$boost_cv_lib_version ''; do
    366 for boost_mt_ in $boost_mt '' -mt; do
     409for boost_mt_ in $boost_mt -mt ''; do
    367410for boost_rtopt_ in $boost_rtopt '' -d; do
    368411  for boost_lib in \
    369     boost_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
    370     boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \
    371     boost_$1$boost_tag_$boost_mt_$boost_ver_ \
    372     boost_$1$boost_tag_$boost_ver_
     412    boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
     413    boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
     414    boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
     415    boost_$boost_lib_$boost_tag_$boost_ver_
    373416  do
    374417    # Avoid testing twice the same lib
    375418    case $boost_failed_libs in #(
    376       *@$boost_lib@*) continue;;
     419      (*@$boost_lib@*) continue;;
    377420    esac
    378421    # If with_boost is empty, we'll search in /lib first, which is not quite
     
    381424    test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include}
    382425    for boost_ldpath in "$boost_tmp_lib/lib" '' \
    383              /usr/local/lib* /usr/lib* \
    384              "$with_boost" C:/Boost/lib /lib* \
    385              /opt/local/lib* /opt/lib*
     426             /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
     427             "$with_boost" C:/Boost/lib /lib*
    386428    do
    387       test -e "$boost_ldpath" || continue
     429      # Don't waste time with directories that don't exist.
     430      if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
     431        continue
     432      fi
    388433      boost_save_LDFLAGS=$LDFLAGS
    389434      # Are we looking for a static library?
    390435      case $boost_ldpath:$boost_rtopt_ in #(
    391         *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
     436        (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
    392437          Boost_lib_LIBS="$boost_ldpath/lib$boost_lib.$libext"
    393438          test -e "$Boost_lib_LIBS" || continue;; #(
    394         *) # No: use -lboost_foo to find the shared library.
     439        (*) # No: use -lboost_foo to find the shared library.
    395440          Boost_lib_LIBS="-l$boost_lib";;
    396441      esac
     
    406451      LIBS=$boost_save_LIBS
    407452      if test x"$Boost_lib" = xyes; then
    408         Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-R$boost_ldpath"
     453        # Check or used cached result of whether or not using -R or
     454        # -rpath makes sense.  Some implementations of ld, such as for
     455        # Mac OSX, require -rpath but -R is the flag known to work on
     456        # other systems.  https://github.com/tsuna/boost.m4/issues/19
     457        AC_CACHE_VAL([boost_cv_rpath_link_ldflag],
     458          [case $boost_ldpath in
     459           '') # Nothing to do.
     460             boost_cv_rpath_link_ldflag=
     461             boost_rpath_link_ldflag_found=yes;;
     462           *)
     463            for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
     464              LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
     465              LIBS="$boost_save_LIBS $Boost_lib_LIBS"
     466              _BOOST_AC_LINK_IFELSE([],
     467                [boost_rpath_link_ldflag_found=yes
     468                break],
     469                [boost_rpath_link_ldflag_found=no])
     470            done
     471            ;;
     472          esac
     473          AS_IF([test "x$boost_rpath_link_ldflag_found" != "xyes"],
     474            [AC_MSG_ERROR([Unable to determine whether to use -R or -rpath])])
     475          LDFLAGS=$boost_save_LDFLAGS
     476          LIBS=$boost_save_LIBS
     477          ])
     478        test x"$boost_ldpath" != x &&
     479          Boost_lib_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
    409480        Boost_lib_LDPATH="$boost_ldpath"
    410         break 6
     481        break 7
    411482      else
    412483        boost_failed_libs="$boost_failed_libs@$boost_lib@"
     
    418489done
    419490done
     491done # boost_lib_
    420492rm -f conftest.$ac_objext
    421493])
    422 case $Boost_lib in #(
    423   no) _AC_MSG_LOG_CONFTEST
    424     AC_MSG_ERROR([cannot find the flags to link with Boost $1])
    425     ;;
    426 esac
    427 AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl
    428 AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl
    429 AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl
    430 AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl
    431 CPPFLAGS=$boost_save_CPPFLAGS
    432 AS_VAR_POPDEF([Boost_lib])dnl
    433 AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl
    434 AS_VAR_POPDEF([Boost_lib_LDPATH])dnl
    435 AS_VAR_POPDEF([Boost_lib_LIBS])dnl
    436 AC_LANG_POP([C++])dnl
    437 fi
    438 ])# BOOST_FIND_LIB
     494
    439495
    440496
     
    483539BOOST_FIND_HEADER([boost/asio.hpp])])
    484540
     541
    485542# BOOST_BIMAP()
    486543# ------------
     
    489546[BOOST_FIND_HEADER([boost/bimap.hpp])])
    490547
     548
    491549# BOOST_BIND()
    492550# ------------
    493 # Look for Boost.Bind
     551# Look for Boost.Bind.
    494552BOOST_DEFUN([Bind],
    495553[BOOST_FIND_HEADER([boost/bind.hpp])])
     554
    496555
    497556# BOOST_CAST()
     
    500559BOOST_DEFUN([Cast],
    501560[BOOST_FIND_HEADER([boost/cast.hpp])])
     561
     562
     563# BOOST_CHRONO()
     564# --------------
     565# Look for Boost.Chrono.
     566BOOST_DEFUN([Chrono],
     567[# Do we have to check for Boost.System?  This link-time dependency was
     568# added as of 1.35.0.  If we have a version <1.35, we must not attempt to
     569# find Boost.System as it didn't exist by then.
     570if test $boost_major_version -ge 135; then
     571  BOOST_SYSTEM([$1])
     572fi # end of the Boost.System check.
     573boost_filesystem_save_LIBS=$LIBS
     574boost_filesystem_save_LDFLAGS=$LDFLAGS
     575m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
     576LIBS="$LIBS $BOOST_SYSTEM_LIBS"
     577LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
     578BOOST_FIND_LIB([chrono], [$1],
     579                [boost/chrono.hpp],
     580                [boost::chrono::thread_clock d;])
     581if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
     582  BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"
     583fi
     584LIBS=$boost_filesystem_save_LIBS
     585LDFLAGS=$boost_filesystem_save_LDFLAGS
     586])# BOOST_CHRONO
     587
    502588
    503589# BOOST_CONVERSION()
     
    508594BOOST_FIND_HEADER([boost/lexical_cast.hpp])
    509595])# BOOST_CONVERSION
     596
     597
     598# BOOST_CRC()
     599# -----------
     600# Look for Boost.CRC
     601BOOST_DEFUN([CRC],
     602[BOOST_FIND_HEADER([boost/crc.hpp])
     603])# BOOST_CRC
    510604
    511605
     
    539633# find Boost.System as it didn't exist by then.
    540634if test $boost_major_version -ge 135; then
    541 BOOST_SYSTEM([$1])
     635  BOOST_SYSTEM([$1])
    542636fi # end of the Boost.System check.
    543637boost_filesystem_save_LIBS=$LIBS
     
    549643                [boost/filesystem/path.hpp], [boost::filesystem::path p;])
    550644if test $enable_static_boost = yes && test $boost_major_version -ge 135; then
    551     AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"])
     645  BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"
    552646fi
    553647LIBS=$boost_filesystem_save_LIBS
     
    556650
    557651
     652# BOOST_FUSION()
     653# -----------------
     654# Look for Boost.Fusion
     655BOOST_DEFUN([Fusion],
     656[BOOST_FIND_HEADER([boost/fusion/sequence.hpp])])
     657
     658
     659# BOOST_FLYWEIGHT()
     660# -----------------
     661# Look for Boost.Flyweight.
     662BOOST_DEFUN([Flyweight],
     663[dnl There's a hidden dependency on pthreads.
     664AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl
     665BOOST_FIND_HEADER([boost/flyweight.hpp])
     666AC_SUBST([BOOST_FLYWEIGHT_LIBS], [$boost_cv_pthread_flag])
     667])
     668
     669
    558670# BOOST_FOREACH()
    559671# ---------------
    560 # Look for Boost.Foreach
     672# Look for Boost.Foreach.
    561673BOOST_DEFUN([Foreach],
    562674[BOOST_FIND_HEADER([boost/foreach.hpp])])
     
    565677# BOOST_FORMAT()
    566678# --------------
    567 # Look for Boost.Format
     679# Look for Boost.Format.
    568680# Note: we can't check for boost/format/format_fwd.hpp because the header isn't
    569681# standalone.  It can't be compiled because it triggers the following error:
     
    581693
    582694
    583 # BOOST_FUSION()
     695# BOOST_GEOMETRY()
    584696# ----------------
    585 # Look for Boost.Fusion
    586 BOOST_DEFUN([Fusion],
    587 [BOOST_FIND_HEADER([boost/fusion/sequence.hpp])])
     697# Look for Boost.Geometry (new since 1.47.0).
     698BOOST_DEFUN([Geometry],
     699[BOOST_FIND_HEADER([boost/geometry.hpp])
     700])# BOOST_GEOMETRY
    588701
    589702
     
    632745# BOOST_LOG([PREFERRED-RT-OPT])
    633746# -----------------------------
    634 # Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the
     747# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the
    635748# documentation of BOOST_FIND_LIB above.
    636749BOOST_DEFUN([Log],
     
    643756# BOOST_LOG_SETUP([PREFERRED-RT-OPT])
    644757# -----------------------------------
    645 # Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the
     758# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the
    646759# documentation of BOOST_FIND_LIB above.
    647760BOOST_DEFUN([Log_Setup],
    648761[AC_REQUIRE([BOOST_LOG])dnl
    649762BOOST_FIND_LIB([log_setup], [$1],
    650     [boost/log/utility/init/from_settings.hpp],
     763    [boost/log/utility/setup/from_settings.hpp],
    651764    [boost::log::basic_settings<char> bs; bs.empty();])
    652765])# BOOST_LOG_SETUP
     
    665778
    666779
     780# BOOST_MPI([PREFERRED-RT-OPT])
     781# -------------------------------
     782# Look for Boost MPI.  For the documentation of PREFERRED-RT-OPT, see the
     783# documentation of BOOST_FIND_LIB above.  Uses MPICXX variable if it is
     784# set, otherwise tries CXX
     785#
     786BOOST_DEFUN([MPI],
     787[boost_save_CXX=${CXX}
     788boost_save_CXXCPP=${CXXCPP}
     789if test x"${MPICXX}" != x; then
     790  CXX=${MPICXX}
     791  CXXCPP="${MPICXX} -E"
     792fi
     793BOOST_FIND_LIB([mpi], [$1],
     794               [boost/mpi.hpp],
     795               [int argc = 0;
     796                char **argv = 0;
     797                boost::mpi::environment env(argc,argv);])
     798CXX=${boost_save_CXX}
     799CXXCPP=${boost_save_CXXCPP}
     800])# BOOST_MPI
     801
     802
     803# BOOST_MPL()
     804# ------------------
     805# Look for Boost.MPL
     806BOOST_DEFUN([MPL],
     807[BOOST_FIND_HEADER([boost/mpl/for_each.hpp])])
     808
     809
    667810# BOOST_MULTIARRAY()
    668811# ------------------
    669812# Look for Boost.MultiArray
    670813BOOST_DEFUN([MultiArray],
    671 [BOOST_FIND_HEADER([boost/mpl/list.hpp])])
    672 
    673 
    674 # BOOST_MMPL()
    675 # ------------------
    676 # Look for Boost.MPL
    677 BOOST_DEFUN([MPL],
    678 [BOOST_FIND_HEADER([boost/mpl/for_each.hpp])])
     814[BOOST_FIND_HEADER([boost/multi_array.hpp])])
     815
     816
     817# BOOST_NUMERIC_UBLAS()
     818# --------------------------
     819# Look for Boost.NumericUblas (Basic Linear Algebra)
     820BOOST_DEFUN([Numeric_Ublas],
     821[BOOST_FIND_HEADER([boost/numeric/ublas/vector.hpp])
     822])# BOOST_NUMERIC_UBLAS
     823
    679824
    680825# BOOST_NUMERIC_CONVERSION()
     
    764909_BOOST_PYTHON_CONFIG([LIBS],      [libs])
    765910m4_pattern_allow([^BOOST_PYTHON_MODULE$])dnl
    766 BOOST_FIND_LIB([python], [$1],
    767                [boost/python.hpp],
    768                [], [BOOST_PYTHON_MODULE(empty) {}])
     911BOOST_FIND_LIBS([python], [python python3], [$1],
     912                [boost/python.hpp],
     913                [], [BOOST_PYTHON_MODULE(empty) {}])
    769914CPPFLAGS=$boost_python_save_CPPFLAGS
    770915LDFLAGS=$boost_python_save_LDFLAGS
     
    812957                [boost::signal<void ()> s;])
    813958])# BOOST_SIGNALS
     959
     960
     961# BOOST_SIGNALS2()
     962# ----------------
     963# Look for Boost.Signals2 (new since 1.39.0).
     964BOOST_DEFUN([Signals2],
     965[BOOST_FIND_HEADER([boost/signals2.hpp])
     966])# BOOST_SIGNALS2
    814967
    815968
     
    8641017
    8651018
    866 # BOOST_THREADS([PREFERRED-RT-OPT])
     1019# BOOST_THREAD([PREFERRED-RT-OPT])
    8671020# ---------------------------------
    8681021# Look for Boost.Thread.  For the documentation of PREFERRED-RT-OPT, see the
    8691022# documentation of BOOST_FIND_LIB above.
    870 # FIXME: Provide an alias "BOOST_THREAD".
    871 BOOST_DEFUN([Threads],
     1023BOOST_DEFUN([Thread],
    8721024[dnl Having the pthread flag is required at least on GCC3 where
    8731025dnl boost/thread.hpp would complain if we try to compile without
    8741026dnl -pthread on GNU/Linux.
    8751027AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl
    876 boost_threads_save_LIBS=$LIBS
    877 boost_threads_save_CPPFLAGS=$CPPFLAGS
    878 LIBS="$LIBS $boost_cv_pthread_flag"
    879 # Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3,
    880 # boost/thread.hpp will trigger a #error if -pthread isn't used:
    881 #   boost/config/requires_threads.hpp:47:5: #error "Compiler threading support
    882 #   is not turned on. Please set the correct command line options for
    883 #   threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)"
     1028boost_thread_save_LIBS=$LIBS
     1029boost_thread_save_LDFLAGS=$LDFLAGS
     1030boost_thread_save_CPPFLAGS=$CPPFLAGS
     1031# Link-time dependency from thread to system was added as of 1.49.0.
     1032if test $boost_major_version -ge 149; then
     1033BOOST_SYSTEM([$1])
     1034fi # end of the Boost.System check.
     1035m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl
     1036LIBS="$LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag"
     1037LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS"
    8841038CPPFLAGS="$CPPFLAGS $boost_cv_pthread_flag"
    885 BOOST_FIND_LIB([thread], [$1],
    886                [boost/thread.hpp], [boost::thread t; boost::mutex m;])
    887 BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $boost_cv_pthread_flag"
     1039
     1040# When compiling for the Windows platform, the threads library is named
     1041# differently.
     1042case $host_os in
     1043  (*mingw*) boost_thread_lib_ext=_win32;;
     1044esac
     1045BOOST_FIND_LIBS([thread], [thread$boost_thread_lib_ext],
     1046                [$1],
     1047                [boost/thread.hpp], [boost::thread t; boost::mutex m;])
     1048
     1049BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag"
     1050BOOST_THREAD_LDFLAGS="$BOOST_SYSTEM_LDFLAGS"
    8881051BOOST_CPPFLAGS="$BOOST_CPPFLAGS $boost_cv_pthread_flag"
    889 LIBS=$boost_threads_save_LIBS
    890 CPPFLAGS=$boost_threads_save_CPPFLAGS
    891 ])# BOOST_THREADS
     1052LIBS=$boost_thread_save_LIBS
     1053LDFLAGS=$boost_thread_save_LDFLAGS
     1054CPPFLAGS=$boost_thread_save_CPPFLAGS
     1055])# BOOST_THREAD
     1056
     1057AU_ALIAS([BOOST_THREADS], [BOOST_THREAD])
    8921058
    8931059
     
    9381104
    9391105
     1106# BOOST_POINTER_CONTAINER()
     1107# ------------------------
     1108# Look for Boost.PointerContainer
     1109BOOST_DEFUN([Pointer_Container],
     1110[BOOST_FIND_HEADER([boost/ptr_container/ptr_deque.hpp])
     1111BOOST_FIND_HEADER([boost/ptr_container/ptr_list.hpp])
     1112BOOST_FIND_HEADER([boost/ptr_container/ptr_vector.hpp])
     1113BOOST_FIND_HEADER([boost/ptr_container/ptr_array.hpp])
     1114BOOST_FIND_HEADER([boost/ptr_container/ptr_set.hpp])
     1115BOOST_FIND_HEADER([boost/ptr_container/ptr_map.hpp])
     1116])# BOOST_POINTER_CONTAINER
     1117
     1118
    9401119# BOOST_WAVE([PREFERRED-RT-OPT])
    9411120# ------------------------------
    9421121# NOTE: If you intend to use Wave/Spirit with thread support, make sure you
    943 # call BOOST_THREADS first.
     1122# call BOOST_THREAD first.
    9441123# Look for Boost.Wave.  For the documentation of PREFERRED-RT-OPT, see the
    9451124# documentation of BOOST_FIND_LIB above.
     
    9501129boost_wave_save_LDFLAGS=$LDFLAGS
    9511130m4_pattern_allow([^BOOST_((FILE)?SYSTEM|DATE_TIME|THREAD)_(LIBS|LDFLAGS)$])dnl
    952 LIBS="$LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_DATE_TIME_LIBS\
     1131LIBS="$LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $BOOST_DATE_TIME_LIBS \
    9531132$BOOST_THREAD_LIBS"
    954 LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS\
     1133LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS \
    9551134$BOOST_DATE_TIME_LDFLAGS $BOOST_THREAD_LDFLAGS"
    9561135BOOST_FIND_LIB([wave], [$1],
     
    9761155# _BOOST_PTHREAD_FLAG()
    9771156# ---------------------
    978 # Internal helper for BOOST_THREADS.  Based on ACX_PTHREAD:
    979 # http://autoconf-archive.cryp.to/acx_pthread.html
     1157# Internal helper for BOOST_THREAD.  Computes boost_cv_pthread_flag
     1158# which must be used in CPPFLAGS and LIBS.
     1159#
     1160# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3,
     1161# boost/thread.hpp will trigger a #error if -pthread isn't used:
     1162#   boost/config/requires_threads.hpp:47:5: #error "Compiler threading support
     1163#   is not turned on. Please set the correct command line options for
     1164#   threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)"
     1165#
     1166# Based on ACX_PTHREAD: http://autoconf-archive.cryp.to/acx_pthread.html
    9801167AC_DEFUN([_BOOST_PTHREAD_FLAG],
    9811168[AC_REQUIRE([AC_PROG_CXX])dnl
     
    10451232["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC @ gcc$1$2"])dnl
    10461233
     1234# _BOOST_mingw_test(MAJOR, MINOR)
     1235# -----------------------------
     1236# Internal helper for _BOOST_FIND_COMPILER_TAG.
     1237m4_define([_BOOST_mingw_test],
     1238["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC && \
     1239  (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \
     1240         || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw$1$2"])dnl
     1241
    10471242
    10481243# _BOOST_FIND_COMPILER_TAG()
     
    10721267  # the same defines as GCC's).
    10731268  for i in \
     1269    _BOOST_mingw_test(4,8) \
     1270    _BOOST_gcc_test(4, 8) \
     1271    _BOOST_mingw_test(4,7) \
     1272    _BOOST_gcc_test(4, 7) \
     1273    _BOOST_mingw_test(4,6) \
    10741274    _BOOST_gcc_test(4, 6) \
     1275    _BOOST_mingw_test(4,5) \
    10751276    _BOOST_gcc_test(4, 5) \
     1277    _BOOST_mingw_test(4,4) \
    10761278    _BOOST_gcc_test(4, 4) \
     1279    _BOOST_mingw_test(4,3) \
    10771280    _BOOST_gcc_test(4, 3) \
     1281    _BOOST_mingw_test(4,2) \
    10781282    _BOOST_gcc_test(4, 2) \
     1283    _BOOST_mingw_test(4,1) \
    10791284    _BOOST_gcc_test(4, 1) \
     1285    _BOOST_mingw_test(4,0) \
    10801286    _BOOST_gcc_test(4, 0) \
    10811287    "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \
     
    11431349AC_DEFUN([_BOOST_GUESS_WHETHER_TO_USE_MT],
    11441350[# Check whether we do better use `mt' even though we weren't ask to.
     1351AC_LANG_PUSH([C++])dnl
    11451352AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
    11461353#if defined _REENTRANT || defined _MT || defined __MT__
     
    11501357#endif
    11511358]])], [boost_guess_use_mt=:], [boost_guess_use_mt=false])
     1359AC_LANG_POP([C++])dnl
    11521360])
    11531361
     
    11731381  _AS_ECHO_LOG([re-using the existing conftest.$ac_objext])
    11741382AS_IF([_AC_DO_STDERR($ac_link) && {
    1175         test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
    1176         test ! -s conftest.err
     1383        test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" ||
     1384        test ! -s conftest.err
    11771385       } && test -s conftest$ac_exeext && {
    1178         test "$cross_compiling" = yes ||
    1179         $as_executable_p conftest$ac_exeext
     1386        test "$cross_compiling" = yes ||
     1387        $as_executable_p conftest$ac_exeext
    11801388dnl FIXME: use AS_TEST_X instead when 2.61 is widespread enough.
    11811389       }],
  • TabularUnified m4/qwt.m4

    r3a33e3 r3b35e7  
    8080  AC_TRY_LINK(
    8181    [#include <qwt_plot.h>],
    82     [QwtPlot * plot = new QwtPlot(QString("Two Curves"));],
     82    [QwtPlot * plot = new QwtPlot();],
    8383    [mol_ac_have_qwt=true])
    8484  AC_LANG_RESTORE
  • TabularUnified src/Fragmentation/Automation/Makefile.am

    r3a33e3 r3b35e7  
    4040noinst_LTLIBRARIES += libMolecuilderFragmentationAutomation.la
    4141libMolecuilderFragmentationAutomation_la_includedir = $(includedir)/MoleCuilder/
    42 libMolecuilderFragmentationAutomation_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS)
     42libMolecuilderFragmentationAutomation_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS)
    4343libMolecuilderFragmentationAutomation_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}
    4444libMolecuilderFragmentationAutomation_la_LIBADD = \
  • TabularUnified src/Fragmentation/Summation/Containers/Makefile.am

    r3a33e3 r3b35e7  
    4141noinst_LTLIBRARIES += libMolecuilderFragmentationContainers.la
    4242libMolecuilderFragmentationContainers_la_includedir = $(includedir)/MoleCuilder/
    43 libMolecuilderFragmentationContainers_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS)
     43libMolecuilderFragmentationContainers_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS)
    4444libMolecuilderFragmentationContainers_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}
    4545libMolecuilderFragmentationContainers_la_LIBADD = \
  • TabularUnified src/Fragmentation/Summation/Containers/unittests/Makefile.am

    r3a33e3 r3b35e7  
    2424
    2525MPQCDataUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    26 MPQCDataUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     26MPQCDataUnitTest_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
    2727MPQCDataUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    2828  ../Fragmentation/Summation/Containers/unittests/MPQCDataUnitTest.cpp \
  • TabularUnified src/Fragmentation/Summation/Converter/Makefile.am

    r3a33e3 r3b35e7  
    1010noinst_LTLIBRARIES += libMolecuilderFragmentationConverter.la
    1111libMolecuilderFragmentationConverter_la_includedir = $(includedir)/MoleCuilder/
    12 libMolecuilderFragmentationConverter_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
     12libMolecuilderFragmentationConverter_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    1313libMolecuilderFragmentationConverter_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}
    1414libMolecuilderFragmentationConverter_la_LIBADD = \
  • TabularUnified src/Fragmentation/Summation/Makefile.am

    r3a33e3 r3b35e7  
    3434lib_LTLIBRARIES += libMolecuilderFragmentationSummation.la
    3535libMolecuilderFragmentationSummation_la_includedir = $(includedir)/MoleCuilder/
    36 libMolecuilderFragmentationSummation_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
     36libMolecuilderFragmentationSummation_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    3737libMolecuilderFragmentationSummation_la_LDFLAGS = -ldl \
    3838        $(BOOST_SERIALIZATION_LDFLAGS) \
  • TabularUnified src/Fragmentation/Summation/SetValues/Makefile.am

    r3a33e3 r3b35e7  
    2222noinst_LTLIBRARIES += libMolecuilderFragmentationSetValues.la
    2323libMolecuilderFragmentationSetValues_la_includedir = $(includedir)/MoleCuilder/
    24 libMolecuilderFragmentationSetValues_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
     24libMolecuilderFragmentationSetValues_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    2525libMolecuilderFragmentationSetValues_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}
    2626libMolecuilderFragmentationSetValues_la_LIBADD = \
  • TabularUnified src/Jobs/Makefile.am

    r3a33e3 r3b35e7  
    5656libMolecuilderJobs_la_includedir = $(includedir)/MoleCuilder/
    5757nobase_libMolecuilderJobs_la_include_HEADERS = $(JOBSHEADER)
    58 libMolecuilderJobs_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} ${JobMarket_CFLAGS} -Dvmg_float=double -Dvmg_int=int $(VMG_CFLAGS)
     58libMolecuilderJobs_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} ${JobMarket_CFLAGS} -Dvmg_float=double -Dvmg_int=int $(VMG_CFLAGS)
    5959libMolecuilderJobs_la_LDFLAGS = $(AM_LDFLAGS) \
    6060  $(BOOST_IOSTREAMS_LDFLAGS) \
  • TabularUnified src/Jobs/unittests/Makefile.am

    r3a33e3 r3b35e7  
    2727
    2828MPQCCommandJobUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
    29 MPQCCommandJobUnitTest_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS} ${JobMarket_CFLAGS}
     29MPQCCommandJobUnitTest_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS} ${JobMarket_CFLAGS}
    3030MPQCCommandJobUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
    3131  ../Jobs/unittests/MPQCCommandJobUnitTest.cpp \
  • TabularUnified src/Makefile.am

    r3a33e3 r3b35e7  
    4040
    4141AM_LDFLAGS = -ldl ${BOOST_LDFLAGS} ${CodePatterns_LDFLAGS}
    42 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
     42AM_CPPFLAGS = \
     43        -I$(top_srcdir)/src/unittests \
     44        -I$(top_srcdir)/src/Actions \
     45        -I$(top_srcdir)/src/UIElements \
     46        -I$(top_srcdir)/LinearAlgebra/src \
     47        ${BOOST_CPPFLAGS} \
     48        ${CodePatterns_CFLAGS}
     49
    4350
    4451BONDSOURCE = \
     
    252259
    253260
    254 INCLUDES = \
    255         -I$(top_srcdir)/src/unittests \
    256         -I$(top_srcdir)/src/Actions \
    257         -I$(top_srcdir)/src/UIElements \
    258         -I$(top_srcdir)/LinearAlgebra/src
    259 
    260261bin_PROGRAMS += molecuilder
    261262EXTRA_PROGRAMS = unity
     
    283284        Actions/GlobalListOfActions.hpp \
    284285        Actions/ActionHistory.hpp
    285 pyMoleCuilder_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS) -I$(PYTHON_INCLUDE_DIR)
     286pyMoleCuilder_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} $(JobMarket_CFLAGS) -I$(PYTHON_INCLUDE_DIR)
    286287pyMoleCuilder_la_LDFLAGS = -module -avoid-version -shared $(BOOST_PYTHON_LDFLAGS)
    287288pyMoleCuilder_la_LIBADD = \
  • TabularUnified src/RandomNumbers/Makefile.am

    r3a33e3 r3b35e7  
    11# PLEASE adhere to the alphabetical ordering in this Makefile!
    22# Also indentation by a single tab
    3 
    4 #INCLUDES = -I$(top_srcdir)/src
    53
    64# Position-Independent Code necessary for shared library
  • TabularUnified src/RandomNumbers/unittests/Makefile.am

    r3a33e3 r3b35e7  
    11# PLEASE adhere to the alphabetical ordering in this Makefile!
    22# Also indentation by a single tab
    3 
    4 #INCLUDES = -I$(top_srcdir)/src
    53
    64#AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl ${BOOST_LDFLAGS}
  • TabularUnified src/UIElements/Makefile.am

    r3a33e3 r3b35e7  
    226226lib_LTLIBRARIES += libMolecuilderUI.la
    227227libMolecuilderUI_la_includedir = $(includedir)/MoleCuilder/
    228 libMolecuilderUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
     228libMolecuilderUI_la_CPPFLAGS = $(AM_CPPFLAGS) ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
    229229if CONDJOBMARKET
    230230libMolecuilderUI_la_CPPFLAGS += ${JobMarket_CFLAGS}
     
    344344
    345345libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/
    346 libMolecuilderQtUI_la_CPPFLAGS = ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS} $(mol_ac_qwt_cxxflags)
     346libMolecuilderQtUI_la_CPPFLAGS = $(AM_CPPFLAGS) ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS} $(mol_ac_qwt_cxxflags)
    347347libMolecuilderQtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(mol_ac_qwt_ldflags)
    348348
  • TabularUnified src/UIElements/Views/Qt4/Plotting/Makefile.am

    r3a33e3 r3b35e7  
    3737
    3838libMolecuilderQwtUI_la_includedir = $(includedir)/MoleCuilder/
    39 libMolecuilderQwtUI_la_CPPFLAGS = ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS} $(mol_ac_qwt_cxxflags)
     39libMolecuilderQwtUI_la_CPPFLAGS = $(AM_CPPFLAGS) ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}  ${JobMarket_CFLAGS} $(mol_ac_qwt_cxxflags)
    4040libMolecuilderQwtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(mol_ac_qwt_ldflags)
    4141
  • TabularUnified src/unittests/Makefile.am

    r3a33e3 r3b35e7  
    4040include ../../src/UIElements/Menu/unittests/Makefile.am
    4141
    42 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src
    43 
    4442AM_LDFLAGS = \
    4543        ${CodePatterns_LIBS} \
    4644        $(CPPUNIT_LIBS) \
    4745        -ldl
    48 AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
     46AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/LinearAlgebra/src ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
    4947
    5048GENERALTESTS = \
  • TabularUnified tests/JobMarket/Makefile.am

    r3a33e3 r3b35e7  
    33if CONDJOBMARKET
    44mpqc_SOURCES = $(srcdir)/mpqc.cpp
    5 mpqc_CPPFLAGS = ${CodePatterns_CFLAGS} $(BOOST_CPPFLAGS)
     5mpqc_CPPFLAGS = $(AM_CPPFLAGS) ${CodePatterns_CFLAGS} $(BOOST_CPPFLAGS)
    66mpqc_LDADD = \
    77        ${CodePatterns_LIBS}
Note: See TracChangeset for help on using the changeset viewer.