Skip to content

Commit 032c68c

Browse files
pmienkpmienk
committed
Expand notices for intermediate variable state for tracking down errors, quote isys variable assignment.
(cherry picked from commit f8aee98)
1 parent ab3078e commit 032c68c

1 file changed

Lines changed: 26 additions & 7 deletions

File tree

‎templates/gsl.configure.ac‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -398,12 +398,14 @@ AX_JAVA_DEVEL
398398
AC_SUBST([$(my.cname)_CPPFLAGS], [${JAVA_CPPFLAGS}])
399399
AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [$(substitute_system_include("JAVA_CPPFLAGS"))])
400400
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])
401+
AC_MSG_NOTICE([$(my.cname)_ISYS_CPPFLAGS : ${$(my.cname)_ISYS_CPPFLAGS}])
401402
. else
402403
AS_CASE([${$(my.symbol)}], [yes],
403404
[AX_JAVA_DEVEL
404405
AC_SUBST([$(my.cname)_CPPFLAGS], [${JAVA_CPPFLAGS}])
405406
AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [$(substitute_system_include("JAVA_CPPFLAGS"))])
406-
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])])
407+
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])
408+
AC_MSG_NOTICE([$(my.cname)_ISYS_CPPFLAGS : ${$(my.cname)_ISYS_CPPFLAGS}])])
407409
. endif
408410

409411
AS_CASE([${enable_isystem}],[yes],
@@ -436,14 +438,16 @@ AM_PATH_PYTHON([$(my.version)],
436438
[AX_PYTHON_DEVEL
437439
AC_SUBST([$(my.cname)_CPPFLAGS], [${PYTHON_CPPFLAGS}])
438440
AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [$(substitute_system_include("PYTHON_CPPFLAGS"))])
439-
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])])
441+
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])
442+
AC_MSG_NOTICE([$(my.cname)_ISYS_CPPFLAGS : ${$(my.cname)_ISYS_CPPFLAGS}])])
440443
. else
441444
AS_CASE([${$(my.symbol)}], [yes],
442445
[AM_PATH_PYTHON([$(my.version)],
443446
[AX_PYTHON_DEVEL
444447
AC_SUBST([$(my.cname)_CPPFLAGS], [${PYTHON_CPPFLAGS}])
445448
AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [$(substitute_system_include("PYTHON_CPPFLAGS"))])
446-
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])])])
449+
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])])
450+
AC_MSG_NOTICE([$(my.cname)_ISYS_CPPFLAGS : ${$(my.cname)_ISYS_CPPFLAGS}])])
447451
. endif
448452

449453
AS_CASE([${enable_isystem}],[yes],
@@ -476,13 +480,16 @@ AC_SUBST([iconv_CPPFLAGS], [${INCICONV}])
476480
AC_SUBST([iconv_ISYS_CPPFLAGS], [$(substitute_system_include("INCICONV"))])
477481
AC_SUBST([iconv_LIBS], [${LIBICONV}])
478482
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])
483+
AC_MSG_NOTICE([$(my.cname)_ISYS_CPPFLAGS : ${$(my.cname)_ISYS_CPPFLAGS}])
479484
AC_MSG_NOTICE([$(my.cname)_LIBS : ${$(my.cname)_LIBS}])
480485
. else
481486
AS_CASE([${$(my.symbol)}], [yes],
482487
AM_ICONV
483488
AC_SUBST([iconv_CPPFLAGS], [${INCICONV}])
489+
AC_SUBST([iconv_ISYS_CPPFLAGS], [$(substitute_system_include("INCICONV"))])
484490
AC_SUBST([iconv_LIBS], [${LIBICONV}])
485491
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])
492+
AC_MSG_NOTICE([$(my.cname)_ISYS_CPPFLAGS : ${$(my.cname)_ISYS_CPPFLAGS}])
486493
AC_MSG_NOTICE([$(my.cname)_LIBS : ${$(my.cname)_LIBS}]))
487494
. endif
488495

@@ -520,7 +527,8 @@ $(my.indent_prefix)$(my.prefix_bracket)AX_$(my.uname)(
520527
. else
521528
$(my.indent_prefix)AC_SUBST([$(my.cname)_LIBS], [${$(my.uname)_LIBS}])
522529
. endif
523-
$(my.indent_prefix)AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])],
530+
$(my.indent_prefix)AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])
531+
$(my.indent_prefix)AC_MSG_NOTICE([$(my.cname)_ISYS_CPPFLAGS : ${$(my.cname)_ISYS_CPPFLAGS}])],
524532
$(my.indent_prefix)[AC_MSG_ERROR([$(my.cname) library is required but was not found.])])
525533

526534
$(my.indent_prefix)AS_CASE([${enable_isystem}],[yes],
@@ -775,8 +783,10 @@ AC_MSG_NOTICE([$(my.cname)_LIBS : ${$(my.cname)_LIBS}])
775783
AS_CASE([${CC}], [$(my.compiler_pattern)],
776784
[AX_BOOST_BASE([$(my.version)],
777785
[AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}])
786+
AC_SUBST([boost_ISYS_CPPFLAGS], [$(substitute_system_include("BOOST_CPPFLAGS"))])
778787
AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}])
779788
AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}])
789+
AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}])
780790
AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
781791
[AC_MSG_ERROR([Boost $(my.version) or later is required but was not found.])])])
782792

@@ -847,9 +857,12 @@ PKG_CHECK_MODULES([$(my.cname)], [$(my.check)],
847857
AC_SUBST([$(my.cname)_PKG], ['$(my.check)'])
848858
AC_SUBST([$(my.cname)_CPPFLAGS], [${$(my.cname)_CFLAGS}])
849859
AS_IF([test x${$(my.cname)_INCLUDEDIR} != "x"],
850-
[AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [-isystem${$(my.cname)_INCLUDEDIR} ${$(my.cname)_OTHER_CFLAGS}])],
860+
[AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], ["-isystem${$(my.cname)_INCLUDEDIR} ${$(my.cname)_OTHER_CFLAGS}"])],
851861
[AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [${$(my.cname)_OTHER_CFLAGS}])])
852862
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])
863+
AC_MSG_NOTICE([$(my.cname)_ISYS_CPPFLAGS : ${$(my.cname)_ISYS_CPPFLAGS}])
864+
AC_MSG_NOTICE([$(my.cname)_OTHER_CFLAGS : ${$(my.cname)_OTHER_CFLAGS}])
865+
AC_MSG_NOTICE([$(my.cname)_INCLUDEDIR : ${$(my.cname)_INCLUDEDIR}])
853866
AC_MSG_NOTICE([$(my.cname)_LIBS : ${$(my.cname)_LIBS}])
854867
. elsif (is_empty(my.dependency.extract))
855868
AS_CASE([${$(my.symbol)}], [yes],
@@ -861,9 +874,12 @@ AS_CASE([${$(my.symbol)}], [yes],
861874
AC_SUBST([$(my.cname)_PKG], ['$(my.check)'])
862875
AC_SUBST([$(my.cname)_CPPFLAGS], [${$(my.cname)_CFLAGS}])
863876
AS_IF([test x${$(my.cname)_INCLUDEDIR} != "x"],
864-
[AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [-isystem${$(my.cname)_INCLUDEDIR} ${$(my.cname)_OTHER_CFLAGS}])],
877+
[AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], ["-isystem${$(my.cname)_INCLUDEDIR} ${$(my.cname)_OTHER_CFLAGS}"])],
865878
[AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [${$(my.cname)_OTHER_CFLAGS}])])
866879
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])
880+
AC_MSG_NOTICE([$(my.cname)_ISYS_CPPFLAGS : ${$(my.cname)_ISYS_CPPFLAGS}])
881+
AC_MSG_NOTICE([$(my.cname)_OTHER_CFLAGS : ${$(my.cname)_OTHER_CFLAGS}])
882+
AC_MSG_NOTICE([$(my.cname)_INCLUDEDIR : ${$(my.cname)_INCLUDEDIR}])
867883
AC_MSG_NOTICE([$(my.cname)_LIBS : ${$(my.cname)_LIBS}])],
868884
[AC_SUBST([$(my.cname)_PKG], [])])
869885
. else
@@ -878,9 +894,12 @@ AS_CASE([${$(my.symbol)}], [yes],
878894
AC_SUBST([$(my.cname)_PKG], ['$(my.check)'])
879895
AC_SUBST([$(my.cname)_CPPFLAGS], [${$(my.cname)_CFLAGS}])
880896
AS_IF([test x${$(my.cname)_INCLUDEDIR} != "x"],
881-
[AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [-isystem${$(my.cname)_INCLUDEDIR} ${$(my.cname)_OTHER_CFLAGS}])],
897+
[AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], ["-isystem${$(my.cname)_INCLUDEDIR} ${$(my.cname)_OTHER_CFLAGS}"])],
882898
[AC_SUBST([$(my.cname)_ISYS_CPPFLAGS], [${$(my.cname)_OTHER_CFLAGS}])])
883899
AC_MSG_NOTICE([$(my.cname)_CPPFLAGS : ${$(my.cname)_CPPFLAGS}])
900+
AC_MSG_NOTICE([$(my.cname)_ISYS_CPPFLAGS : ${$(my.cname)_ISYS_CPPFLAGS}])
901+
AC_MSG_NOTICE([$(my.cname)_OTHER_CFLAGS : ${$(my.cname)_OTHER_CFLAGS}])
902+
AC_MSG_NOTICE([$(my.cname)_INCLUDEDIR : ${$(my.cname)_INCLUDEDIR}])
884903
AC_MSG_NOTICE([$(my.cname)_LIBS : ${$(my.cname)_LIBS}])],
885904
[AC_SUBST([$(my.cname)_PKG], [])])
886905
. endif

0 commit comments

Comments
 (0)