Changeset dc031c for m4


Ignore:
Timestamp:
Dec 23, 2010, 5:41:47 PM (14 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:
acbe1b
Parents:
56f73b
git-author:
Frederik Heber <heber@…> (12/22/10 17:16:07)
git-committer:
Frederik Heber <heber@…> (12/23/10 17:41:47)
Message:

Added enable-debug and enable-cache switches to configure.

  • These set NDEBUG or MEMDEBUG.
  • The user does not need to have to know about this stuff, configure should tell him his options in a easy to understand manner.
  • also, we use CodePatterns-debug library if debug is specified and we need v1.0.1 from CodePatterns.
  • updated ax_codepatterns.m4.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • m4/ax_codepatterns.m4

    r56f73b rdc031c  
    11dnl
    2 dnl AM_PATH_CODEPATTERNS(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
     2dnl AM_PATH_CODEPATTERNS(MINIMUM-VERSION, [HAVE_DEBUG=no,yes,full], [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
    33dnl
    44
    … …  
    1515
    1616  codepatterns_version_min=$1
     17  codepatterns_debug=$2
    1718
    1819  CodePatterns_CFLAGS=""
    … …  
    3132  fi
    3233  # 1. test whether pkg-config works
    33   CodePatterns_CONFIG=""
    34   #AC_MSG_NOTICE([PKG_CONFIG_PATH is $PKG_CONFIG_PATH])
    35   PKG_CHECK_MODULES([CodePatterns], [CodePatterns >= $codepatterns_version_min], [
     34  CodePatterns_CONFIG="no"
     35  #AC_MSG_NOTICE([PKG_CONFIG_PATH is $PKG_CONFIG_PATH.])
     36  if test x$codepatterns_debug != xno; then
     37    codepatterns_libname="CodePatterns-debug"
     38    PKG_CHECK_MODULES([CodePatterns_debug], [CodePatterns >= $codepatterns_version_min], [
    3639      codepatterns_pkgconfig=yes
    37       CodePatterns_CONFIG="pkg-config CodePatterns"
     40      CodePatterns_CONFIG="pkg-config $codepatterns_libname"
    3841    ], [
    3942    # 2. if failed, test for binary codepatterns-config
    4043      AC_PATH_PROG(CodePatterns_CONFIG, codepatterns-config, no)
    41       if test x$CodePatterns_CONFIG = xno && test x$codepatterns_prefix != x ; then
     44      if test "x$CodePatterns_CONFIG" = xno && test x$codepatterns_prefix != x ; then
    4245        AC_MSG_CHECKING([for alternative codepatterns-config location])
    4346        if test -e $codepatterns_prefix/bin/codepatterns-config; then
    … …  
    5154    ])
    5255
     56  else
     57    codepatterns_libname="CodePatterns"
     58    PKG_CHECK_MODULES([CodePatterns], [CodePatterns >= $codepatterns_version_min], [
     59      codepatterns_pkgconfig=yes
     60      CodePatterns_CONFIG="pkg-config $codepatterns_libname"
     61    ], [
     62    # 2. if failed, test for binary codepatterns-config
     63      AC_PATH_PROG(CodePatterns_CONFIG, codepatterns-config, no)
     64      if test "x$CodePatterns_CONFIG" = xno && test x$codepatterns_prefix != x ; then
     65        AC_MSG_CHECKING([for alternative codepatterns-config location])
     66        if test -e $codepatterns_prefix/bin/codepatterns-config; then
     67          codepatterns_pkgconfig=no
     68          CodePatterns_CONFIG="$codepatterns_prefix/bin/codepatterns-config"
     69          AC_MSG_RESULT([yes])
     70        else
     71          AC_MSG_RESULT([no])
     72        fi
     73      fi
     74    ])
     75
     76  fi
     77
    5378  # try to set values via CodePatterns_CONFIG
    54   if test ! -z "$CodePatterns_CONFIG"; then
     79  if test "x$CodePatterns_CONFIG" != xno; then
    5580    CodePatterns_CFLAGS=`$CodePatterns_CONFIG --cflags`
    5681    if test x$codepatterns_pkgconfig = xno; then
    … …  
    6691    if test -e $codepatterns_include_prefix/include; then
    6792      CodePatterns_CFLAGS="$codepatterns_include_prefix/include"
    68       AC_MSG_NOTICE([codepatterns include found and used.])
     93      #AC_MSG_NOTICE([codepatterns include found and used.])
    6994    else
    7095      AC_MSG_WARN([codepatterns include not found at $codepatterns_include_prefix/include.])
    … …  
    7297  fi
    7398  if test x$cp_cv_codepatterns_libs_prefix != x ; then
    74     if test -e "$cp_cv_codepatterns_libs_prefix/lib/libCodePatterns.so"; then
    75       CodePatterns_LIBS="-L$cp_cv_codepatterns_libs_prefix/lib -lCodePatterns"
    76       AC_MSG_NOTICE([codepatterns libs found and used.])
     99    if test -e "$cp_cv_codepatterns_libs_prefix/lib/lib$codepatterns_libname.so"; then
     100      CodePatterns_LIBS="-L$cp_cv_codepatterns_libs_prefix/lib -l$codepatterns_libname"
     101      #AC_MSG_NOTICE([codepatterns libs found and used.])
    77102    else
    78103      AC_MSG_WARN([codepatterns libs not found at $cp_cv_codepatterns_libs_prefix.])
    … …  
    93118    codepatterns_version=no
    94119    if test x$codepatterns = xyes; then
    95       AC_MSG_CHECKING(for CodePatterns - version >= $codepatterns_version_min)
    96       if test "x$CodePatterns_CONFIG" != "x"; then
     120      AC_MSG_CHECKING(for $codepatterns_libname - version >= $codepatterns_version_min)
     121      if test "x$CodePatterns_CONFIG" != xno; then
    97122        codepatterns_version=`$CodePatterns_CONFIG --version`
    98123      else
    … …  
    157182      fi
    158183    fi
    159 
    160     # check presence of lib
    161     SAVE_CPPFLAGS="$CPPFLAGS"
    162     SAVE_LIBS="$LIBS"
    163     CPPFLAGS="$CodePatterns_CFLAGS"
    164     LIBS="$CodePatterns_LIBS -lboost_thread"
    165     if test x$codepatterns_version = xyes; then
    166       AC_CACHE_CHECK(for CodePatterns lib, cp_cv_codepatterns_lib, [
    167         AC_LANG_PUSH([C++])
    168         AC_LINK_IFELSE(
    169           [
    170             AC_LANG_PROGRAM([
     184  else
     185    # with pkg-config version is checked
     186    codepatterns_version=yes
     187  fi
     188  # check presence of lib
     189  SAVE_CPPFLAGS="$CPPFLAGS"
     190  SAVE_LIBS="$LIBS"
     191  CPPFLAGS="$CodePatterns_CFLAGS"
     192  LIBS="$CodePatterns_LIBS -lboost_thread"
     193  if test x$codepatterns_version = xyes; then
     194    AC_CACHE_CHECK(for $codepatterns_libname lib, cp_cv_codepatterns_lib, [
     195      AC_LANG_PUSH([C++])
     196      AC_LINK_IFELSE(
     197        [
     198          AC_LANG_PROGRAM([
    171199#include "CodePatterns/Singleton.hpp"
    172200#include "CodePatterns/Singleton_impl.hpp"
    … …  
    197225SingletonStub::getInstance();
    198226])
    199           ],[
    200             cp_cv_codepatterns_lib="yes"
    201           ], [
    202             cp_cv_codepatterns_lib="no"
    203           ]
    204         )
    205         AC_LANG_POP([C++])
    206       ])
    207     fi
    208     CPPFLAGS="$SAVE_CPPFLAGS"
    209     LIBS="$SAVE_LIBS"
    210 
    211     if test "x$cp_cv_codepatterns_lib" = xyes ; then
    212        ifelse([$2], , :, [$2])     
    213     else
    214        CodePatterns_CFLAGS=""
    215        CodePatterns_LDFLAGS=""
    216        CodePatterns_LIBS=""
    217        ifelse([$3], , :, [$3])
    218     fi
     227        ],[
     228          cp_cv_codepatterns_lib="yes"
     229        ], [
     230          cp_cv_codepatterns_lib="no"
     231        ]
     232      )
     233      AC_LANG_POP([C++])
     234    ])
     235  fi
     236  CPPFLAGS="$SAVE_CPPFLAGS"
     237  LIBS="$SAVE_LIBS"
     238
     239  if test "x$cp_cv_codepatterns_lib" = xyes ; then
     240    ifelse([$3], , :, [$3])
     241  else
     242     CodePatterns_CFLAGS=""
     243     CodePatterns_LDFLAGS=""
     244     CodePatterns_LIBS=""
     245     ifelse([$4], , :, [$4])
    219246  fi
    220247 
Note: See TracChangeset for help on using the changeset viewer.