Index: /issm/trunk-jpl/configs/config-win7-32.sh
===================================================================
--- /issm/trunk-jpl/configs/config-win7-32.sh	(revision 11523)
+++ /issm/trunk-jpl/configs/config-win7-32.sh	(revision 11523)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+
+#get configure.sh to pick up the win7 Visual Studio compiler 
+./configure --prefix=$ISSM_TIER --with-vendor=intel-win7-32  --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_TIER_WIN/externalpackages/triangle/install --with-metis-dir=$ISSM_TIER_WIN/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER_WIN/externalpackages/petsc/install  --with-petsc-arch=$ISSM_ARCH  --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib/  --with-mpi-lib=$ISSM_TIER_WIN/externalpackages/petsc/install/lib/libpetsc.lib --with-mpi-include=$ISSM_TIER_WIN/externalpackages/petsc/install/include/mpiuni
Index: /issm/trunk-jpl/configs/config-win7-64.sh
===================================================================
--- /issm/trunk-jpl/configs/config-win7-64.sh	(revision 11523)
+++ /issm/trunk-jpl/configs/config-win7-64.sh	(revision 11523)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+
+#get configure.sh to pick up the win7 Visual Studio compiler 
+./configure --prefix=$ISSM_TIER --with-vendor=intel-win7-64  --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_TIER_WIN/externalpackages/triangle/install --with-metis-dir=$ISSM_TIER_WIN/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER_WIN/externalpackages/petsc/install  --with-petsc-arch=$ISSM_ARCH  --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib/  --with-mpi-lib=$ISSM_TIER_WIN/externalpackages/petsc/install/lib/libpetsc.lib --with-mpi-include=$ISSM_TIER_WIN/externalpackages/petsc/install/include/mpiuni
Index: sm/trunk-jpl/configs/config-win7.sh
===================================================================
--- /issm/trunk-jpl/configs/config-win7.sh	(revision 11522)
+++ 	(revision )
@@ -1,5 +1,0 @@
-#!/bin/sh
-
-
-#get configure.sh to pick up the win7 Visual Studio compiler 
-./configure --prefix=$ISSM_TIER --with-vendor=intel-win7  --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_TIER_WIN/externalpackages/triangle/install --with-metis-dir=$ISSM_TIER_WIN/externalpackages/metis/install --with-petsc-dir=$ISSM_TIER_WIN/externalpackages/petsc/install  --with-petsc-arch=$ISSM_ARCH  --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install/lib/  --with-mpi-lib=$ISSM_TIER_WIN/externalpackages/petsc/install/lib/libpetsc.lib --with-mpi-include=$ISSM_TIER_WIN/externalpackages/petsc/install/include/mpiuni
Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 11522)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 11523)
@@ -42,4 +42,48 @@
 
 	dnl ISSM's externalpackages
+	dnl vendor{{{1
+	AC_ARG_WITH([vendor],
+			  AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]), [VENDOR=$withval],[VENDOR=""]) 
+	AC_MSG_CHECKING(for vendor compilers)
+	if test -n "$VENDOR"; then
+
+		if  test $VENDOR = intel-win32; then
+			export CC=icl
+			export CXX=icl
+			export CFLAGS="-DWIN32 -D_INTEL_WIN_"
+			export CXXFLAGS="-DWIN32 -D_INTEL_WIN_"
+		elif  test $VENDOR = intel-win7-32; then
+			export CC=cccl
+			export CXX=cccl
+			export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+			export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+			export AR=lib
+			export RANLIB=true
+			OSLIBS="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"
+		elif  test $VENDOR = intel-win7-64; then
+			export CC=cccl
+			export CXX=cccl
+			export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+			export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
+			export AR=lib
+			export RANLIB=true
+			OSLIBS="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"
+		elif test $VENDOR = intel-linux; then
+			export CC=icc
+			export CXX=icpc
+			export CFLAGS=" -D_INTEL_LINUX_"
+			export CXXFLAGS=" -D_INTEL_LINUX_"
+		elif test $VENDOR = intel-pleiades; then
+			export CC=icc
+			export CXX=icpc
+			export CXXFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
+			export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
+		else
+		AC_MSG_ERROR([unknow compiler vendor!])
+		fi
+	fi
+	AC_SUBST([OSLIBS]) 
+	AC_MSG_RESULT(done)
+	dnl }}}
 	dnl Matlab {{{1
 	AC_ARG_WITH([matlab-dir],
@@ -92,8 +136,10 @@
 				dnl MEXLINK="-Wl,-twolevel_namespace -undefined error -arch i386 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map"
 			;;
-			*cygwin*)
-				MEXLIB="-dll -export:mexFunction -LIBPATH:\"$MATLAB_ROOT\extern\lib\win64\microsoft\" libmx.lib libmex.lib libmat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  -NOLOGO -INCREMENTAL:NO -manifest" 
-
-
+			*cygwin*) 
+				if  test $VENDOR = intel-win7-32; then
+					MEXLIB="-dll -export:mexFunction -LIBPATH:\"$MATLAB_ROOT\extern\lib\win32\microsoft\" libmx.lib libmex.lib libmat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  -NOLOGO -INCREMENTAL:NO -manifest" 
+				elif  test $VENDOR = intel-win7-64; then
+					MEXLIB="-dll -export:mexFunction -LIBPATH:\"$MATLAB_ROOT\extern\lib\win64\microsoft\" libmx.lib libmex.lib libmat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  -NOLOGO -INCREMENTAL:NO -manifest" 
+				fi
 				MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
 				MEXEXT=".$MEXEXT"
@@ -844,40 +890,4 @@
 	AC_MSG_RESULT(done)
 	dnl }}}
-	dnl vendor{{{1
-	AC_ARG_WITH([vendor],
-			  AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]), [VENDOR=$withval],[VENDOR=""]) 
-	AC_MSG_CHECKING(for vendor compilers)
-	if test -n "$VENDOR"; then
-
-		if  test $VENDOR = intel-win32; then
-			export CC=icl
-			export CXX=icl
-			export CFLAGS="-DWIN32 -D_INTEL_WIN_"
-			export CXXFLAGS="-DWIN32 -D_INTEL_WIN_"
-		elif  test $VENDOR = intel-win7; then
-			export CC=cccl
-			export CXX=cccl
-			export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
-			export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
-			export AR=lib
-			export RANLIB=true
-			OSLIBS="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"
-		elif test $VENDOR = intel-linux; then
-			export CC=icc
-			export CXX=icpc
-			export CFLAGS=" -D_INTEL_LINUX_"
-			export CXXFLAGS=" -D_INTEL_LINUX_"
-		elif test $VENDOR = intel-pleiades; then
-			export CC=icc
-			export CXX=icpc
-			export CXXFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
-			export CFLAGS=" -O3 -xS -D_INTEL_LINUX_ "
-		else
-		AC_MSG_ERROR([unknow compiler vendor!])
-		fi
-	fi
-	AC_SUBST([OSLIBS]) 
-	AC_MSG_RESULT(done)
-	dnl }}}
 	dnl with-steadystate{{{1
 	AC_ARG_WITH([steadystate],AS_HELP_STRING([--with-steadystate = YES], [compile with steadystate capabilities (default is yes)]),[STEADYSTATE=$withval],[STEADYSTATE=yes]) 
