summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorYu Jiung <jiung.yu@samsung.com>2016-11-09 11:24:14 +0900
committerYu Jiung <jiung.yu@samsung.com>2016-11-09 11:24:20 +0900
commit04b1a8c051547b221a3bdd74d68ab02df3e3f752 (patch)
tree68d564a70d38771969fc9f946fb16792e8d4f7f7 /aclocal.m4
parentf57d349bba373ddb713a249cb2866198346ae011 (diff)
parent8e609b5f488d486a9e066ed494218d966f489938 (diff)
downloadc-ares-04b1a8c051547b221a3bdd74d68ab02df3e3f752.tar.gz
c-ares-04b1a8c051547b221a3bdd74d68ab02df3e3f752.tar.bz2
c-ares-04b1a8c051547b221a3bdd74d68ab02df3e3f752.zip
Merge branch 'upstream' into tizen
Change-Id: If7b14a6bca2079b3cc58a0432a9eb05a41ea5ceb
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m41
1 files changed, 1 insertions, 0 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 5465c47..a35aab8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1187,6 +1187,7 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/ax_code_coverage.m4])
+m4_include([m4/ax_cxx_compile_stdcxx_11.m4])
m4_include([m4/cares-compilers.m4])
m4_include([m4/cares-confopts.m4])
m4_include([m4/cares-functions.m4])