diff --git a/config.h.in b/config.h.in
index 7a0d44e66..b855e4830 100755
--- a/config.h.in
+++ b/config.h.in
@@ -38,7 +38,7 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 
 // Define this if Fortran adds a trailing underscore to names in object files.
 // For linux and most unix systems, this is the case.
-#define FTN_TRAILING_UNDERSCORE
+#undef FTN_TRAILING_UNDERSCORE
 
 
 #undef HAS_SUNDIALS
@@ -47,9 +47,9 @@ typedef  int          ftnlen;       // Fortran hidden string length type
 
 //-------- LAPACK / BLAS ---------
 
-#define LAPACK_FTN_STRING_LEN_AT_END
-#define LAPACK_NAMES_LOWERCASE
-#define LAPACK_FTN_TRAILING_UNDERSCORE
+#undef LAPACK_FTN_STRING_LEN_AT_END
+#undef LAPACK_NAMES_LOWERCASE
+#undef LAPACK_FTN_TRAILING_UNDERSCORE
 
 
 //--------- operating system --------------------------------------
diff --git a/configure b/configure
index 5fc13f521..dff101a4b 100755
--- a/configure
+++ b/configure
@@ -9304,8 +9304,13 @@ math_libs='-lcvode -lctmath'
 
 
 if test "$LAPACK_FTN_TRAILING_UNDERSCORE" = "y"
-then cat >>confdefs.h <<\_ACEOF
+then
+  cat >>confdefs.h <<\_ACEOF
 #define LAPACK_FTN_TRAILING_UNDERSCORE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define FTN_TRAILING_UNDERSCORE 1
 _ACEOF
 
 fi
diff --git a/configure.in b/configure.in
index 34f78a8c8..e05bd3f75 100755
--- a/configure.in
+++ b/configure.in
@@ -1543,7 +1543,9 @@ math_libs='-lcvode -lctmath'
 AC_SUBST(math_libs)
 
 if test "$LAPACK_FTN_TRAILING_UNDERSCORE" = "y"
-then AC_DEFINE(LAPACK_FTN_TRAILING_UNDERSCORE)
+then 
+  AC_DEFINE(LAPACK_FTN_TRAILING_UNDERSCORE)
+  AC_DEFINE(FTN_TRAILING_UNDERSCORE)
 fi
 
 if test "$LAPACK_FTN_STRING_LEN_AT_END" = "y"
diff --git a/preconfig b/preconfig
index 3d72ca115..fcfff577e 100755
--- a/preconfig
+++ b/preconfig
@@ -503,10 +503,10 @@ export F90_EXT
 export FFLAGS
 export F90FLAGS
 export INSTALL_BIN
-export LAPACK_NAMES
 export LCXX_FLAGS
 export LCXX_END_LIBS
 export LFORT_FLAGS
+export LAPACK_NAMES
 export LAPACK_FTN_STRING_LEN_AT_END
 export LAPACK_FTN_TRAILING_UNDERSCORE
 export LIB_DIR