jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop'

Browse source 
Github issue #1805 and pull request #1807

* develop:
  Replace `-isystem` compile flag with `-I`
This commit is contained in:
William S Fulton 2020-06-07 14:05:10 +01:00
commit db3774ac8d
1 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
configure.ac
View file

@ -115,15 +115,6 @@ dnl Some test cases require Boost
AX_BOOST_BASE(,,,) AX_BOOST_BASE(,,,)
AC_SUBST(BOOST_CPPFLAGS) AC_SUBST(BOOST_CPPFLAGS)
dnl How to specify include directories that may be system directories.
# -I should not be used on system directories (GCC)
if test "$GCC" = yes; then
ISYSTEM="-isystem "
else
ISYSTEM="-I"
fi
AC_MSG_NOTICE(ISYSTEM: $ISYSTEM)
dnl Info for building shared libraries ... in order to run the examples dnl Info for building shared libraries ... in order to run the examples
# SO is the extension of shared libraries (including the dot!) # SO is the extension of shared libraries (including the dot!)
@ -484,7 +475,7 @@ AC_ARG_WITH(tcl,
[ --with-tcl=path Set location of Tcl package],[ [ --with-tcl=path Set location of Tcl package],[
TCLPACKAGE="$withval"], [TCLPACKAGE="$alllang_default"]) TCLPACKAGE="$withval"], [TCLPACKAGE="$alllang_default"])
AC_ARG_WITH(tclincl,[ --with-tclincl=path Set location of Tcl include directory],[ AC_ARG_WITH(tclincl,[ --with-tclincl=path Set location of Tcl include directory],[
TCLINCLUDE="$ISYSTEM$withval"], [TCLINCLUDE=]) TCLINCLUDE="-I$withval"], [TCLINCLUDE=])
AC_ARG_WITH(tcllib,[ --with-tcllib=path Set location of Tcl library directory],[ AC_ARG_WITH(tcllib,[ --with-tcllib=path Set location of Tcl library directory],[
TCLLIB="-L$withval"], [TCLLIB=]) TCLLIB="-L$withval"], [TCLLIB=])
@ -526,7 +517,7 @@ else
AC_MSG_RESULT(found $TCLCONFIG/tclConfig.sh) AC_MSG_RESULT(found $TCLCONFIG/tclConfig.sh)
. $TCLCONFIG/tclConfig.sh . $TCLCONFIG/tclConfig.sh
if test -z "$TCLINCLUDE"; then if test -z "$TCLINCLUDE"; then
TCLINCLUDE=`echo $TCL_INCLUDE_SPEC | sed "s/-I/$ISYSTEM/"` TCLINCLUDE=`echo $TCL_INCLUDE_SPEC`
fi fi
if test -z "$TCLLIB"; then if test -z "$TCLLIB"; then
TCLLIB=$TCL_LIB_SPEC TCLLIB=$TCL_LIB_SPEC
@ -535,7 +526,7 @@ fi
if test -z "$TCLINCLUDE"; then if test -z "$TCLINCLUDE"; then
if test "x$TCLPACKAGE" != xyes; then if test "x$TCLPACKAGE" != xyes; then
TCLINCLUDE="$ISYSTEM$TCLPACKAGE/include" TCLINCLUDE="-I$TCLPACKAGE/include"
fi fi
fi fi
@ -553,7 +544,7 @@ if test -z "$TCLINCLUDE"; then
for i in $dirs ; do for i in $dirs ; do
if test -r $i/tcl.h; then if test -r $i/tcl.h; then
AC_MSG_RESULT($i) AC_MSG_RESULT($i)
TCLINCLUDE="$ISYSTEM$i" TCLINCLUDE="-I$i"
break break
fi fi
done done
@ -1004,7 +995,7 @@ if test -n "$PERL"; then
AC_MSG_RESULT($PERL5LIB) AC_MSG_RESULT($PERL5LIB)
fi fi
AC_MSG_CHECKING(for Perl5 ccflags) AC_MSG_CHECKING(for Perl5 ccflags)
PERL5CCFLAGS=`($PERL -e 'use Config; print $Config{ccflags}, "\n"' | sed "s/-Wdeclaration-after-statement//" | sed "s/-I/$ISYSTEM/") 2>/dev/null` PERL5CCFLAGS=`($PERL -e 'use Config; print $Config{ccflags}, "\n"' | sed "s/-Wdeclaration-after-statement//") 2>/dev/null`
if test -z "$PERL5CCFLAGS" ; then if test -z "$PERL5CCFLAGS" ; then
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
else else
@ -2326,7 +2317,7 @@ if test "$LUABIN"; then
# look for the header files & set LUAFLAGS accordingly # look for the header files & set LUAFLAGS accordingly
# will clear LUABIN if not present # will clear LUABIN if not present
if test -n "$LUAINCLUDE"; then if test -n "$LUAINCLUDE"; then
AC_CHECK_FILE($LUAINCLUDE/lua.h,[LUAFLAGS="$ISYSTEM$LUAINCLUDE"],[LUABIN=]) AC_CHECK_FILE($LUAINCLUDE/lua.h,[LUAFLAGS="-I$LUAINCLUDE"],[LUABIN=])
else else
LUA_OK="1" LUA_OK="1"
CFLAGS_SAVED=$CFLAGS CFLAGS_SAVED=$CFLAGS
@ -2350,7 +2341,7 @@ if test "$LUABIN"; then
#echo "$i" #echo "$i"
if test -r $i/lua.h; then if test -r $i/lua.h; then
AC_MSG_RESULT($i/lua.h) AC_MSG_RESULT($i/lua.h)
LUAFLAGS="$ISYSTEM$i" LUAFLAGS="-I$i"
break break
fi fi
done done