From: Rossen Apostolov <rossen@cbr.su.se>
Date: Thu, 2 Sep 2010 09:57:09 +0000 (+0200)
Subject: Added for distribution  missing CMake specific files.
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=927d8d2822fad592882fd8e7c9c0f4786ec5ce72;p=alexxy%2Fgromacs.git

Added for distribution  missing CMake specific files.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4cbe29f91..10f1647194 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,11 +306,14 @@ if(LIBXML2_FOUND)
     set(HAVE_LIBXML2 1)
 endif(LIBXML2_FOUND)
 
-find_package(X11)
-# X11 includes/libraries are only set in the ngmx subdirectory!
-if(X11_FOUND)
-    set(HAVE_X11 1)
-endif(X11_FOUND)
+option(GMX_X11 "Use X window system" OFF)
+if (GMX_X11)
+	find_package(X11)
+	# X11 includes/libraries are only set in the ngmx subdirectory!
+	if(X11_FOUND)
+    	set(HAVE_X11 1)
+	endif(X11_FOUND)
+endif(GMX_X11)
 
 if(GMX_THREADS)
     set(PKG_CFLAGS "${PKG_CFLAGS} -DGMX_THREADS")
diff --git a/admin/Makefile.am b/admin/Makefile.am
index 15def12986..c0bf284ad9 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -5,4 +5,5 @@
 
 EXTRA_SCRIPTS = mkcompl  mkhtml  mknroff.pl  mktex 
 
-EXTRA_DIST    = gromacs.spec  programs.txt README.patches $(EXTRA_SCRIPTS)
+EXTRA_DIST    = gromacs.spec	programs.txt		README.patches $(EXTRA_SCRIPTS)\
+				InstallInfo.txt	InstallLicense.txt	InstallWelcome.txt 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index a509aef563..216699d662 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -17,7 +17,10 @@ dist_bin_SCRIPTS =   \
 
 # Scripts that will not be installed
 EXTRA_SCRIPTS = 		grompplog2top       	make_gromos_nb.pl  \
-	make_gromos_rtp.py 	make_gromos_bon.pl 	make_gromos_rtp.pl 
+	make_gromos_rtp.py 	make_gromos_bon.pl 	make_gromos_rtp.pl \
+	CMakeLists.txt		GMXRC.cmakein		GMXRC.bash.cmakein \
+	GMXRC.csh.cmakein	GMXRC.zsh.cmakein
+
 
 
 # Extra files we need
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 405947a8d4..0b05ab3670 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -18,7 +18,7 @@ add_library(gmxana
             gmx_mindist.c   gmx_msd.c       gmx_morph.c     gmx_nmeig.c     
             gmx_nmens.c     gmx_order.c     gmx_principal.c 
             gmx_polystat.c  gmx_potential.c gmx_rama.c      
-            gmx_rdf.c       gmx_rms.c       gmx_rmsdist.c   gmx_rmsf.c      
+            gmx_rdf.c       gmx_rms.c       gmx_rmsf.c      
             gmx_rotacf.c    gmx_saltbr.c    gmx_sas.c              
             gmx_select.c	gmx_rmsdist.c	gmx_rotmat.c
             gmx_sgangle.c   gmx_sorient.c   gmx_spol.c      gmx_tcaf.c