debugged autoconf/automake stuff

Makefile.in

@@ -83,8 +83,7 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
 	$(top_srcdir)/config/mkinstalldirs $(srcdir)/qdp++-config.in \
 	COPYING config/compile config/depcomp config/install-sh \
 	config/missing config/mkinstalldirs \
-	$(top_srcdir)/config/compile $(top_srcdir)/config/install-sh \
-	$(top_srcdir)/config/missing
+	$(top_srcdir)/config/install-sh $(top_srcdir)/config/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -236,9 +235,6 @@ BAGEL_QDP_CONFIG = @BAGEL_QDP_CONFIG@
 BAGEL_QDP_CXXFLAGS = @BAGEL_QDP_CXXFLAGS@
 BAGEL_QDP_LDFLAGS = @BAGEL_QDP_LDFLAGS@
 BAGEL_QDP_LIBS = @BAGEL_QDP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
 CONFIG_ALIGNMENT = @CONFIG_ALIGNMENT@
 CONFIG_GENERICS = @CONFIG_GENERICS@
 CONFIG_HDF5 = @CONFIG_HDF5@
@@ -269,6 +265,7 @@ FILEDB_DIR = @FILEDB_DIR@
 HDF5_BIN = @HDF5_BIN@
 HDF5_CFLAGS = @HDF5_CFLAGS@
 HDF5_CXXFLAGS = @HDF5_CXXFLAGS@
+HDF5_LDFLAGS = @HDF5_LDFLAGS@
 HDF5_LIBS = @HDF5_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -313,7 +310,6 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@

acinclude.m4

@@ -34,8 +34,7 @@ dnl   so input variables can be CFLAGS, LDFLAGS or LIBS
     pac_QMP_CFLAGS="$1"
     pac_QMP_LDFLAGS="$2"
     pac_QMP_LIBS="$3"
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
+	AC_LANG_PUSH([C++])
 dnl - save the original environment
     pac_saved_CXXFLAGS="$CXXFLAGS"
     pac_saved_LDFLAGS="$LDFLAGS"
@@ -60,7 +59,7 @@ dnl - set the parallel compiler environment
     CXXFLAGS="$pac_saved_CXXFLAGS"
     LDFLAGS="$pac_saved_LDFLAGS"
     LIBS="$pac_saved_LIBS"
-    AC_LANG_RESTORE
+    AC_LANG_POP([C++])
     if test "X${pac_qmp_working}X" = "XyesX" ; then
        ifelse([$6],,:,[$6])
     else
@@ -95,8 +94,7 @@ dnl - set local parallel compiler environments
 dnl - so input variables can be CXXFLAGS, LDFLAGS or LIBS
     pac_LIBXML2_CXXFLAGS="$1"
     pac_LIBXML2_LIBS="$2"
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
+    AC_LANG_PUSH([C++])
 dnl - save the original environment
     pac_saved_CXXFLAGS="$CXXFLAGS"
     pac_saved_LDFLAGS="$LDFLAGS"
@@ -123,7 +121,7 @@ dnl - set the parallel compiler environment
     CXXFLAGS="$pac_saved_CXXFLAGS"
     LDFLAGS="$pac_saved_LDFLAGS"
     LIBS="$pac_saved_LIBS"
-    AC_LANG_RESTORE
+    AC_LANG_POP([C++])
     if test "X${pac_libxml2_working}X" = "XyesX" ; then
        ifelse([$5],,:,[$5])
     else
@@ -165,8 +163,7 @@ dnl   so input variables can be CFLAGS, LDFLAGS or LIBS
     pac_BAGEL_QDP_CFLAGS="$1"
     pac_BAGEL_QDP_LDFLAGS="$2"
     pac_BAGEL_QDP_LIBS="$3"
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
+    AC_LANG_PUSH([C++])
 dnl - save the original environment
     pac_saved_CXXFLAGS="$CXXFLAGS"
     pac_saved_LDFLAGS="$LDFLAGS"
@@ -194,7 +191,7 @@ dnl - set the parallel compiler environment
     CXXFLAGS="$pac_saved_CXXFLAGS"
     LDFLAGS="$pac_saved_LDFLAGS"
     LIBS="$pac_saved_LIBS"
-    AC_LANG_RESTORE
+    AC_LANG_POP([C++])
     if test "X${pac_bagel_qdp_working}X" = "XyesX" ; then
        ifelse([$6],,:,[$6])
     else
@@ -232,8 +229,7 @@ dnl - so input variables can be CFLAGS, LDFLAGS or LIBS
     pac_HDF5_CFLAGS="$1"
     pac_HDF5_CXXFLAGS="$2"
     pac_HDF5_LIBS="$3"
-    AC_LANG_SAVE
-    AC_LANG_C
+    AC_LANG_PUSH([C])
 dnl - save the original environment
     pac_saved_CFLAGS="$CFLAGS"
     pac_saved_CXXFLAGS="$CXXFLAGS"
@@ -262,7 +258,7 @@ dnl - set the parallel compiler environment
     CXXFLAGS="$pac_saved_CXXFLAGS"
     LDFLAGS="$pac_saved_LDFLAGS"
     LIBS="$pac_saved_LIBS"
-    AC_LANG_RESTORE
+    AC_LANG_POP([C])
     if test "X${pac_hdf5_working}X" = "XyesX" ; then
        ifelse([$6],,:,[$6])
     else

aclocal.m4

@@ -762,70 +762,6 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN([_AM_PROG_CC_C_O],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-AC_LANG_PUSH([C])dnl
-AC_CACHE_CHECK(
-  [whether $CC understands -c and -o together],
-  [am_cv_prog_cc_c_o],
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-  # Make sure it works both with $CC and with simple cc.
-  # Following AC_PROG_CC_C_O, we do the test twice because some
-  # compilers refuse to overwrite an existing .o file with -o,
-  # though they will create one.
-  am_cv_prog_cc_c_o=yes
-  for am_i in 1 2; do
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-         && test -f conftest2.$ac_objext; then
-      : OK
-    else
-      am_cv_prog_cc_c_o=no
-      break
-    fi
-  done
-  rm -f core conftest*
-  unset am_i])
-if test "$am_cv_prog_cc_c_o" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP([C])])
-
-# For backward compatibility.
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.