[PATCH] osmo-bts[master]: sysmobts: move header check to appropriate place

[Max]

Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/5978

to look at the new patch set (#2).

sysmobts: move header check to appropriate place

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

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


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/78/5978/2

diff --git a/configure.ac b/configure.ac
index 51d94c6..db8a97d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,9 +82,17 @@
 	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 @@
 	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(

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I165c373b58146658a5a69a2d7222d60cff4db79a
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>