X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=configure.ac;h=f02cec8d2dd3eaf72121beaf4b386fe20c114900;hp=494b3522acd7f3f426bf108f39fc4345be63ee7e;hb=a12d7eee22a72f4c999535892763dde15212e89e;hpb=323cbc387b1a068f8e2bcfd1034666406ba18c93

diff --git a/configure.ac b/configure.ac
index 494b352..f02cec8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl    Boston, MA 02110-1301, USA.
 dnl This keeps being the first instruction.
 dnl Change the 2nd argument if the version increases
 dnl 1st + 2nd argument is used for distribution package name
-AC_INIT(lcr, 1.6, andreas@eversberg.eu)
+AC_INIT(lcr, 1.7, andreas@eversberg.eu)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([main.c])
 AM_CONFIG_HEADER(config.h)
@@ -32,7 +32,7 @@ AM_CONFIG_HEADER(config.h)
 # fix warnings from autoconf + automake
 AC_GNU_SOURCE
 # AC_USE_SYSTEM_EXTENSIONS
-AM_INIT_AUTOMAKE(lcr,1.6)
+AM_INIT_AUTOMAKE(lcr,1.7)
 
 
 
@@ -95,25 +95,47 @@ AS_IF([test "x$with_ssl" != xno],
       ]
      )
 
-# check for gsm
-AC_ARG_WITH([gsm],
-	[AS_HELP_STRING([--with-gsm],
+# check for gsm-bs
+AC_ARG_WITH([gsm-bs],
+	[AS_HELP_STRING([--with-gsm-bs],
 			[compile with OpenBSC support @<:@default=check@:>@])
 	],
 	[],
-	[with_gsm="check"])
+	[with_gsm_bs="check"])
 
-AS_IF([test "x$with_gsm" != xno],
+AS_IF([test "x$with_gsm_bs" != xno],
       [AC_CHECK_FILE([openbsc/include/openbsc/gsm_data.h],
-			[with_gsm="yes"],
-			[if test "x$with_gsm" != xcheck ; then
+			[with_gsm_bs="yes"],
+			[if test "x$with_gsm_bs" != xcheck ; then
 			  AC_MSG_FAILURE(
-			    [--with-gsm was given, but openbsc/include/openbsc/gsm_data.h was not found! Pleas link OpenBSC source directory to LCR source directory: ln -s path_to_openbsc/openbsc/ .])
+			    [--with-gsm-bs was given, but openbsc/include/openbsc/gsm_data.h was not found! Pleas link OpenBSC and libosmocore source directory to LCR source directory: ln -s path_to_openbsc/openbsc/ openbsc ; ln -s patch_to_libosmocore libosmocore])
                      fi
 		     ])
       ])
 
-AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm" == "xyes" )
+AM_CONDITIONAL(ENABLE_GSM_BS, test "x$with_gsm_bs" == "xyes" )
+
+# check for gsm-ms
+AC_ARG_WITH([gsm-ms],
+	[AS_HELP_STRING([--with-gsm-ms],
+			[compile with Osmocom-bb support @<:@default=check@:>@])
+	],
+	[],
+	[with_gsm_ms="check"])
+
+AS_IF([test "x$with_gsm_ms" != xno],
+      [AC_CHECK_FILE([layer23/include/osmocom/osmocom_data.h],
+			[with_gsm_ms="yes"],
+			[if test "x$with_gsm_ms" != xcheck ; then
+			  AC_MSG_FAILURE(
+			    [--with-gsm-ms was given, but osmocom-bb/include/osmocom/osmocom_data.h was not found! Pleas link Osmocom-BB and libosmocore source directory to LCR source directory: ln -s path_to_osmocom-bb/src/host/layer23/ layer23 ; ln -s path_to_libosmocore libosmocore])
+                     fi
+		     ])
+      ])
+
+AM_CONDITIONAL(ENABLE_GSM_MS, test "x$with_gsm_ms" == "xyes" )
+
+AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes")
 
 # check for ss5
 AC_ARG_WITH([ss5],