diff --git a/config/pac.m4 b/config/pac.m4
index 69d2f863..03411383 100644
--- a/config/pac.m4
+++ b/config/pac.m4
@@ -380,7 +380,7 @@ AC_ARG_ENABLE(serial,
 AS_HELP_STRING([--enable-serial], 
 [Specify whether to enable a fake mpi library to run in serial mode. ]),
 [
-pac_cv_serial_mpi="yes";
+pac_cv_serial_mpi="$enableval";
 ]
 dnl ,
 dnl [pac_cv_serial_mpi="no";]
@@ -410,12 +410,8 @@ AC_DEFUN([PAC_ARG_OPENMP],
 AC_ARG_ENABLE(openmp,
 AS_HELP_STRING([--enable-openmp], 
 [Specify whether to enable openmp. ]),
-[
-pac_cv_openmp="yes";
-]
-dnl ,
-dnl [pac_cv_openmp="no";]
-	     )
+[pac_cv_openmp="$enableval";])
+dnl AC_MSG_NOTICE([Result from test: "x$pac_cv_openmp"])
 if test x"$pac_cv_openmp" == x"yes" ; then
    AC_MSG_RESULT([yes.])
    AC_LANG_PUSH([Fortran])
@@ -455,7 +451,7 @@ AC_ARG_ENABLE(long-integers,
 AS_HELP_STRING([--enable-long-integers], 
 [Specify usage of 64 bits integers. ]),
 [
-pac_cv_long_integers="yes";
+pac_cv_long_integers="$enableval";
 ]
 dnl ,
 dnl [pac_cv_long_integers="no";]
diff --git a/configure b/configure
index 752fe192..34a2941d 100755
--- a/configure
+++ b/configure
@@ -4796,7 +4796,7 @@ printf %s "checking whether we want serial  mpi stubs... " >&6; }
 if test ${enable_serial+y}
 then :
   enableval=$enable_serial;
-pac_cv_serial_mpi="yes";
+pac_cv_serial_mpi="$enableval";
 
 
 fi
@@ -7687,10 +7687,7 @@ printf %s "checking whether we want openmp ... " >&6; }
 # Check whether --enable-openmp was given.
 if test ${enable_openmp+y}
 then :
-  enableval=$enable_openmp;
-pac_cv_openmp="yes";
-
-
+  enableval=$enable_openmp; pac_cv_openmp="$enableval";
 fi
 
 if test x"$pac_cv_openmp" == x"yes" ; then