diff --git a/configure b/configure
index 9460eda..143796b 100755
--- a/configure
+++ b/configure
@@ -14323,12 +14323,13 @@ fi
 
 done
 
-for ac_header in libunwind.h
+for ac_header in libunwind.h quadmath.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "libunwind.h" "ac_cv_header_libunwind_h" "$ac_includes_default"
-if test "x$ac_cv_header_libunwind_h" = xyes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUNWIND_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
diff --git a/configure.ac b/configure.ac
index 45de9bb..1cd70d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,7 @@ AC_CHECK_HEADERS([stddef.h wchar.h wctype.h errno.h signal.h fcntl.h dirent.h])
 AC_CHECK_HEADERS([time.h sys/time.h utime.h spawn.h execinfo.h ucontext.h])
 AC_CHECK_HEADERS([dlfcn.h ltdl.h sys/mman.h sys/uio.h])
 AC_CHECK_HEADERS([sys/devpoll.h sys/epoll.h poll.h])
-AC_CHECK_HEADERS([libunwind.h])
+AC_CHECK_HEADERS([libunwind.h quadmath.h])
 
 dnl check data types
 dnl AC_CHECK_TYPE([wchar_t], 
diff --git a/lib/hcl-cfg.h.in b/lib/hcl-cfg.h.in
index e93d9f8..b2998c2 100644
--- a/lib/hcl-cfg.h.in
+++ b/lib/hcl-cfg.h.in
@@ -123,6 +123,9 @@
 /* Have PTHREAD_PRIO_INHERIT. */
 #undef HAVE_PTHREAD_PRIO_INHERIT
 
+/* Define to 1 if you have the <quadmath.h> header file. */
+#undef HAVE_QUADMATH_H
+
 /* Define to 1 if you have the `quadmath_snprintf' function. */
 #undef HAVE_QUADMATH_SNPRINTF