Simplify checks and inclusion dependencies

Author: cburstedde

config/sc_memalign.m4

@@ -64,7 +64,7 @@ dnl verify that posix_memalign can be linked against
 ]],
 [[
 int *a;
-int err = posix_memalign((void **) &a, $$1_MEMALIGN_BYTES_LINK, 3 * sizeof(*a));
+posix_memalign((void **) &a, $$1_MEMALIGN_BYTES_LINK, 3 * sizeof(*a));
 free(a);
 ]])],
                    [], [AC_MSG_ERROR([Linking posix_memalign failed])])

config/sc_mpi.m4

@@ -299,11 +299,9 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
 #undef MPI
 #include <mpi.h>
 ]], [[
-int mpiret;
 int mpithr;
-mpiret = MPI_Init_thread ((int *) 0, (char ***) 0,
-                          MPI_THREAD_MULTIPLE, &mpithr);
-mpiret = MPI_Finalize ();
+MPI_Init_thread ((int *) 0, (char ***) 0, MPI_THREAD_MULTIPLE, &mpithr);
+MPI_Finalize ();
 ]])],
 [AC_MSG_RESULT([successful])
  $1],
@@ -322,18 +320,17 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
 #undef MPI
 #include <mpi.h>
 ]], [[
-int mpiret;
-int mpithr;
 int disp_unit=0;
 char *baseptr;
 MPI_Win win;
 MPI_Init ((int *) 0, (char ***) 0);
-mpiret = MPI_Win_allocate_shared(0,disp_unit,MPI_INFO_NULL,MPI_COMM_WORLD,(void *) &baseptr,&win);
-mpiret = MPI_Win_shared_query(win,0,0,&disp_unit,(void *) &baseptr);
-mpiret = MPI_Win_lock(MPI_LOCK_EXCLUSIVE,0,MPI_MODE_NOCHECK,win);
-mpiret = MPI_Win_unlock(0,win);
-mpiret = MPI_Win_free(&win);
-mpiret = MPI_Finalize ();
+MPI_Win_allocate_shared(0,disp_unit,MPI_INFO_NULL,MPI_COMM_WORLD,
+                        (void *) &baseptr,&win);
+MPI_Win_shared_query(win,0,0,&disp_unit,(void *) &baseptr);
+MPI_Win_lock(MPI_LOCK_EXCLUSIVE,0,MPI_MODE_NOCHECK,win);
+MPI_Win_unlock(0,win);
+MPI_Win_free(&win);
+MPI_Finalize ();
 ]])],
 [AC_MSG_RESULT([successful])
  $1],
@@ -352,11 +349,10 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
 #undef MPI
 #include <mpi.h>
 ]], [[
-int mpiret;
 MPI_Comm subcomm;
 MPI_Init ((int *) 0, (char ***) 0);
-mpiret = MPI_Comm_split_type(MPI_COMM_WORLD,MPI_COMM_TYPE_SHARED,0,MPI_INFO_NULL,&subcomm);
-mpiret = MPI_Finalize ();
+MPI_Comm_split_type(MPI_COMM_WORLD,MPI_COMM_TYPE_SHARED,0,MPI_INFO_NULL,&subcomm);
+MPI_Finalize ();
 ]])],
 [AC_MSG_RESULT([successful])
  $1],

config/sc_openmp.m4

@@ -40,6 +40,8 @@ if test "x$$1_ENABLE_OPENMP" != xno ; then
 [[
 #include <omp.h>
 ]],[[
+  omp_lock_t     wlock;
+  omp_set_lock (&wlock);
   omp_set_num_threads (2);
   #pragma omp parallel
   {

libb64/Makefile.am

@@ -5,9 +5,7 @@
 
 bin_PROGRAMS += libb64/sc_b64enc libb64/sc_b64dec
 libb64_sc_b64enc_SOURCES = libb64/b64enc.c
-libb64_sc_b64enc_CPPFLAGS = $(AM_CPPFLAGS) -I@top_srcdir@/libb64
 libb64_sc_b64dec_SOURCES = libb64/b64dec.c
-libb64_sc_b64dec_CPPFLAGS = $(AM_CPPFLAGS) -I@top_srcdir@/libb64
 
 libb64_internal_headers = libb64/libb64.h
 libb64_compiled_sources = libb64/cencode.c libb64/cdecode.c

libb64/b64dec.c

@@ -10,7 +10,7 @@ This is part of the libb64 project, and has been placed in the public domain.
 For details, see http://sourceforge.net/projects/libb64
 */
 
-#include <libb64.h>
+#include "libb64.h"
 #include <stdio.h>
 #include <stdlib.h>
 

libb64/b64enc.c

@@ -10,7 +10,7 @@ This is part of the libb64 project, and has been placed in the public domain.
 For details, see http://sourceforge.net/projects/libb64
 */
 
-#include <libb64.h>
+#include "libb64.h"
 #include <stdio.h>
 #include <stdlib.h>
 

libb64/cdecode.c

@@ -10,7 +10,7 @@ This is part of the libb64 project, and has been placed in the public domain.
 For details, see http://sourceforge.net/projects/libb64
 */
 
-#include <libb64.h>
+#include "libb64.h"
 
 static inline char
 base64_decode_value (char value_in)

libb64/cencode.c

@@ -10,7 +10,7 @@ This is part of the libb64 project, and has been placed in the public domain.
 For details, see http://sourceforge.net/projects/libb64
 */
 
-#include <libb64.h>
+#include "libb64.h"
 
 const int           CHARS_PER_LINE = 72;