diff --git a/configure.ac b/configure.ac
index 20c95e3..4868ffa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,6 +317,27 @@ if test $app_cv_fvisibility_ok = yes; then
 fi
 
 dnl ---------------------------------------------------------------------------
+dnl Check for C++ 2011 support
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
+
+AX_CHECK_COMPILE_FLAG([-std=c++11], [CPPFLAGS="$CPPFLAGS -std=c++11"])
+
+dnl ---------------------------------------------------------------------------
 dnl SSL Security options
 dnl ---------------------------------------------------------------------------
 
@@ -372,7 +393,6 @@ AC_ARG_ENABLE([pic],
 
 if test "$app_cv_pic" == "yes"; then
 	CFLAGS="$CFLAGS -fPIC"
-	CXXFLAGS="$CXXFLAGS -fPIC"
 fi
 
 dnl ---------------------------------------------------------------------------
diff --git a/src/lib3270++/Makefile.in b/src/lib3270++/Makefile.in
index a82ba2d..c3435e3 100644
--- a/src/lib3270++/Makefile.in
+++ b/src/lib3270++/Makefile.in
@@ -90,6 +90,7 @@ DEPENDS= \
 
 CFLAGS= \
 	@CFLAGS@ \
+	@CPPFLAGS@ \
 	-g \
 	-I../include \
 	-DBUILD_DATE=`date +%Y%m%d` \
--
libgit2 0.21.2