Index: /issm/trunk-jpl/jenkins/windows
===================================================================
--- /issm/trunk-jpl/jenkins/windows	(revision 20385)
+++ /issm/trunk-jpl/jenkins/windows	(revision 20386)
@@ -10,4 +10,5 @@
 ISSM_CONFIG='--prefix=$ISSM_DIR \
 	--with-vendor=MSVC-Win64  \
+	--with-cxxoptflags='' \
    --disable-static \
 	--enable-standalone-libraries \
Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 20385)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 20386)
@@ -1996,5 +1996,5 @@
 	AC_ARG_WITH([cxxoptflags],
 	  AS_HELP_STRING([--with-cxxoptflags = CXXOPTFLAGS], [optimization using CXX flags, ex: --with-cxxoptflags=-march=opteron -O3]),
-	  [CXXOPTFLAGS=$withval],[CXXOPTFLAGS="-g -O2"]) 
+	  [CXXOPTFLAGS=$withval],[CXXOPTFLAGS="-g -O2 -fPIC"]) 
 	AC_MSG_CHECKING(for c++ optimization flags)
 	AC_SUBST([CXXOPTFLAGS])
Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 20385)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 20386)
@@ -585,5 +585,5 @@
 #}}}
 #Library flags and sources {{{
-ALLCXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) 
+ALLCXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) 
 
 libISSMCore_la_SOURCES  = $(issm_sources)
@@ -643,5 +643,5 @@
 libISSMOverload_la_SOURCES = ./shared/String/ApiPrintf.cpp
 
-libISSMOverload_la_CFLAGS  = -fPIC -D_C_ $(COPTFLAGS) $(CFLAGS)
+libISSMOverload_la_CFLAGS  = -D_C_ -fPIC $(COPTFLAGS) $(CFLAGS)
 #}}}
 
@@ -675,8 +675,8 @@
 
 issm_SOURCES = main/issm.cpp
-issm_CXXFLAGS= -fPIC
+issm_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)
 
 issm_slr_SOURCES = main/issm_slr.cpp
-issm_slr_CXXFLAGS= -fPIC
+issm_slr_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)
 
 
@@ -684,5 +684,5 @@
 bin_PROGRAMS += kriging
 kriging_SOURCES = main/kriging.cpp
-kriging_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
+kriging_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 endif
 
@@ -690,5 +690,5 @@
 bin_PROGRAMS += issm_dakota
 issm_dakota_SOURCES = main/issm_dakota.cpp
-issm_dakota_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
+issm_dakota_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 issm_dakota_LDADD= $(LDADD)
 endif
@@ -706,5 +706,5 @@
 #libAD_a_SOURCES = ./mini1.ad.c
 libAD_la_SOURCES = 
-libAD_la_CFLAGS = -fPIC -D_C_ $(COPTFLAGS)
+libAD_la_CFLAGS = -D_C_ -fPIC $(COPTFLAGS)
 
 #test rose preprocessing 
@@ -712,5 +712,5 @@
 	testTranslator -rose:o $@ -rose:skipfinalCompileStep -DHAVE_CONFIG_H -D_C_ -I. -I../.. $(INCLUDES) $<
 libISSMRose_la_SOURCES = $(libISSMCore_a_SOURCES:.cpp=.r2cpp.cpp)
-libISSMRose_la_CXXFLAGS= -fPIC -D_C_ $(CXXOPTFLAGS)
+libISSMRose_la_CXXFLAGS= -D_C_ $(CXXOPTFLAGS)
 
 #Automatic differentiation rules: 
@@ -722,5 +722,5 @@
 issmRose_exe_LDADD = ./libISSMRose.a $(LDADD)
 issmRose_exe_SOURCES = main/issm.cpp
-issmRose_exe_CXXFLAGS= -fPIC $(CXXOPTFLAGS) $(COPTFLAGS) 
+issmRose_exe_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 LDADD +=  $(ADIC2LIB) 
 endif #}}}
