From fffd987f221ff9fb89cf614bfd45309ccd9a3242 Mon Sep 17 00:00:00 2001
From: Thomas Tsou <tom@tsou.cc>
Date: Mon, 4 Nov 2013 10:20:21 -0800
Subject: [PATCH] build: Set UHD driver as default configuration

Currently the default configuration is to not build the full
transceiver, which is pointless. Set the UHD driver, which
includes either Ettus or Fairwaves variants, as the default.

Signed-off-by: Thomas Tsou <tom@tsou.cc>
---
 Transceiver52M/Makefile.am | 34 ++++++++--------------------------
 configure.ac               | 15 ++++-----------
 2 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index c03116e9..15fe0477 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -28,13 +28,10 @@ SUBDIRS = x86
 
 ARCH_LA = x86/libarch.la
 
-#UHD wins if both are defined
-if UHD
-AM_CPPFLAGS += $(UHD_CFLAGS)
-else
-if USRP1
+if USRP1 
 AM_CPPFLAGS += $(USRP_CFLAGS)
-endif
+else
+AM_CPPFLAGS += $(UHD_CFLAGS)
 endif
 
 rev2dir = $(datadir)/usrp/rev2
@@ -102,29 +99,14 @@ sigProcLibTest_LDADD = \
 	$(GSM_LA) \
 	$(COMMON_LA) $(SQLITE_LA)
 
-#uhd wins
-if UHD
-libtransceiver_la_SOURCES += UHDDevice.cpp
-transceiver_LDADD += $(UHD_LIBS)
-USRPping_LDADD += $(UHD_LIBS)
-sigProcLibTest_LDADD += $(UHD_LIBS)
-else
-if USRP1
+if USRP1 
 libtransceiver_la_SOURCES += USRPDevice.cpp
 transceiver_LDADD += $(USRP_LIBS)
 USRPping_LDADD += $(USRP_LIBS)
 sigProcLibTest_LDADD += $(USRP_LIBS)
 else
-#we should never be here, as one of the above mustbe defined for us to build
+libtransceiver_la_SOURCES += UHDDevice.cpp
+transceiver_LDADD += $(UHD_LIBS)
+USRPping_LDADD += $(UHD_LIBS)
+sigProcLibTest_LDADD += $(UHD_LIBS)
 endif
-endif
-
-
-MOSTLYCLEANFILES +=
-
-#radioInterface.cpp
-#ComplexTest.cpp
-#sigProcLibTest.cpp
-#sweepGenerator.cpp
-#testRadio.cpp
-
diff --git a/configure.ac b/configure.ac
index 2bfe8253..848f8876 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,11 +63,6 @@ AC_ARG_WITH(usrp1, [
         [enable USRP1 gnuradio based transceiver])
 ])
 
-AC_ARG_WITH(uhd, [
-    AS_HELP_STRING([--with-uhd],
-        [enable UHD based transceiver])
-])
-
 AC_ARG_WITH(singledb, [
     AS_HELP_STRING([--with-singledb],
         [enable single daughterboard use on USRP1])
@@ -75,24 +70,22 @@ AC_ARG_WITH(singledb, [
 
 AS_IF([test "x$with_usrp1" = "xyes"], [
     PKG_CHECK_MODULES(USRP, usrp >= 3.3)
-    # Find and define supported SIMD extensions
-    AX_EXT
 ])
 
-AS_IF([test "x$with_uhd" = "xyes"],[
+AS_IF([test "x$with_usrp1" != "xyes"],[
     PKG_CHECK_MODULES(UHD, uhd >= 003.004.000)
     AC_DEFINE(USE_UHD, 1, Define to 1 if using UHD)
-    AX_EXT
 ])
 
 AS_IF([test "x$with_singledb" = "xyes"], [
     AC_DEFINE(SINGLEDB, 1, Define to 1 for single daughterboard)
 ])
 
-AM_CONDITIONAL(UHD, [test "x$with_uhd" = "xyes"])
+# Find and define supported SIMD extensions
+AX_EXT
+
 AM_CONDITIONAL(USRP1, [test "x$with_usrp1" = "xyes"])
 
-# Defines LIBUSB_TRANSFER_CANCELLED, LIBUSB_TRANSFER_COMPLETED, LIBUSB_SUCCESS, LIBUSB_ERROR_*
 PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
 
 dnl Output files