Misc changes in install utilities for compilation on Windows:

- remove -pthread option in gfortran for non-threaded executables
- avoid double "//" in Makefile
- remove symbolic link iotk every time

install/configure

@@ -4649,8 +4649,8 @@ ia32:path* | ia64:path* | x86_64:path* )
         try_fflags_openmp="-fopenmp"
         try_f90flags="\$(FFLAGS) -x f95-cpp-input"
         try_fflags_noopt="-O0 -g"
-        try_ldflags="-g -pthread"
-        try_ldflags_openmp="-fopenmp"
+        try_ldflags="-g"
+        try_ldflags_openmp="-pthread -fopenmp"
         try_ldflags_static="-static"
         ;;
 crayxt*:cray* )

install/extlibs_makefile

@@ -74,7 +74,8 @@ libiotk:
 	cd ../bin; ln -fs ../S3DE/iotk/tools/iotk .; \
 	ln -fs ../S3DE/iotk/src/iotk.x .; \
 	ln -fs ../S3DE/iotk/src/iotk_print_kinds.x .; \
-	cd ../; ln -fs S3DE/iotk iotk
+	# middle instruction needed for windows
+	cd ../; rm -rf iotk ; ln -fs S3DE/iotk iotk
 
 libfox:
 	if test ! -d ../FoX; then \

install/m4/x_ac_qe_f90.m4

@@ -109,8 +109,8 @@ ia32:path* | ia64:path* | x86_64:path* )
         try_fflags_openmp="-fopenmp"
         try_f90flags="\$(FFLAGS) -x f95-cpp-input"
         try_fflags_noopt="-O0 -g"
-        try_ldflags="-g -pthread"
-        try_ldflags_openmp="-fopenmp"
+        try_ldflags="-g"
+        try_ldflags_openmp="-pthread -fopenmp"
         try_ldflags_static="-static"
         ;;
 crayxt*:cray* )

install/make.inc.in

@@ -60,12 +60,12 @@ MOD_FLAG      = @imod@
 # while BASEMODS points to the corresponding module libraries
 # Each Makefile can add directories to MODFLAGS and libraries to QEMODS
 
-BASEMOD_FLAGS= $(MOD_FLAG)/$(TOPDIR)/iotk/src \
-               $(MOD_FLAG)/$(TOPDIR)/Modules \
-               $(MOD_FLAG)/$(TOPDIR)/FFTXlib \
-	       $(MOD_FLAG)/$(TOPDIR)/LAXlib \
-	       $(MOD_FLAG)/$(TOPDIR)/UtilXlib \
-	       $(MOD_FLAG)/$(TOPDIR)/FoX/finclude
+BASEMOD_FLAGS= $(MOD_FLAG)$(TOPDIR)/iotk/src \
+               $(MOD_FLAG)$(TOPDIR)/Modules \
+               $(MOD_FLAG)$(TOPDIR)/FFTXlib \
+	       $(MOD_FLAG)$(TOPDIR)/LAXlib \
+	       $(MOD_FLAG)$(TOPDIR)/UtilXlib \
+	       $(MOD_FLAG)$(TOPDIR)/FoX/finclude
 
 # Compilers: fortran-90, fortran-77, C
 # If a parallel compilation is desired, MPIF90 should be a fortran-90