From e5b613d29bc9c78d186a87f3627c3333c44ca9f0 Mon Sep 17 00:00:00 2001
From: Max <msuraev@sysmocom.de>
Date: Mon, 22 Jan 2018 11:13:51 +0100
Subject: sysmobts: move header check to appropriate place

Move the header check specific to sysmoBTS 2050 next to generic sysmoBTS
header check.

Change-Id: I165c373b58146658a5a69a2d7222d60cff4db79a
---
 configure.ac | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 51d94c6f..db8a97d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,9 +82,17 @@ if test "$enable_sysmocom_bts" = "yes"; then
 	AC_CHECK_HEADER([sysmocom/femtobts/superfemto.h],[],
 			[AC_MSG_ERROR([sysmocom/femtobts/superfemto.h can not be found in $sysmobts_incdir])],
 			[#include <sysmocom/femtobts/superfemto.h>])
+
+	# Check for the sbts2050_header.h that was added after the 3.6 release
+	AC_CHECK_HEADER([sysmocom/femtobts/sbts2050_header.h], [sysmo_uc_header="yes"], [])
+	if test "$sysmo_uc_header" = "yes" ; then
+	   	AC_DEFINE(BUILD_SBTS2050, 1, [Define if we want to build SBTS2050])
+	fi
+
 	PKG_CHECK_MODULES(LIBGPS, libgps)
 	CPPFLAGS=$oldCPPFLAGS
 fi
+AM_CONDITIONAL(BUILD_SBTS2050, test "x$sysmo_uc_header" = "xyes")
 
 AC_MSG_CHECKING([whether to enable support for osmo-trx based L1/PHY support])
 AC_ARG_ENABLE(trx,
@@ -177,17 +185,6 @@ if test "$enable_litecell15" = "yes"; then
 	CPPFLAGS=$oldCPPFLAGS
 fi
 
-# Check for the sbts2050_header.h that was added after the 3.6 release
-oldCPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $SYSMOBTS_INCDIR"
-AC_CHECK_HEADER([sysmocom/femtobts/sbts2050_header.h],
-		[sysmo_uc_header="yes"],[])
-CPPFLAGS=$oldCPPFLAGS
-
-if test "$sysmo_uc_header" = "yes" ; then
-	AC_DEFINE(BUILD_SBTS2050, 1, [Define if we want to build SBTS2050])
-fi
-AM_CONDITIONAL(BUILD_SBTS2050, test "x$sysmo_uc_header" = "xyes")
 AM_CONFIG_HEADER(btsconfig.h)
 
 AC_OUTPUT(
-- 
cgit v1.2.3