Download as
Browse Code »

Commit 0c46e059e3865981ab07f580f7eb079e3b6397c4

Authored by Perry Werneck
1 parent 5427a4aa
Exists in master and in 1 other branch develop

Fixing C++ flags on SLE-12.

Showing 2 changed files with 24 additions and 1 deletions   Show diff stats
client/Makefile.in
  Diff comments   View file @0c46e05
... ... @@ -95,7 +95,7 @@ DEPENDS= \
95 95 $(BASEDIR)/client/src/include/lib3270/ipc/*.h \
96 96  
97 97 CFLAGS= \
98   - @CFLAGS@ \
  98 + @CXXFLAGS@ \
99 99 -I$(BASEDIR)/common/src/include \
100 100 -Isrc/include \
101 101 -DBUILD_DATE=`date +%Y%m%d` \
... ...
configure.ac
  Diff comments   View file @0c46e05
... ... @@ -102,6 +102,7 @@ case "$host" in
102 102  
103 103 *)
104 104 CFLAGS="$CFLAGS -pthread"
  105 + CXXFLAGS="$CXXFLAGS -pthread"
105 106 LDFLAGS="$LDFLAGS -pthread"
106 107 app_cv_datadir="/usr/share"
107 108 app_cv_confdir="/etc"
... ... @@ -388,6 +389,28 @@ if test "$app_cv_pic" == "yes"; then
388 389 fi
389 390  
390 391 dnl ---------------------------------------------------------------------------
  392 +dnl Check for C++ 2011 support
  393 +dnl ---------------------------------------------------------------------------
  394 +AC_DEFUN([AX_CHECK_COMPILE_FLAG],
  395 +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
  396 +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
  397 +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
  398 + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
  399 + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
  400 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
  401 + [AS_VAR_SET(CACHEVAR,[yes])],
  402 + [AS_VAR_SET(CACHEVAR,[no])])
  403 + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
  404 +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
  405 + [m4_default([$2], :)],
  406 + [m4_default([$3], :)])
  407 +AS_VAR_POPDEF([CACHEVAR])dnl
  408 +])dnl AX_CHECK_COMPILE_FLAGS
  409 +
  410 +AX_CHECK_COMPILE_FLAG([-std=gnu++11], [CXXFLAGS="$CXXFLAGS -std=gnu++11"])
  411 +
  412 +
  413 +dnl ---------------------------------------------------------------------------
391 414 dnl Configure which files to generate.
392 415 dnl ---------------------------------------------------------------------------
393 416  
... ...