cellular-infrastructure
/
osmo-trx
mirror of https://gerrit.osmocom.org/osmo-trx
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

configure.ac: cosmetic: rearrange MS TRX related logic 

Make it consistent with the existing AS_IF/AM_CONDITIONAL locations.

Change-Id: I760b93c1b07989b02c4c38cd20ab40e45650f2c1
Related: OS#5599
This commit is contained in:
Vadim Yanitskiy 2022-12-28 04:58:39 +07:00
parent 4a867be165
commit d0b947a0c4
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure.ac
View File

@ -209,7 +209,17 @@ AS_IF([test "x$with_bladerf" = "xyes"], [
PKG_CHECK_MODULES(BLADE, libbladeRF >= 2.0)
])
AM_CONDITIONAL([ENABLE_MS_TRX], [test "x$with_mstrx" = "xyes"])
AS_IF([test "x$with_mstrx" = "xyes"], [
AC_MSG_NOTICE(["Enabling ms-trx..."])
AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon])
AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon")
], [
# Despite LIBTRXCON_DIR is added to SUBDIRS conditionally,
# autoconf/automake still requires the directory to be present
# and thus the submodule to be fetched (even if MS TRX is not needed).
# Work this around by pointing it to an empty dir.
AC_SUBST(LIBTRXCON_DIR, "osmocom-bb")
])
AS_IF([test "x$with_singledb" = "xyes"], [
AC_DEFINE(SINGLEDB, 1, Define to 1 for single daughterboard)
@ -267,6 +277,7 @@ AM_CONDITIONAL(DEVICE_IPC, [test "x$with_ipc" = "xyes"])
AM_CONDITIONAL(DEVICE_BLADE, [test "x$with_bladerf" = "xyes"])
AM_CONDITIONAL(ARCH_ARM, [test "x$with_neon" = "xyes" || test "x$with_neon_vfpv4" = "xyes"])
AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])
AM_CONDITIONAL(ENABLE_MS_TRX, [test "x$with_mstrx" = "xyes"])
PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
PKG_CHECK_MODULES(FFTWF, fftw3f)
@ -334,18 +345,6 @@ AC_MSG_RESULT([CFLAGS="$CFLAGS"])
AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"])
AC_MSG_RESULT([LDFLAGS="$LDFLAGS"])
if test "x$with_mstrx" = "xyes"; then
AC_MSG_NOTICE(["Enabling ms-trx..."])
AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon])
AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon")
else
# Despite LIBTRXCON_DIR is added to SUBDIRS conditionally,
# autoconf/automake still requires the directory to be present
# and thus the submodule to be fetched (even if MS TRX is not needed).
# Work this around by pointing it to an empty dir.
AC_SUBST(LIBTRXCON_DIR, "osmocom-bb")
fi
dnl Output files
AC_CONFIG_FILES([\