[MERGED] osmo-trx[master]: Unbreak `./configure --with-usrp1` build

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Unbreak `./configure --with-usrp1` build
......................................................................


Unbreak `./configure --with-usrp1` build

Change-Id: I49b385594271ae64a48d4d39ee9fe26d7c95bd30
---
M Transceiver52M/Makefile.am
M Transceiver52M/USRPDevice.cpp
M configure.ac
3 files changed, 6 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index 8df2d34..5b5fafa 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -91,12 +91,13 @@
 	libtransceiver.la \
 	$(ARCH_LA) \
 	$(GSM_LA) \
-	$(COMMON_LA)
+	$(COMMON_LA) \
+	$(FFTWF_LIBS)
 
 if USRP1
 libtransceiver_la_SOURCES += USRPDevice.cpp
 osmo_trx_LDADD += $(USRP_LIBS)
 else
 libtransceiver_la_SOURCES += UHDDevice.cpp
-osmo_trx_LDADD += $(UHD_LIBS) $(FFTWF_LIBS)
+osmo_trx_LDADD += $(UHD_LIBS)
 endif
diff --git a/Transceiver52M/USRPDevice.cpp b/Transceiver52M/USRPDevice.cpp
index 034ccd8..e5be58d 100644
--- a/Transceiver52M/USRPDevice.cpp
+++ b/Transceiver52M/USRPDevice.cpp
@@ -33,6 +33,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include "Logger.h"
 #include "Threads.h"
 #include "USRPDevice.h"
 
@@ -599,7 +600,7 @@
 #endif
 
 RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
-			       size_t chans, double)
+			       RadioDevice::InterfaceType, size_t chans, double)
 {
 	return new USRPDevice(tx_sps);
 }
diff --git a/configure.ac b/configure.ac
index 5cee4a6..7d26ced 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,6 @@
         )]
     )
     AC_DEFINE(USE_UHD, 1, All UHD versions)
-    PKG_CHECK_MODULES(FFTWF, fftw3f)
 ])
 
 AS_IF([test "x$with_singledb" = "xyes"], [
@@ -160,6 +159,7 @@
 AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])
 
 PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
+PKG_CHECK_MODULES(FFTWF, fftw3f)
 
 AC_CHECK_HEADER([boost/config.hpp],[],
     [AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])])

-- 
To view, visit https://gerrit.osmocom.org/5938
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I49b385594271ae64a48d4d39ee9fe26d7c95bd30
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Alexander Huemer <alexander.huemer at xx.vu>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder