Fixing lib3270++ build error.

Perry Werneck
1 parent 3cd3103a
Showing 2 changed files with 22 additions and 1 deletions Show diff stats
configure.ac
src/lib3270++/Makefile.in
@@ -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 ---------------------------------------------------------------------------
@@ -90,6 +90,7 @@ DEPENDS= \
  
 CFLAGS= \
 	@CFLAGS@ \
+	@CPPFLAGS@ \
 	-g \
 	-I../include \
 	-DBUILD_DATE=`date +%Y%m%d` \
...	...	@@ -317,6 +317,27 @@ if test $app_cv_fvisibility_ok = yes; then
317	317	fi
318	318
319	319	dnl ---------------------------------------------------------------------------
	320	+dnl Check for C++ 2011 support
	321	+dnl ---------------------------------------------------------------------------
	322	+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
	323	+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
	324	+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
	325	+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
	326	+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
	327	+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
	328	+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
	329	+ [AS_VAR_SET(CACHEVAR,[yes])],
	330	+ [AS_VAR_SET(CACHEVAR,[no])])
	331	+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
	332	+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
	333	+ [m4_default([$2], :)],
	334	+ [m4_default([$3], :)])
	335	+AS_VAR_POPDEF([CACHEVAR])dnl
	336	+])dnl AX_CHECK_COMPILE_FLAGS
	337	+
	338	+AX_CHECK_COMPILE_FLAG([-std=c++11], [CPPFLAGS="$CPPFLAGS -std=c++11"])
	339	+
	340	+dnl ---------------------------------------------------------------------------
320	341	dnl SSL Security options
321	342	dnl ---------------------------------------------------------------------------
322	343
...	...	@@ -372,7 +393,6 @@ AC_ARG_ENABLE([pic],
372	393
373	394	if test "$app_cv_pic" == "yes"; then
374	395	CFLAGS="$CFLAGS -fPIC"
375		- CXXFLAGS="$CXXFLAGS -fPIC"
376	396	fi
377	397
378	398	dnl ---------------------------------------------------------------------------
...	...
...	...	@@ -90,6 +90,7 @@ DEPENDS= \
90	90
91	91	CFLAGS= \
92	92	@CFLAGS@ \
	93	+ @CPPFLAGS@ \
93	94	-g \
94	95	-I../include \
95	96	-DBUILD_DATE=`date +%Y%m%d` \
...	...