Skip to content

Commit 10d8421

Browse files
committed
Standardize _BUILD_CPPFLAGS for java and python.
(cherry picked from commit b960037)
1 parent 56f3f75 commit 10d8421

1 file changed

Lines changed: 16 additions & 0 deletions

File tree

templates/gsl.configure.ac

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,14 +396,22 @@ AC_CHECK_HEADERS([$(my.define.header)],
396396
. if (is_empty(my.symbol))
397397
AX_JAVA_DEVEL
398398
AC_SUBST([$(my.cname)_CPPFLAGS], [${JAVA_CPPFLAGS}])
399+
AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [$(substitute_system_include("JAVA_CPPFLAGS"))])
399400
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])
400401
. else
401402
AS_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],
427435
AM_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
432441
AS_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

Comments
 (0)