Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches

diff --git a/src/contrib/Makefile.am b/src/contrib/Makefile.am
index efaf4b1bd17f33968b12ed311221cbaeef26fc99..4fadc144721127bfc1f291cbdccc0b348245cb17 100644 (file)
--- a/src/contrib/Makefile.am
+++ b/src/contrib/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_PROGRAMS        =       copyrgt         \
 compnl_SOURCES = compnl.c
 compnl_LDADD   = ../mdlib/libmd@LIBSUFFIX@.la ../gmxlib/libgmx@LIBSUFFIX@.la
 
-g_sdg_SOURCES  = gmx_sdf.c g_sdf.c
+g_sdf_SOURCES  = gmx_sdf.c g_sdf.c
 
 ehole_SOURCES = ehdata.c ehdata.h ehanal.c ehole.c
 

diff --git a/src/contrib/options.c b/src/contrib/options.c
index 6fa2cc804c909b5fb1102c84debdef681f4a7038..c6134171590b28b947ab600d12f264dc974ee42f 100644 (file)
--- a/src/contrib/options.c
+++ b/src/contrib/options.c
@@ -51,12 +51,12 @@
 
 int main(int argc,char *argv[])
 {
-  static char *desc[] = {
+  const char *desc[] = {
     "All GROMACS programs have 6 standard options,",
     "of which some are hidden by default:"
   };
 
-  static char *bugs[] = {
+  const char *bugs[] = {
     "If the configuration script found Motif or Lesstif on your system, "
     "you can use the graphical interface (if not, you will get an error):[BR]"
     "[TT]-X[tt] gmx_bool [TT]no[tt] Use dialog box GUI to edit command line options",