@@ -1967,26 +1967,24 @@ AC_SUBST(PRETTY_CHECK_ARGS, [""])
1967
1967
# Configure any autotools-based subdirectories
1968
1968
if test "${nl_with_nlunit_test}" = "internal"; then
1969
1969
AC_CONFIG_SUBDIRS ( [ third_party/nlunit-test/repo] )
1970
- AC_SUBST ( NLUNIT_TEST_MAKEDIR ,[ "${ac_pwd}/third_party/nlunit-test/repo"] )
1970
+ AC_SUBST ( NLUNIT_TEST_MAKEDIR ,[ "${ac_pwd}/third_party/nlunit-test/repo/src "] )
1971
1971
fi
1972
1972
1973
1973
if test "${nl_with_nlio}" = "internal"; then
1974
1974
AC_CONFIG_SUBDIRS ( [ third_party/nlio/repo] )
1975
- AC_SUBST ( NLIO_MAKEDIR ,[ "${ac_pwd}/third_party/nlunio/repo"] )
1976
1975
fi
1977
1976
1978
1977
if test "${nl_with_nlassert}" = "internal"; then
1979
1978
AC_CONFIG_SUBDIRS ( [ third_party/nlassert/repo] )
1980
- AC_SUBST ( NLASSERT_MAKEDIR ,[ "${ac_pwd}/third_party/nlassert/repo"] )
1981
- fi
1982
-
1983
- if test "${nl_with_mbedtls}" = "internal"; then
1984
- AC_CONFIG_SUBDIRS ( [ third_party/mbedtls/repo] )
1985
1979
fi
1986
1980
1987
1981
if test "${nl_with_nlfaultinjection}" = "internal"; then
1988
1982
AC_CONFIG_SUBDIRS ( [ third_party/nlfaultinjection/repo] )
1989
- AC_SUBST ( NLFAULTINJECTION_MAKEDIR ,[ "${ac_pwd}/third_party/nlfaultinjection/repo"] )
1983
+ AC_SUBST ( NLFAULTINJECTION_MAKEDIR ,[ "${ac_pwd}/third_party/nlfaultinjection/repo"/src] )
1984
+ fi
1985
+
1986
+ if test "${nl_with_mbedtls}" = "internal"; then
1987
+ AC_CONFIG_SUBDIRS ( [ third_party/mbedtls/repo] )
1990
1988
fi
1991
1989
1992
1990
#
@@ -2114,12 +2112,10 @@ AC_MSG_NOTICE([
2114
2112
Nlio compile flags : ${NLIO_CPPFLAGS:--}
2115
2113
Nlio link flags : ${NLIO_LDFLAGS:--}
2116
2114
Nlio link libraries : ${NLIO_LIBS:--}
2117
- Nlio makedir : ${NLIO_MAKDIR:--}
2118
2115
Nlassert source : ${nl_with_nlassert:--}
2119
2116
Nlassert compile flags : ${NLASSERT_CPPFLAGS:--}
2120
2117
Nlassert link flags : ${NLASSERT_LDFLAGS:--}
2121
2118
Nlassert link libraries : ${NLASSERT_LIBS:--}
2122
- Nlassert makedir : ${NLASSERT_MAKEDIR:--}
2123
2119
Nlfaultinjection source : ${nl_with_nlfaultinjection:--}
2124
2120
Nlfaultinjection compile flags : ${NLFAULTINJECTION_CPPFLAGS:--}
2125
2121
Nlfaultinjection link flags : ${NLFAULTINJECTION_LDFLAGS:--}
0 commit comments