Merge branch 'release-4-5-patches' into orderparm

diff --cc src/tools/Makefile.am
index 5cd6b9ab23b001755d7f2ce414577af2a7dde41c,bacf96f1ef860c17744b702d72e7dbe9285a1dc6..085e651534876c6beadbd22d8202f7e9661dcd4b
--- 1/src/tools/Makefile.am
--- 2/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@@ -74,13 -68,17 +72,13 @@@ bin_PROGRAMS = 
        g_rotacf        g_rotmat        g_saltbr        g_sas           \
        g_select        g_sgangle       \
        g_sham          g_sorient       g_spol          \
-       g_spatial       g_pme_error     \
+       g_spatial       g_pme_error             g_options       \
        g_tcaf          g_traj          g_tune_pme   \
        g_vanhove       g_velacc        g_membed      \
 -      g_clustsize     g_mdmat         g_wham          \
 -      g_sigeps
 -
 -# These programs are not compiled or installed by default - you will have to 
 -# issue "make <program>" and copy the binary to the correct location yourself! 
 -# Add new entries in Makefile.am!
 +      g_clustsize     g_mdmat         g_wham          g_kinetics      \
 +      g_sigeps        g_densorder     g_hydorder
  
- EXTRA_PROGRAMS        =       options
+ EXTRA_DIST            =       libgmxana.pc.cmakein
  
  LDADD = $(lib_LTLIBRARIES) ../mdlib/libmd@LIBSUFFIX@.la \
        ../gmxlib/libgmx@LIBSUFFIX@.la