Skip to content

Commit 1eef6cf

Browse files
author
Rob Walker
authored
skip docs, etc. in nlassert and friends (#434)
1 parent ef904ab commit 1eef6cf

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

configure.ac

+6-10
Original file line numberDiff line numberDiff line change
@@ -1967,26 +1967,24 @@ AC_SUBST(PRETTY_CHECK_ARGS, [""])
19671967
# Configure any autotools-based subdirectories
19681968
if test "${nl_with_nlunit_test}" = "internal"; then
19691969
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"])
19711971
fi
19721972

19731973
if test "${nl_with_nlio}" = "internal"; then
19741974
AC_CONFIG_SUBDIRS([third_party/nlio/repo])
1975-
AC_SUBST(NLIO_MAKEDIR,["${ac_pwd}/third_party/nlunio/repo"])
19761975
fi
19771976

19781977
if test "${nl_with_nlassert}" = "internal"; then
19791978
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])
19851979
fi
19861980

19871981
if test "${nl_with_nlfaultinjection}" = "internal"; then
19881982
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])
19901988
fi
19911989

19921990
#
@@ -2114,12 +2112,10 @@ AC_MSG_NOTICE([
21142112
Nlio compile flags : ${NLIO_CPPFLAGS:--}
21152113
Nlio link flags : ${NLIO_LDFLAGS:--}
21162114
Nlio link libraries : ${NLIO_LIBS:--}
2117-
Nlio makedir : ${NLIO_MAKDIR:--}
21182115
Nlassert source : ${nl_with_nlassert:--}
21192116
Nlassert compile flags : ${NLASSERT_CPPFLAGS:--}
21202117
Nlassert link flags : ${NLASSERT_LDFLAGS:--}
21212118
Nlassert link libraries : ${NLASSERT_LIBS:--}
2122-
Nlassert makedir : ${NLASSERT_MAKEDIR:--}
21232119
Nlfaultinjection source : ${nl_with_nlfaultinjection:--}
21242120
Nlfaultinjection compile flags : ${NLFAULTINJECTION_CPPFLAGS:--}
21252121
Nlfaultinjection link flags : ${NLFAULTINJECTION_LDFLAGS:--}

0 commit comments

Comments
 (0)