debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

m4/compiler_flag_chk.m4: fix bug related to not testing the actual flag

Browse Source
This commit is contained in:
Jon Trulson
2021-12-09 15:48:20 -07:00
parent a9e028f7c6
commit b29bd77a2f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cde/m4/compiler_flag_chk.m4
View File

@@ -5,17 +5,17 @@ AC_DEFUN([CXX_FLAG_CHECK],
[dnl
AC_MSG_CHECKING([if $CXX supports $1])
AC_LANG_PUSH([C++])
ac_saved_cxxflags="$CXX_COMPILER_FLAGS"
CXX_COMPILER_FLAGS="-Werror $1"
ac_saved_cxxflags="$CXXFLAGS"
CXXFLAGS="-Werror $1"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
[cxx_flag_check=yes],
[cxx_flag_check=no]
)
AC_MSG_RESULT([$cxx_flag_check])
CXX_COMPILER_FLAGS="$ac_saved_cxxflags"
CXXFLAGS="$ac_saved_cxxflags"
if test "$cxx_flag_check" = yes
then
CXX_COMPILER_FLAGS="$CXX_COMPILER_FLAGS $1"
CXX_COMPILER_FLAGS="$1 $CXX_COMPILER_FLAGS "
fi
AC_LANG_POP([C++])
])
@@ -24,17 +24,17 @@ AC_DEFUN([C_FLAG_CHECK],
[dnl
AC_MSG_CHECKING([if $CC supports $1])
AC_LANG_PUSH([C])
ac_saved_ccflags="$C_COMPILER_FLAGS"
C_COMPILER_FLAGS="-Werror $1"
ac_saved_ccflags="$CFLAGS"
CFLAGS="-Werror $1"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
[cc_flag_check=yes],
[cc_flag_check=no]
)
AC_MSG_RESULT([$cc_flag_check])
C_COMPILER_FLAGS="$ac_saved_ccflags"
CFLAGS="$ac_saved_ccflags"
if test "$cc_flag_check" = yes
then
C_COMPILER_FLAGS="$C_COMPILER_FLAGS $1"
C_COMPILER_FLAGS="$1 $C_COMPILER_FLAGS "
fi
AC_LANG_POP([C])
])