Changeset ba3539

Timestamp:

Oct 11, 2015, 7:09:42 AM (9 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:

08d9df7

Parents:

bff5e2

git-author:

Frederik Heber <heber@…> (09/29/15 11:47:45)

git-committer:

Frederik Heber <heber@…> (10/11/15 07:09:42)

Message:

Package CodePatterns is now called libcodepatterns.

• updated m4 file.
• also updated .pc files.

Files:

• LinearAlgebra-debug.pc.in (modified) (1 diff)
• MoleCuilder.pc.in (modified) (1 diff)
• m4/ax_codepatterns.m4 (modified) (3 diffs)

LinearAlgebra-debug.pc.in

@@ -7 +7 @@
 Description: MoleCuilder/LinearAlgebra - A C++ package for linear Algebra, wrapping GSL, enabled debugging
 Version: @PACKAGE_VERSION@
-Requires: CodePatterns-debug >= 1.0.13
+Requires: libcodepatterns-debug >= 1.3.0
 URL: @PACKAGE_URL@
 Libs: -L${libdir} -lmolecuilderLinearAlgebra 

MoleCuilder.pc.in

@@ -7 +7 @@
 Description: MoleCuilder - a molecular builder
 Version: @PACKAGE_VERSION@
+Requires: libcodepatterns-debug >= 1.3.0
 URL: @PACKAGE_URL@
 Libs: -L${libdir} -lMolecuilderQtUI -lMolecuilderUI -lMolecuilderActions -lMolecuilder -lMolecuilderParser -lMolecuilderLinearAlgebra -lMolecuilderExceptions 

m4/ax_codepatterns.m4

@@ -7 +7 @@
 AC_REQUIRE([BOOST_THREADS])
 
-AC_ARG_WITH(codepatterns,[  --with-codepatterns=PFX   Prefix where CodePatterns is installed (optional)],
+AC_ARG_WITH(codepatterns,[  --with-codepatterns=PFX   Prefix where libcodepatterns is installed (optional)],
             codepatterns_prefix="$withval", codepatterns_prefix="")
-AC_ARG_WITH(codepatterns_include,[  --with-codepatterns_include=INCLUDE   Where CodePatterns' includes are installed (optional)],
+AC_ARG_WITH(codepatterns_include,[  --with-codepatterns_include=INCLUDE   Where libcodepatterns' includes are installed (optional)],
             codepatterns_include_prefix="$withval", codepatterns_include_prefix="")
-AC_ARG_WITH(cp_cv_codepatterns_libs,[  --with-cp_cv_codepatterns_libs=LIBPATH   Where CodePatterns' libs are installed (optional)],
+AC_ARG_WITH(cp_cv_codepatterns_libs,[  --with-cp_cv_codepatterns_libs=LIBPATH   Where libcodepatterns' libs are installed (optional)],
             cp_cv_codepatterns_libs_prefix="$withval", cp_cv_codepatterns_libs_prefix="")
 
@@ -35 +35 @@
   #AC_MSG_NOTICE([PKG_CONFIG_PATH is $PKG_CONFIG_PATH.])
   if test x$codepatterns_debug != xno; then
-    codepatterns_libname="CodePatterns-debug"
-    PKG_CHECK_MODULES([CodePatterns_debug], [CodePatterns >= $codepatterns_version_min], [
+    codepatterns_libname="libcodepatterns-debug"
+    PKG_CHECK_MODULES([libcodepatterns_debug], [libcodepatterns >= $codepatterns_version_min], [
       codepatterns_pkgconfig=yes
       CodePatterns_CONFIG="pkg-config $codepatterns_libname"
@@ -55 +55 @@
 
   else
-    codepatterns_libname="CodePatterns"
-    PKG_CHECK_MODULES([CodePatterns], [CodePatterns >= $codepatterns_version_min], [
+    codepatterns_libname="libcodepatterns"
+    PKG_CHECK_MODULES([libcodepatterns], [libcodepatterns >= $codepatterns_version_min], [
       codepatterns_pkgconfig=yes
       CodePatterns_CONFIG="pkg-config $codepatterns_libname"