Skip to content

Commit f5b9f30

Browse files
Alex Blagoogalbxela
authored andcommitted
mlxconfig: Do not install mstprivhost by default
"mstprivhost" script depends on the "mstreg" tool, which is adb tools and is not installed by default. This change enables autotools to install the "mstprivhost" script only when "--enable-adb-generic-tools" is passed to the configure script.
1 parent 6f27a2b commit f5b9f30

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

configure.ac

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,8 @@ AS_IF([test "x$enable_adb_generic_tools" = "xyes"], [
460460
ADABE_DBS_EXTRA_DIST="adb/prm/hca/ext/*.adb adb/prm/switch/ext/*.adb"
461461
])
462462

463+
AM_CONDITIONAL([ADB_GENERIC_TOOLS_ENABLED], [test "x$enable_adb_generic_tools" = "xyes"])
464+
463465
AS_IF([test "x$enable_fw_mgr" = "xyes" || test "x$enable_adb_generic_tools" = "xyes"], [
464466
AC_CONFIG_FILES(xz_utils/Makefile)
465467
XZ_UTILS_DIR="xz_utils"

mlxconfig/Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,15 @@ AM_CXXFLAGS = -pthread -Wall -W -g -MP -MD -pipe -Wno-deprecated-declarations
5151

5252
bin_PROGRAMS = mstconfig
5353

54+
if ADB_GENERIC_TOOLS_ENABLED
5455
MLXPRIVHOST_PYTHON_WRAPPER = mstprivhost
5556
bin_SCRIPTS = ${MLXPRIVHOST_PYTHON_WRAPPER}
5657
${MLXPRIVHOST_PYTHON_WRAPPER}: $(PYTHON_WRAPPER_SCRIPT)
5758
cp $(PYTHON_WRAPPER_SCRIPT) $@
5859

5960
mlxprivhostlibdir = $(libdir)/mstflint/python_tools/$(MLXPRIVHOST_PYTHON_WRAPPER)
6061
mlxprivhostlib_DATA = $(MLXPRIVHOST_PYTHON_WRAPPER).py
62+
endif
6163

6264
noinst_LTLIBRARIES = libmlxcfg.la
6365

0 commit comments

Comments
 (0)