@@ -396,14 +396,22 @@ AC_CHECK_HEADERS([$(my.define.header)],
396396. if (is_empty(my.symbol))
397397AX_JAVA_DEVEL
398398AC_SUBST([$(my.cname)_CPPFLAGS], [${JAVA_CPPFLAGS}])
399+ AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [$(substitute_system_include("JAVA_CPPFLAGS"))])
399400AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])
400401. else
401402AS_CASE([${$(my.symbol)}], [yes],
402403 [AX_JAVA_DEVEL
403404 AC_SUBST([$(my.cname)_CPPFLAGS], [${JAVA_CPPFLAGS}])
405+ AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [$(substitute_system_include("JAVA_CPPFLAGS"))])
404406 AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])])
405407. endif
406408
409+ AS_CASE([${enable_isystem}],[yes],
410+ [AC_SUBST([$(my.cname)_BUILD_CPPFLAGS], [${$(my.cname)_ISYS_CPPFLAGS}])],
411+ [AC_SUBST([$(my.cname)_BUILD_CPPFLAGS], [${$(my.cname)_CPPFLAGS}])])
412+
413+ AC_MSG_NOTICE([$(my.cname)_BUILD_CPPFLAGS : ${$(my.cname)_BUILD_CPPFLAGS}])
414+
407415.endmacro
408416.
409417.#-----------------------------------------------------------------------------
@@ -427,15 +435,23 @@ AS_CASE([${$(my.symbol)}], [yes],
427435AM_PATH_PYTHON([$(my.version)],
428436 [AX_PYTHON_DEVEL
429437 AC_SUBST([$(my.cname)_CPPFLAGS], [${PYTHON_CPPFLAGS}])
438+ AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [$(substitute_system_include("PYTHON_CPPFLAGS"))])
430439 AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])])
431440. else
432441AS_CASE([${$(my.symbol)}], [yes],
433442 [AM_PATH_PYTHON([$(my.version)],
434443 [AX_PYTHON_DEVEL
435444 AC_SUBST([$(my.cname)_CPPFLAGS], [${PYTHON_CPPFLAGS}])
445+ AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [$(substitute_system_include("PYTHON_CPPFLAGS"))])
436446 AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])])])
437447. endif
438448
449+ AS_CASE([${enable_isystem}],[yes],
450+ [AC_SUBST([$(my.cname)_BUILD_CPPFLAGS], [${$(my.cname)_ISYS_CPPFLAGS}])],
451+ [AC_SUBST([$(my.cname)_BUILD_CPPFLAGS], [${$(my.cname)_CPPFLAGS}])])
452+
453+ AC_MSG_NOTICE([$(my.cname)_BUILD_CPPFLAGS : ${$(my.cname)_BUILD_CPPFLAGS}])
454+
439455.endmacro
440456.
441457.#-----------------------------------------------------------------------------
0 commit comments