diff --git a/Makefile.in b/Makefile.in
index ede469058..8a6f9d53b 100644
--- a/Makefile.in
+++ b/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@
diff --git a/acinclude.m4 b/acinclude.m4
index 63b775720..0cd39135b 100644
--- a/acinclude.m4
+++ b/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
diff --git a/aclocal.m4 b/aclocal.m4
index d2198f20a..d4acb3b1d 100644
--- a/aclocal.m4
+++ b/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.
diff --git a/configure b/configure
index 28bc83193..93db5bb86 100755
--- a/configure
+++ b/configure
@@ -634,15 +634,10 @@ BAGEL_QDP_LIBS
 BAGEL_QDP_LDFLAGS
 BAGEL_QDP_CXXFLAGS
 BAGEL_QDP_CONFIG
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-ac_ct_CC
-CFLAGS
-CC
 CONFIG_HDF5
 HDF5_BIN
 HDF5_LIBS
+HDF5_LDFLAGS
 HDF5_CXXFLAGS
 HDF5_CFLAGS
 LIBXML2_CONFIG
@@ -789,9 +784,7 @@ CXXFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CCC
-CC
-CFLAGS'
+CCC'
 ac_subdirs_all='other_libs/libintrin
 other_libs/filedb
 other_libs/qio
@@ -1462,8 +1455,6 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  CC          C compiler command
-  CFLAGS      C compiler flags
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1629,90 +1620,6 @@ fi
 
 } # ac_fn_cxx_try_link
 
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
 # ac_fn_cxx_check_func LINENO FUNC VAR
 # ------------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -4295,8 +4202,7 @@ CONFIG_PARALLEL_ARCH=${PARALLEL_ARCH}
     pac_QMP_CFLAGS="${QMP_CFLAGS}"
     pac_QMP_LDFLAGS="${QMP_LDFLAGS}"
     pac_QMP_LIBS="${QMP_LIBS}"
-
-    ac_ext=cpp
+	ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -4401,8 +4307,6 @@ $as_echo "$as_me: Disabling Libxml" >&6;}
   LIBXML2_LIBS=""
 
 
-$as_echo "#define QDP_NO_LIBXML2 1" >>confdefs.h
-
 else
 
   if test "X${LIBXML2_HOME}X" = "XX" ; then
@@ -4505,12 +4409,16 @@ $as_echo "$as_me: libxml2 compile flags: ${LIBXML2_CXXFLAGS}" >&6;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: libxml2 libraries flags: ${LIBXML2_LIBS}" >&5
 $as_echo "$as_me: libxml2 libraries flags: ${LIBXML2_LIBS}" >&6;}
 
+cat >>confdefs.h <<_ACEOF
+#define QDP_USE_LIBXML2 1
+_ACEOF
+
+
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can compile/link a simple libxml2 program" >&5
 $as_echo_n "checking if we can compile/link a simple libxml2 program... " >&6; }
 
     pac_LIBXML2_CXXFLAGS="${LIBXML2_CXXFLAGS}"
     pac_LIBXML2_LIBS="${LIBXML2_LIBS}"
-
     ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4600,13 +4508,17 @@ $as_echo "$as_me: Disabling HDF5" >&6;}
 
   HDF5_CXXFLAGS=""
 
+  HDF5_LDFLAGS=""
+
   HDF5_LIBS=""
 
 
-$as_echo "#define QDP_NO_HDF5 1" >>confdefs.h
+else
 
+cat >>confdefs.h <<_ACEOF
+#define QDP_USE_HDF5 1
+_ACEOF
 
-else
   if test "X${HDF5_HOME}X" = "XX" ; then
     # Extract the first word of "h5dump", so it can be a program name with args.
 set dummy h5dump; ac_word=$2
@@ -4700,89 +4612,65 @@ $as_echo "$as_me: Found hdf5 utility ${HDF5_BIN}" >&6;}
 
   HDF5_CXXFLAGS="-I${HDF5_HOME}/include"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: hdf5 compile flags: ${HDF5_CFLAGS}" >&5
-$as_echo "$as_me: hdf5 compile flags: ${HDF5_CFLAGS}" >&6;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: hdf5 compile flags: ${HDF5_CXXFLAGS}" >&5
-$as_echo "$as_me: hdf5 compile flags: ${HDF5_CXXFLAGS}" >&6;}
-  HDF5_LIBS="-L${HDF5_HOME}/lib -lhdf5 -lz -lm"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: hdf5 c-compile flags: ${HDF5_CFLAGS}" >&5
+$as_echo "$as_me: hdf5 c-compile flags: ${HDF5_CFLAGS}" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: hdf5 c++-compile flags: ${HDF5_CXXFLAGS}" >&5
+$as_echo "$as_me: hdf5 c++-compile flags: ${HDF5_CXXFLAGS}" >&6;}
+  HDF5_LDFLAGS="-L${HDF5_HOME}/lib"
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: hdf5 libraries flags: ${HDF5_LIBS}" >&5
-$as_echo "$as_me: hdf5 libraries flags: ${HDF5_LIBS}" >&6;}
-
-cat >>confdefs.h <<_ACEOF
-#define QDP_USE_HDF5 1
-_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: hdf5 ldflags: ${HDF5_LDFLAGS}" >&5
+$as_echo "$as_me: hdf5 ldflags: ${HDF5_LDFLAGS}" >&6;}
+  HDF5_LIBS="-lhdf5 -lz -lm"
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: hdf5 libraries: ${HDF5_LIBS}" >&5
+$as_echo "$as_me: hdf5 libraries: ${HDF5_LIBS}" >&6;}
   CONFIG_HDF5=1
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring QDP++ with HDF5 enabled" >&5
 $as_echo "$as_me: Configuring QDP++ with HDF5 enabled" >&6;};
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can compile/link a simple hdf5 program" >&5
-$as_echo_n "checking if we can compile/link a simple hdf5 program... " >&6; }
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+                                      fi
 
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+
+# Check whether --with-bagel-qdp was given.
+if test "${with_bagel_qdp+set}" = set; then :
+  withval=$with_bagel_qdp; BAGEL_QDP_DIR=${with_bagel_qdp}
+   BAGEL_QDP_ENABLED="yes"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  BAGEL_QDP_DIR=""
+   BAGEL_QDP_ENABLED="no"
+
 fi
 
 
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
+if test "X${BAGEL_QDP_ENABLED}X" = "XyesX";
+then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Using BAGEL QDP" >&5
+$as_echo "$as_me: Using BAGEL QDP" >&6;}
+
+$as_echo "#define QDP_USE_BAGEL_QDP 1" >>confdefs.h
+
+          if test "X${BAGEL_QDP_DIR}X" = "XX" ;
+     then
+       # Extract the first word of "bagel-qdp-config", so it can be a program name with args.
+set dummy bagel-qdp-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if ${ac_cv_path_BAGEL_QDP_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  case $BAGEL_QDP_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BAGEL_QDP_CONFIG="$BAGEL_QDP_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
+    ac_cv_path_BAGEL_QDP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4790,52 +4678,41 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+BAGEL_QDP_CONFIG=$ac_cv_path_BAGEL_QDP_CONFIG
+if test -n "$BAGEL_QDP_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BAGEL_QDP_CONFIG" >&5
+$as_echo "$BAGEL_QDP_CONFIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
 
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
+     else
+       # Extract the first word of "bagel-qdp-config", so it can be a program name with args.
+set dummy bagel-qdp-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if ${ac_cv_path_BAGEL_QDP_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $BAGEL_QDP_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_BAGEL_QDP_CONFIG="$BAGEL_QDP_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${BAGEL_QDP_DIR}/bin:${PATH}"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    ac_cv_path_BAGEL_QDP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -4843,801 +4720,36 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+BAGEL_QDP_CONFIG=$ac_cv_path_BAGEL_QDP_CONFIG
+if test -n "$BAGEL_QDP_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BAGEL_QDP_CONFIG" >&5
+$as_echo "$BAGEL_QDP_CONFIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
      fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+     if test "X${BAGEL_QDP_CONFIG}X" = "XX";
+     then
+       as_fn_error $? "bagel-qdp-config not found" "$LINENO" 5
+     fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Found bagel_qdp configuration program ${BAGEL_QDP_CONFIG}" >&5
+$as_echo "$as_me: Found bagel_qdp configuration program ${BAGEL_QDP_CONFIG}" >&6;}
+     BAGEL_QDP_CXXFLAGS="`${BAGEL_QDP_CONFIG} --cxxflags`"
 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: bagel_qdp compile flags: ${BAGEL_QDP_CXXFLAGS}" >&5
+$as_echo "$as_me: bagel_qdp compile flags: ${BAGEL_QDP_CXXFLAGS}" >&6;}
+     BAGEL_QDP_LDFLAGS="`${BAGEL_QDP_CONFIG} --ldflags`"
 
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-  # 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 { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } \
-         && 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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-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_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-
-    pac_HDF5_CFLAGS="${HDF5_CFLAGS}"
-    pac_HDF5_CXXFLAGS="${HDF5_CXXFLAGS}"
-    pac_HDF5_LIBS="${HDF5_LIBS}"
-
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    pac_saved_CFLAGS="$CFLAGS"
-    pac_saved_CXXFLAGS="$CXXFLAGS"
-    pac_saved_LDFLAGS="$LDFLAGS"
-    pac_saved_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $pac_HDF5_CFLAGS"
-    CXXFLAGS="$CXXFLAGS $pac_HDF5_CXXFLAGS"
-    LDFLAGS="$LDFLAGS $pac_HDF5_LDFLAGS"
-    LIBS="$LIBS $pac_HDF5_LIBS"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-        #include <hdf5.h>
-
-int
-main ()
-{
-
-        int argc ; char **argv ;
-                hid_t prod_id, file_id;
-                prod_id = H5Pcreate(H5P_FILE_ACCESS);
-                file_id = H5Fcreate("test.hd5", H5F_ACC_TRUNC, H5P_DEFAULT, prod_id);
-                H5Pclose(prod_id);
-                H5Fclose(file_id);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  pac_hdf5_working=yes
-else
-  pac_hdf5_working=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-    if test "X${pac_hdf5_working}X" = "XyesX" ; then
-       hdf5_link_ok=yes
-    else
-       hdf5_link_ok=no
-
-    fi
-
-
-  if test "X${hdf5_link_ok}X" = "XyesX" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    as_fn_error $? "Cannot compile/link a program with hdf5.
-    Use --with-hdf5=<dir> to select a working version." "$LINENO" 5
-  fi
-fi
-
-
-# Check whether --with-bagel-qdp was given.
-if test "${with_bagel_qdp+set}" = set; then :
-  withval=$with_bagel_qdp; BAGEL_QDP_DIR=${with_bagel_qdp}
-   BAGEL_QDP_ENABLED="yes"
-else
-  BAGEL_QDP_DIR=""
-   BAGEL_QDP_ENABLED="no"
-
-fi
-
-
-if test "X${BAGEL_QDP_ENABLED}X" = "XyesX";
-then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: Using BAGEL QDP" >&5
-$as_echo "$as_me: Using BAGEL QDP" >&6;}
-
-$as_echo "#define QDP_USE_BAGEL_QDP 1" >>confdefs.h
-
-          if test "X${BAGEL_QDP_DIR}X" = "XX" ;
-     then
-       # Extract the first word of "bagel-qdp-config", so it can be a program name with args.
-set dummy bagel-qdp-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BAGEL_QDP_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BAGEL_QDP_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BAGEL_QDP_CONFIG="$BAGEL_QDP_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BAGEL_QDP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BAGEL_QDP_CONFIG=$ac_cv_path_BAGEL_QDP_CONFIG
-if test -n "$BAGEL_QDP_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BAGEL_QDP_CONFIG" >&5
-$as_echo "$BAGEL_QDP_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-     else
-       # Extract the first word of "bagel-qdp-config", so it can be a program name with args.
-set dummy bagel-qdp-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BAGEL_QDP_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $BAGEL_QDP_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_BAGEL_QDP_CONFIG="$BAGEL_QDP_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${BAGEL_QDP_DIR}/bin:${PATH}"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BAGEL_QDP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-BAGEL_QDP_CONFIG=$ac_cv_path_BAGEL_QDP_CONFIG
-if test -n "$BAGEL_QDP_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BAGEL_QDP_CONFIG" >&5
-$as_echo "$BAGEL_QDP_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-     fi
-
-     if test "X${BAGEL_QDP_CONFIG}X" = "XX";
-     then
-       as_fn_error $? "bagel-qdp-config not found" "$LINENO" 5
-     fi
-     { $as_echo "$as_me:${as_lineno-$LINENO}: Found bagel_qdp configuration program ${BAGEL_QDP_CONFIG}" >&5
-$as_echo "$as_me: Found bagel_qdp configuration program ${BAGEL_QDP_CONFIG}" >&6;}
-     BAGEL_QDP_CXXFLAGS="`${BAGEL_QDP_CONFIG} --cxxflags`"
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: bagel_qdp compile flags: ${BAGEL_QDP_CXXFLAGS}" >&5
-$as_echo "$as_me: bagel_qdp compile flags: ${BAGEL_QDP_CXXFLAGS}" >&6;}
-     BAGEL_QDP_LDFLAGS="`${BAGEL_QDP_CONFIG} --ldflags`"
-
-     { $as_echo "$as_me:${as_lineno-$LINENO}: bagel_qdp link flags : ${BAGEL_QDP_LDFLAGS}" >&5
-$as_echo "$as_me: bagel_qdp link flags : ${BAGEL_QDP_LDFLAGS}" >&6;}
-     BAGEL_QDP_LIBS="`${BAGEL_QDP_CONFIG} --libs`"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: bagel_qdp link flags : ${BAGEL_QDP_LDFLAGS}" >&5
+$as_echo "$as_me: bagel_qdp link flags : ${BAGEL_QDP_LDFLAGS}" >&6;}
+     BAGEL_QDP_LIBS="`${BAGEL_QDP_CONFIG} --libs`"
 
      { $as_echo "$as_me:${as_lineno-$LINENO}: bagel_qdp libraries flags: ${BAGEL_QDP_LIBS}" >&5
 $as_echo "$as_me: bagel_qdp libraries flags: ${BAGEL_QDP_LIBS}" >&6;}
@@ -5648,7 +4760,6 @@ $as_echo_n "checking if we can compile/link a simple bagel_qdp program... " >&6;
     pac_BAGEL_QDP_CFLAGS="${BAGEL_QDP_CXXFLAGS}"
     pac_BAGEL_QDP_LDFLAGS="${BAGEL_QDP_LDFLAGS}"
     pac_BAGEL_QDP_LIBS="${BAGEL_QDP_LIBS}"
-
     ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6376,10 +5487,6 @@ if test -z "${BUILD_LIBINTRIN_TRUE}" && test -z "${BUILD_LIBINTRIN_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_LIBINTRIN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${BUILD_FILEDB_TRUE}" && test -z "${BUILD_FILEDB_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_FILEDB\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index 170cc24d4..9f0e5e310 100755
--- a/configure.ac
+++ b/configure.ac
@@ -498,9 +498,11 @@ if test "X${ac_build_hdf5}X" = "XnoX"; then
   AC_MSG_NOTICE([Disabling HDF5])
   AC_SUBST(HDF5_CFLAGS, "")
   AC_SUBST(HDF5_CXXFLAGS, "")
+  AC_SUBST(HDF5_LDFLAGS,"")
   AC_SUBST(HDF5_LIBS,"")
    
 else
+  AC_DEFINE_UNQUOTED(QDP_USE_HDF5, [1], [Enable HDF5 support])
   if test "X${HDF5_HOME}X" = "XX" ; then
     AC_PATH_PROG(HDF5_BIN, [h5dump], [])
   else
@@ -512,32 +514,33 @@ else
   AC_MSG_NOTICE([Found hdf5 utility ${HDF5_BIN}])
   AC_SUBST(HDF5_CFLAGS, "-I${HDF5_HOME}/include")
   AC_SUBST(HDF5_CXXFLAGS, "-I${HDF5_HOME}/include")
-  AC_MSG_NOTICE([hdf5 compile flags: ${HDF5_CFLAGS}])
-  AC_MSG_NOTICE([hdf5 compile flags: ${HDF5_CXXFLAGS}])
-  AC_SUBST(HDF5_LIBS,     "-L${HDF5_HOME}/lib -lhdf5 -lz -lm")
-  AC_MSG_NOTICE([hdf5 libraries flags: ${HDF5_LIBS}])
-  AC_DEFINE_UNQUOTED(QDP_USE_HDF5, [1], [Enable HDF5 support])
+  AC_MSG_NOTICE([hdf5 c-compile flags: ${HDF5_CFLAGS}])
+  AC_MSG_NOTICE([hdf5 c++-compile flags: ${HDF5_CXXFLAGS}])
+  AC_SUBST(HDF5_LDFLAGS,     "-L${HDF5_HOME}/lib")
+  AC_MSG_NOTICE([hdf5 ldflags: ${HDF5_LDFLAGS}])
+  AC_SUBST(HDF5_LIBS,     "-lhdf5 -lz -lm")
+  AC_MSG_NOTICE([hdf5 libraries: ${HDF5_LIBS}])
   AC_SUBST(CONFIG_HDF5,[1])
   AC_MSG_NOTICE([Configuring QDP++ with HDF5 enabled]);
   dnl This function is defined in acinclude.m4
   dnl it tries to try to compile the program 
-  AC_MSG_CHECKING([if we can compile/link a simple hdf5 program])
-  PAC_HDF5_LINK_C_FUNC(
-  ${HDF5_CFLAGS},
-  ${HDF5_CXXFLAGS},
-  ${HDF5_LIBS},
-  ,
-  ,
-  [hdf5_link_ok=yes],
-  [hdf5_link_ok=no]
-  )
-  if test "X${hdf5_link_ok}X" = "XyesX" ; then 
-    AC_MSG_RESULT(yes)
-  else 
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR([Cannot compile/link a program with hdf5.
-    Use --with-hdf5=<dir> to select a working version.])
-  fi 
+  dnl AC_MSG_CHECKING([if we can compile/link a simple hdf5 program])
+  dnl   PAC_HDF5_LINK_C_FUNC(
+  dnl   ${HDF5_CFLAGS},
+  dnl   ${HDF5_CXXFLAGS},
+  dnl   ${HDF5_LIBS},
+  dnl   ,
+  dnl   ,
+  dnl   [hdf5_link_ok=yes],
+  dnl   [hdf5_link_ok=no]
+  dnl  )
+  dnl  if test "X${hdf5_link_ok}X" = "XyesX" ; then 
+  dnl     AC_MSG_RESULT(yes)
+  dnl  else 
+  dnl     AC_MSG_RESULT(no)
+  dnl     AC_MSG_ERROR([Cannot compile/link a program with hdf5.
+  dnl     Use --with-hdf5=<dir> to select a working version.])
+  dnl  fi 
 fi
 
 dnl bagel support
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 775d63d24..234d0d37c 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,7 +9,7 @@ AM_CXXFLAGS = -I@top_srcdir@/include -I@top_builddir@/include \
               -I@top_srcdir@/other_libs/qio/other_libs/c-lime/include \
               -I@top_builddir@/other_libs/qio/other_libs/c-lime/include \
               -I@top_srcdir@/other_libs/xpath_reader/include \
-              @BAGEL_QDP_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@ @QMT_CXXFLAGS@
+              @BAGEL_QDP_CXXFLAGS@ @HDF5_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@ @QMT_CXXFLAGS@
 
 if BUILD_LIBINTRIN
 AM_CXXFLAGS += -I@top_srcdir@/other_libs/@LIBINTRIN_DIR@/include \
@@ -28,7 +28,7 @@ AM_LDFLAGS += -L@top_builddir@/other_libs/qio/lib \
              -L@top_builddir@/other_libs/qio/other_libs/c-lime/lib \
              -L@top_builddir@/other_libs/xpath_reader/lib
 endif
-AM_LDFLAGS += @LDFLAGS@ @BAGEL_QDP_LDFLAGS@ @QMP_LDFLAGS@ @QMT_LDFLAGS@
+AM_LDFLAGS += @LDFLAGS@ @BAGEL_QDP_LDFLAGS@ @HDF5_LDFLAGS@ @QMP_LDFLAGS@ @QMT_LDFLAGS@
 
 if BUILD_LIBINTRIN
 AM_LDFLAGS += -L@top_builddir@/other_libs/libintrin/lib
@@ -42,7 +42,7 @@ endif
 LDADD = -lqdp
 
 if QDP_USE_HDF5
-LDADD += -lhdf5
+LDADD += @HDF5_LIBS@
 endif
 
 if QDP_USE_LIBXML2
diff --git a/examples/Makefile.in b/examples/Makefile.in
index cb248ce38..f6216ceba 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -89,7 +89,7 @@ POST_UNINSTALL = :
 @BUILD_FILEDB_TRUE@am__append_5 = -L@top_builddir@/other_libs/filedb/src \
 @BUILD_FILEDB_TRUE@              -L@top_builddir@/other_libs/filedb/filehash
 
-@QDP_USE_HDF5_TRUE@am__append_6 = -lhdf5
+@QDP_USE_HDF5_TRUE@am__append_6 = @HDF5_LIBS@
 @QDP_USE_LIBXML2_TRUE@am__append_7 = -lXPathReader -lxmlWriter -lqio -llime
 @BUILD_LIBINTRIN_TRUE@am__append_8 = -lintrin
 @BUILD_FILEDB_TRUE@am__append_9 = -lfiledb -lfilehash
@@ -432,9 +432,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@
@@ -465,6 +462,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@
@@ -509,7 +507,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@
@@ -559,10 +556,10 @@ AM_CXXFLAGS = -I@top_srcdir@/include -I@top_builddir@/include \
 	-I@top_srcdir@/other_libs/qio/other_libs/c-lime/include \
 	-I@top_builddir@/other_libs/qio/other_libs/c-lime/include \
 	-I@top_srcdir@/other_libs/xpath_reader/include \
-	@BAGEL_QDP_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@ \
-	@QMT_CXXFLAGS@ $(am__append_1) $(am__append_2)
+	@BAGEL_QDP_CXXFLAGS@ @HDF5_CXXFLAGS@ @LIBXML2_CXXFLAGS@ \
+	@QMP_CFLAGS@ @QMT_CXXFLAGS@ $(am__append_1) $(am__append_2)
 AM_LDFLAGS = -L@top_builddir@/lib $(am__append_3) @LDFLAGS@ \
-	@BAGEL_QDP_LDFLAGS@ @QMP_LDFLAGS@ @QMT_LDFLAGS@ \
+	@BAGEL_QDP_LDFLAGS@ @HDF5_LDFLAGS@ @QMP_LDFLAGS@ @QMT_LDFLAGS@ \
 	$(am__append_4) $(am__append_5)
 LDADD = -lqdp $(am__append_6) $(am__append_7) @BAGEL_QDP_LIBS@ \
 	@LIBXML2_LIBS@ @QMP_LIBS@ @QMT_LIBS@ @LIBS@ $(am__append_8) \
diff --git a/include/Makefile.in b/include/Makefile.in
index b6e595ace..060bca6f0 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -171,9 +171,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@
@@ -204,6 +201,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@
@@ -248,7 +246,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@
diff --git a/include/qdp_config_internal.h.in b/include/qdp_config_internal.h.in
index 5b42adc50..f2d5baa27 100644
--- a/include/qdp_config_internal.h.in
+++ b/include/qdp_config_internal.h.in
@@ -66,12 +66,6 @@
 /* Number of dimensions */
 #undef QDP_ND
 
-/* Dont use HDF5 */
-#undef QDP_USE_HDF5
-
-/* Dont use LIBXML2 */
-#undef QDP_USE_LIBXML2
-
 /* Number of spin components */
 #undef QDP_NS
 
@@ -102,6 +96,9 @@
 /* Use lexicographic layout */
 #undef QDP_USE_LEXICO_LAYOUT
 
+/* Enable LIBXML2 support */
+#undef QDP_USE_LIBXML2
+
 /* Use OpenMP Threads */
 #undef QDP_USE_OMP_THREADS
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9f27e812c..39ad267e8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,7 +14,7 @@ if BUILD_LIBINTRIN
 INCFLAGS += -I@top_srcdir@/other_libs/@LIBINTRIN_DIR@/include -I@top_builddir@/other_libs/@LIBINTRIN_DIR@/include
 endif
 
-AM_CXXFLAGS = $(INCFLAGS) @BAGEL_QDP_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@  @QMT_CXXFLAGS@
+AM_CXXFLAGS = $(INCFLAGS) @BAGEL_QDP_CXXFLAGS@ @HDF5_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@  @QMT_CXXFLAGS@
 
 lib_LIBRARIES = libqdp.a
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 85bfaf15e..526b294e6 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -334,9 +334,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@
@@ -367,6 +364,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@
@@ -411,7 +409,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@
@@ -457,7 +454,7 @@ INCFLAGS = -I@top_srcdir@/include -I@top_builddir@/include \
 	-I@top_srcdir@/other_libs/qio/other_libs/c-lime/include \
 	-I@top_builddir@/other_libs/qio/other_libs/c-lime/include \
 	$(am__append_1) $(am__append_2)
-AM_CXXFLAGS = $(INCFLAGS) @BAGEL_QDP_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@  @QMT_CXXFLAGS@
+AM_CXXFLAGS = $(INCFLAGS) @BAGEL_QDP_CXXFLAGS@ @HDF5_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@  @QMT_CXXFLAGS@
 lib_LIBRARIES = libqdp.a
 libqdp_a_SOURCES = qdp_map.cc qdp_subset.cc qdp_random.cc \
 	qdp_layout.cc qdp_io.cc qdp_byteorder.cc qdp_util.cc \
diff --git a/other_libs/Makefile.in b/other_libs/Makefile.in
index c05a4936f..c36030787 100644
--- a/other_libs/Makefile.in
+++ b/other_libs/Makefile.in
@@ -182,9 +182,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@
@@ -215,6 +212,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@
@@ -259,7 +257,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@
diff --git a/qdp++-config.in b/qdp++-config.in
index 2a69cab33..4240f7a28 100644
--- a/qdp++-config.in
+++ b/qdp++-config.in
@@ -24,9 +24,9 @@ parallel_arch="@CONFIG_PARALLEL_ARCH@"
 
 qmp_home="@QMP_HOME@"
 qdp_cxx="@CXX@"
-qdp_cxxflags="@CXXFLAGS@ -I@includedir@ @BAGEL_QDP_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@ @QMT_CXXFLAGS@"
-qdp_ldflags="@LDFLAGS@ -L@libdir@ @BAGEL_QDP_LDFLAGS@ @QMP_LDFLAGS@ @QMT_LDFLAGS@"
-qdp_libs="-lqdp -lXPathReader -lxmlWriter -lqio -llime @BAGEL_QDP_LIBS@ @LIBXML2_LIBS@ @QMP_LIBS@ @LIBS@ @QMT_LIBS@"
+qdp_cxxflags="@CXXFLAGS@ -I@includedir@ @BAGEL_QDP_CXXFLAGS@ @HDF5_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@ @QMT_CXXFLAGS@"
+qdp_ldflags="@LDFLAGS@ -L@libdir@ @BAGEL_QDP_LDFLAGS@ @HDF5_LDFLAGS@ @QMP_LDFLAGS@ @QMT_LDFLAGS@"
+qdp_libs="-lqdp -lXPathReader -lxmlWriter -lqio -llime @BAGEL_QDP_LIBS@ @HDF5_LIBS@ @LIBXML2_LIBS@ @QMP_LIBS@ @LIBS@ @QMT_LIBS@"
 
 libintrin_dir=@LIBINTRIN_DIR@
 case ${libintrin_dir} in
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7879694a4..638e9ea8d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,7 +9,7 @@ AM_CXXFLAGS = -I@top_srcdir@/include -I@top_builddir@/include \
               -I@top_srcdir@/other_libs/qio/other_libs/c-lime/include \
               -I@top_builddir@/other_libs/qio/other_libs/c-lime/include \
               -I@top_srcdir@/other_libs/xpath_reader/include \
-              @BAGEL_QDP_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@ @QMT_CXXFLAGS@
+              @BAGEL_QDP_CXXFLAGS@ @HDF5_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@ @QMT_CXXFLAGS@
 
 if BUILD_LIBINTRIN
 AM_CXXFLAGS += -I@top_srcdir@/other_libs/@LIBINTRIN_DIR@/include
@@ -21,13 +21,13 @@ AM_LDFLAGS = -L@top_builddir@/lib \
              -L@top_builddir@/other_libs/qio/lib \
              -L@top_builddir@/other_libs/qio/other_libs/c-lime/lib \
              -L@top_builddir@/other_libs/xpath_reader/lib \
-             @LDFLAGS@ @BAGEL_QDP_LDFLAGS@ @QMP_LDFLAGS@ @QMT_LDFLAGS@
+             @LDFLAGS@ @BAGEL_QDP_LDFLAGS@ @HDF5_LDFLAGS@ @QMP_LDFLAGS@ @QMT_LDFLAGS@
 
 if BUILD_LIBINTRIN
 AM_LDFLAGS += -L@top_builddir@/other_libs/libintrin/lib
 endif
 
-LDADD = -lqdp -lXPathReader -lxmlWriter -lqio -llime @BAGEL_QDP_LIBS@ @LIBXML2_LIBS@ @QMP_LIBS@ @QMT_LIBS@ @LIBS@
+LDADD = -lqdp -lXPathReader -lxmlWriter -lqio -llime @BAGEL_QDP_LIBS@ @HDF5_LIBS@ @LIBXML2_LIBS@ @QMP_LIBS@ @QMT_LIBS@ @LIBS@
 
 if BUILD_LIBINTRIN
 LDADD += -lintrin
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9e9790c60..6b56bec66 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -214,9 +214,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@
@@ -247,6 +244,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@
@@ -291,7 +289,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@
@@ -341,15 +338,16 @@ AM_CXXFLAGS = -I@top_srcdir@/include -I@top_builddir@/include \
 	-I@top_srcdir@/other_libs/qio/other_libs/c-lime/include \
 	-I@top_builddir@/other_libs/qio/other_libs/c-lime/include \
 	-I@top_srcdir@/other_libs/xpath_reader/include \
-	@BAGEL_QDP_CXXFLAGS@ @LIBXML2_CXXFLAGS@ @QMP_CFLAGS@ \
-	@QMT_CXXFLAGS@ $(am__append_1)
+	@BAGEL_QDP_CXXFLAGS@ @HDF5_CXXFLAGS@ @LIBXML2_CXXFLAGS@ \
+	@QMP_CFLAGS@ @QMT_CXXFLAGS@ $(am__append_1)
 AM_LDFLAGS = -L@top_builddir@/lib -L@top_builddir@/other_libs/qio/lib \
 	-L@top_builddir@/other_libs/qio/other_libs/c-lime/lib \
 	-L@top_builddir@/other_libs/xpath_reader/lib @LDFLAGS@ \
-	@BAGEL_QDP_LDFLAGS@ @QMP_LDFLAGS@ @QMT_LDFLAGS@ \
+	@BAGEL_QDP_LDFLAGS@ @HDF5_LDFLAGS@ @QMP_LDFLAGS@ @QMT_LDFLAGS@ \
 	$(am__append_2)
 LDADD = -lqdp -lXPathReader -lxmlWriter -lqio -llime @BAGEL_QDP_LIBS@ \
-	@LIBXML2_LIBS@ @QMP_LIBS@ @QMT_LIBS@ @LIBS@ $(am__append_3)
+	@HDF5_LIBS@ @LIBXML2_LIBS@ @QMP_LIBS@ @QMT_LIBS@ @LIBS@ \
+	$(am__append_3)
 
 # The program and its dependencies
 test_HDRS = unittest.h \