Cleanup of configure arguments

It is now

  --enable-timing
  --enable-redirect
  --with-papi

instead of the more confusing

  --with-ftimings
  --with-redirect
  --disable-papi

For once, the --with versions of timing and redirect could not cope with
--with-timing=no, --with-redirect=no (this was interpreted like =yes).
Also, --with switches are supposed to be for optional dependencies on
other software, not for configuring optional parts of the software
itself.

configure.ac

@@ -151,53 +151,54 @@ install_complex_generic_simple=yes
 
 AC_LANG([C])
 
-dnl build with ftimings support
-AC_MSG_CHECKING(whether ELPA should be build with ftimings support)
-AC_ARG_WITH([ftimings],
-		AS_HELP_STRING([--with-ftimings],
-			       [detailed timings, default no.]),
-	      [with_ftimings=yes],
-	      [with_ftimings=no])
-AC_MSG_RESULT([${with_ftimings}])
-
 dnl build with the possibilty to redirect stdout and stderr
 dnl per MPI task in a file
 AC_MSG_CHECKING(whether stdout/stderr file redirect should be enabled)
-AC_ARG_WITH([redirect],
-		AS_HELP_STRING([--with-redirect],
-			       [for test programs, allow redirection of stdout/stderr per MPI taks in a file (useful for ftimings), default no.]),
-	      [with_redirect=yes],
-	      [with_redirect=no])
-AC_MSG_RESULT([${with_redirect}])
-
-if test x"${with_redirect}" = x"yes"; then
+AC_ARG_ENABLE([redirect],
+		AS_HELP_STRING([--enable-redirect],
+			       [for test programs, allow redirection of stdout/stderr per MPI taks in a file (useful for timing), default no.]),
+	      [],
+	      [enable_redirect=no])
+AC_MSG_RESULT([${enable_redirect}])
+
+dnl redirect
+if test x"${enable_redirect}" = x"yes"; then
   AC_DEFINE([HAVE_REDIRECT], [1], [Redirect stdout and stderr of test programs per MPI tasks to a file])
 fi
-AM_CONDITIONAL([HAVE_REDIRECT],[test x"$with_redirect" = x"yes"])
-
-if test x"${with_ftimings}" = x"yes"; then
-  AC_DEFINE([HAVE_DETAILED_TIMINGS], [1], [Enable more timings])
-  AC_ARG_ENABLE([papi],
-	[AS_HELP_STRING([--disable-papi],[Do not use PAPI to also measure flop count, autodetected by default])],
-	[want_papi=$enableval],[want_papi="auto"])
-  papi_found=unknown
-  if test x"$want_papi" != x"no" ; then
-    AC_CHECK_LIB([papi],[PAPI_library_init],[papi_found="yes"],[papi_found="no"])
-    if test x"$want_papi" = x"yes" ; then
-      if test x"$papi_found" = x"no" ; then
-        AC_MSG_ERROR(["Could not find usable PAPI installation, please adjust CFLAGS, LDFLAGS"])
-      fi
+AM_CONDITIONAL([HAVE_REDIRECT],[test x"$enable_redirect" = x"yes"])
+
+dnl build with ftimings support
+AC_MSG_CHECKING(whether ELPA should be build with more detailed timing support)
+AC_ARG_ENABLE([timing],
+		AS_HELP_STRING([--enable-timing],
+			       [more detailed timing, default no.]),
+	      [],
+	      [enable_timings=no])
+AC_MSG_RESULT([${enable_timings}])
+
+if test x"${enable_timings}" = x"yes"; then
+  AC_DEFINE([HAVE_DETAILED_TIMINGS], [1], [Enable more timing])
+fi
+AM_CONDITIONAL([HAVE_DETAILED_TIMINGS],[test x"$enable_timings" = x"yes"])
+
+dnl PAPI for ftimings
+AC_ARG_WITH([papi],
+		[AS_HELP_STRING([--with-papi],[Use PAPI to also measure flop count in the detailed timing (--enable-timing), disabled by default])],
+		[],
+		[with_papi="no"])
+if test x"${enable_timings}" = x"yes"; then
+  if test x"$with_papi" = x"yes" ; then
+    AC_SEARCH_LIBS([PAPI_library_init],[papi],
+                  [papi_found=yes],[papi_found=no])
+    if test x"$papi_found" = x"no" ; then
+      AC_MSG_ERROR(["Could not find usable PAPI installation, please install or adjust CFLAGS, LDFLAGS"])
     fi
-  fi
-  if test x"$papi_found" = x"yes"; then
     AC_DEFINE([HAVE_LIBPAPI], [1], [Use the PAPI library])
-    LIBS="-lpapi $LIBS"
   fi
 fi
-AM_CONDITIONAL([HAVE_DETAILED_TIMINGS],[test x"$with_ftimings" = x"yes"])
 
+dnl SSE assembly kernel
 AC_MSG_CHECKING(whether SSE assembly kernel can be compiled)
-
 $CC -c $srcdir/src/elpa2_kernels/elpa2_kernels_asm_x86_64.s -o test.o 2>/dev/null
 if test "$?" == 0; then
   can_compile_sse_assembly=yes