Skip to content

Commit db3774a

Browse files
committed
Merge branch 'develop'
Github issue swig#1805 and pull request swig#1807 * develop: Replace `-isystem` compile flag with `-I`
2 parents a709988 + 9da2e4f commit db3774a

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

configure.ac

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,6 @@ dnl Some test cases require Boost
115115
AX_BOOST_BASE(,,,)
116116
AC_SUBST(BOOST_CPPFLAGS)
117117

118-
dnl How to specify include directories that may be system directories.
119-
# -I should not be used on system directories (GCC)
120-
if test "$GCC" = yes; then
121-
ISYSTEM="-isystem "
122-
else
123-
ISYSTEM="-I"
124-
fi
125-
AC_MSG_NOTICE(ISYSTEM: $ISYSTEM)
126-
127118
dnl Info for building shared libraries ... in order to run the examples
128119

129120
# SO is the extension of shared libraries (including the dot!)
@@ -484,7 +475,7 @@ AC_ARG_WITH(tcl,
484475
[ --with-tcl=path Set location of Tcl package],[
485476
TCLPACKAGE="$withval"], [TCLPACKAGE="$alllang_default"])
486477
AC_ARG_WITH(tclincl,[ --with-tclincl=path Set location of Tcl include directory],[
487-
TCLINCLUDE="$ISYSTEM$withval"], [TCLINCLUDE=])
478+
TCLINCLUDE="-I$withval"], [TCLINCLUDE=])
488479
AC_ARG_WITH(tcllib,[ --with-tcllib=path Set location of Tcl library directory],[
489480
TCLLIB="-L$withval"], [TCLLIB=])
490481

@@ -526,7 +517,7 @@ else
526517
AC_MSG_RESULT(found $TCLCONFIG/tclConfig.sh)
527518
. $TCLCONFIG/tclConfig.sh
528519
if test -z "$TCLINCLUDE"; then
529-
TCLINCLUDE=`echo $TCL_INCLUDE_SPEC | sed "s/-I/$ISYSTEM/"`
520+
TCLINCLUDE=`echo $TCL_INCLUDE_SPEC`
530521
fi
531522
if test -z "$TCLLIB"; then
532523
TCLLIB=$TCL_LIB_SPEC
@@ -535,7 +526,7 @@ fi
535526

536527
if test -z "$TCLINCLUDE"; then
537528
if test "x$TCLPACKAGE" != xyes; then
538-
TCLINCLUDE="$ISYSTEM$TCLPACKAGE/include"
529+
TCLINCLUDE="-I$TCLPACKAGE/include"
539530
fi
540531
fi
541532

@@ -553,7 +544,7 @@ if test -z "$TCLINCLUDE"; then
553544
for i in $dirs ; do
554545
if test -r $i/tcl.h; then
555546
AC_MSG_RESULT($i)
556-
TCLINCLUDE="$ISYSTEM$i"
547+
TCLINCLUDE="-I$i"
557548
break
558549
fi
559550
done
@@ -1004,7 +995,7 @@ if test -n "$PERL"; then
1004995
AC_MSG_RESULT($PERL5LIB)
1005996
fi
1006997
AC_MSG_CHECKING(for Perl5 ccflags)
1007-
PERL5CCFLAGS=`($PERL -e 'use Config; print $Config{ccflags}, "\n"' | sed "s/-Wdeclaration-after-statement//" | sed "s/-I/$ISYSTEM/") 2>/dev/null`
998+
PERL5CCFLAGS=`($PERL -e 'use Config; print $Config{ccflags}, "\n"' | sed "s/-Wdeclaration-after-statement//") 2>/dev/null`
1008999
if test -z "$PERL5CCFLAGS" ; then
10091000
AC_MSG_RESULT(not found)
10101001
else
@@ -2326,7 +2317,7 @@ if test "$LUABIN"; then
23262317
# look for the header files & set LUAFLAGS accordingly
23272318
# will clear LUABIN if not present
23282319
if test -n "$LUAINCLUDE"; then
2329-
AC_CHECK_FILE($LUAINCLUDE/lua.h,[LUAFLAGS="$ISYSTEM$LUAINCLUDE"],[LUABIN=])
2320+
AC_CHECK_FILE($LUAINCLUDE/lua.h,[LUAFLAGS="-I$LUAINCLUDE"],[LUABIN=])
23302321
else
23312322
LUA_OK="1"
23322323
CFLAGS_SAVED=$CFLAGS
@@ -2350,7 +2341,7 @@ if test "$LUABIN"; then
23502341
#echo "$i"
23512342
if test -r $i/lua.h; then
23522343
AC_MSG_RESULT($i/lua.h)
2353-
LUAFLAGS="$ISYSTEM$i"
2344+
LUAFLAGS="-I$i"
23542345
break
23552346
fi
23562347
done

0 commit comments

Comments
 (0)