Skip to content
Snippets Groups Projects
Commit 56ef3e29 authored by Yang Tse's avatar Yang Tse
Browse files

curl-compilers.m4: CURL_CONVERT_INCLUDE_TO_ISYSTEM adjustments:

Add CURL_CHECK_COMPILER as a requirement.

Ensure macro does nothing unless GNU_C or CLANG compiler is used.

This should allow usage of this macro in unforeseen placements.
parent 3dcc0df5
No related branches found
No related tags found
No related merge requests found
......@@ -423,35 +423,39 @@ dnl GNUC versions these warnings are not silenced.
AC_DEFUN([CURL_CONVERT_INCLUDE_TO_ISYSTEM], [
AC_REQUIRE([CURL_SHFUNC_SQUEEZE])dnl
tmp_has_include="no"
tmp_chg_FLAGS="$CFLAGS"
for word1 in $tmp_chg_FLAGS; do
case "$word1" in
-I*)
tmp_has_include="yes"
;;
esac
done
if test "$tmp_has_include" = "yes"; then
tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/^-I/ -isystem /g'`
tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/ -I/ -isystem /g'`
CFLAGS="$tmp_chg_FLAGS"
squeeze CFLAGS
fi
tmp_has_include="no"
tmp_chg_FLAGS="$CPPFLAGS"
for word1 in $tmp_chg_FLAGS; do
case "$word1" in
-I*)
tmp_has_include="yes"
;;
esac
done
if test "$tmp_has_include" = "yes"; then
tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/^-I/ -isystem /g'`
tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/ -I/ -isystem /g'`
CPPFLAGS="$tmp_chg_FLAGS"
squeeze CPPFLAGS
AC_REQUIRE([CURL_CHECK_COMPILER])dnl
if test "$compiler_id" = "GNU_C" ||
test "$compiler_id" = "CLANG"; then
tmp_has_include="no"
tmp_chg_FLAGS="$CFLAGS"
for word1 in $tmp_chg_FLAGS; do
case "$word1" in
-I*)
tmp_has_include="yes"
;;
esac
done
if test "$tmp_has_include" = "yes"; then
tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/^-I/ -isystem /g'`
tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/ -I/ -isystem /g'`
CFLAGS="$tmp_chg_FLAGS"
squeeze CFLAGS
fi
tmp_has_include="no"
tmp_chg_FLAGS="$CPPFLAGS"
for word1 in $tmp_chg_FLAGS; do
case "$word1" in
-I*)
tmp_has_include="yes"
;;
esac
done
if test "$tmp_has_include" = "yes"; then
tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/^-I/ -isystem /g'`
tmp_chg_FLAGS=`echo "$tmp_chg_FLAGS" | "$SED" 's/ -I/ -isystem /g'`
CPPFLAGS="$tmp_chg_FLAGS"
squeeze CPPFLAGS
fi
fi
])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment