Index: ../trunk-jpl/src/c/Makefile.am
===================================================================
--- ../trunk-jpl/src/c/Makefile.am	(revision 18369)
+++ ../trunk-jpl/src/c/Makefile.am	(revision 18370)
@@ -872,8 +872,12 @@
 libISSMModules_la_SOURCES += $(kml_sources)
 endif
 libISSMModules_la_CXXFLAGS = $(ALLCXXFLAGS)
+if STANDALONE_LIBRARIES
+libISSMModules_la_LIBADD = ./libISSMCore.la
+else
 libISSMModules_la_LIBADD = ./libISSMCore.la $(TRIANGLELIB)
 endif
+endif
 
 if VERSION
 AM_LDFLAGS =
Index: ../trunk-jpl/configure.ac
===================================================================
--- ../trunk-jpl/configure.ac	(revision 18369)
+++ ../trunk-jpl/configure.ac	(revision 18370)
@@ -14,7 +14,6 @@
 AC_PROG_F77([ifort g77 gfortran])
 
 #Libraries and linking
-AC_F77_LIBRARY_LDFLAGS
 AC_PATH_XTRA      #figure out X library and include paths
 
 #AUTOMAKE
@@ -22,7 +21,6 @@
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_HEADERS([./config.h])   #Config file must be config.h
 AM_SILENT_RULES([yes])           #Do not show compilation command by default
-AM_PROG_CC_C_O
 AM_PROG_AR
 
 #Libtool
