merged in commercial openbts

configure.ac

@@ -18,11 +18,10 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl
 
-AC_INIT(openbts-public,TRUNK)
+AC_INIT(openbts,4.0TRUNK)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([config/Makefile.am])
-AC_CONFIG_AUX_DIR([.])	
-AC_CONFIG_MACRO_DIR([config])
+AC_CONFIG_AUX_DIR([.])
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_BUILD
@@ -31,12 +30,17 @@ AC_CANONICAL_TARGET
 
 AM_INIT_AUTOMAKE
 
+dnl Checks for programs.
 AM_PROG_AS
 AC_PROG_CXX
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PATH_PROG([RM_PROG], [rm])
+#AC_PROG_AWK
+#AC_PROG_CC
+#AC_PROG_CPP
+#AC_PROG_RANLIB
 
 AC_LIBTOOL_WIN32_DLL
 AC_ENABLE_SHARED	dnl do build shared libraries
@@ -47,6 +51,7 @@ dnl Checks for header files.
 AC_HEADER_STDC
 dnl This is required for GnuRadio includes to understand endianess correctly:
 AC_CHECK_HEADERS([byteswap.h])
+#AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h utime.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -89,13 +94,72 @@ AS_IF([test "x$with_singledb" = "xyes"], [
 AM_CONDITIONAL(UHD, [test "x$with_uhd" = "xyes"])
 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 Check for libzmq
+if test ! -r "/usr/include/zmq.h" -a ! -r "/usr/local/include/zmq.h"; then
+    AC_MSG_ERROR([/usr/local/include/zmq.h not found. Install the range-libzmq package or manually build and install with $ sudo ./NodeManager/install_libzmq.sh])
+fi
+if test ! -r "/usr/include/zmq.hpp" -a ! -r "/usr/local/include/zmq.hpp"; then
+    AC_MSG_ERROR([/usr/local/include/zmq.hpp not found. Install the range-libzmq package or manually build and install with $ sudo ./NodeManager/install_libzmq.sh])
+fi
+AC_CHECK_LIB(zmq, zmq_init, ,[AC_MSG_ERROR([Cannot link with -lzmq.  Install the range-libzmq package or manually build and install with $ sudo ./NodeManager/install_libzmq.sh])])
+AC_MSG_CHECKING([whether libzmq installation works])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <zmq.h>],
+                                [zmq_init(1);])
+               ],
+               [AC_MSG_RESULT([yes])],
+               [AC_MSG_ERROR([no. Install the range-libzmq package or manually build and install with $ sudo ./NodeManager/install_libzmq.sh])])
 
-# Check for glibc-specific network functions
+dnl Check for liba53
+if test ! -r "/usr/include/a53.h" -a ! -r "/usr/local/include/a53.h"; then
+    AC_MSG_ERROR([/usr/include/a53.h not found. Install the liba53 package or manually build and install with $ sudo ./tools/install_liba53.sh])
+fi
+AC_CHECK_LIB(a53, _init, ,[AC_MSG_ERROR([Cannot link with -la53. Install the liba53 package or manually build and install with $ sudo ./tools/install_liba53.sh])])
+
+dnl Check for sip+rtp libs
+#AC_CHECK_LIB([ortp], [main])
+
+dnl Check for other misc libs
+#AC_CHECK_LIB([c], [main])
+#AC_CHECK_LIB([dl], [main])
+#AC_CHECK_LIB([pthread], [main])
+#AC_CHECK_LIB([readline], [main])
+#AC_CHECK_LIB([sqlite3], [main])
+#AC_CHECK_LIB([usrp], [main])
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+#AC_HEADER_STDBOOL
+#AC_TYPE_UID_T
+#AC_C_INLINE
+#AC_TYPE_INT16_T
+#AC_TYPE_INT32_T
+#AC_TYPE_INT64_T
+#AC_TYPE_INT8_T
+#AC_TYPE_MODE_T
+#AC_TYPE_OFF_T
+#AC_TYPE_PID_T
+#AC_TYPE_SIZE_T
+#AC_TYPE_SSIZE_T
+#AC_CHECK_MEMBERS([struct stat.st_blksize])
+#AC_TYPE_UINT16_T
+#AC_TYPE_UINT32_T
+#AC_TYPE_UINT64_T
+#AC_TYPE_UINT8_T
+
+dnl Check for glibc-specific network functions
 AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAVE_GETHOSTBYNAME_R, 1, Define if libc implements gethostbyname_r)])
 AC_CHECK_FUNC(gethostbyname2_r, [AC_DEFINE(HAVE_GETHOSTBYNAME2_R, 1, Define if libc implements gethostbyname2_r)])
 
+dnl Checks for library functions.
+#AC_FUNC_ALLOCA
+#AC_FUNC_ERROR_AT_LINE
+#AC_FUNC_FORK
+#AC_FUNC_MALLOC
+#AC_FUNC_MMAP
+#AC_FUNC_REALLOC
+#AC_FUNC_STRERROR_R
+#AC_FUNC_STRTOD
+#AC_CHECK_FUNCS([bzero clock_gettime dup2 fdatasync floor gethostbyname getpagesize gettimeofday inet_ntoa localtime_r memchr memmove memset mkdir munmap pow regcomp rint select setenv socket sqrt strcasecmp strchr strdup strerror strncasecmp strpbrk strrchr strstr strtol strtoul sysinfo utime])
+
 dnl Output files
 AC_CONFIG_FILES([\
     Makefile \
@@ -105,6 +169,7 @@ AC_CONFIG_FILES([\
     CommonLibs/Makefile \
     Globals/Makefile \
     Control/Makefile \
+    GSMShare/Makefile \
     GSM/Makefile \
     GPRS/Makefile \
     SGSNGGSN/Makefile \
@@ -115,7 +180,8 @@ AC_CONFIG_FILES([\
     TRXManager/Makefile \
     CLI/Makefile \
     Peering/Makefile \
-    SR/Makefile \
+    NodeManager/Makefile \
+    Scanning/Makefile \
     sqlite3/Makefile \
 ])