issue: 1056823 Improve build configure structure

Current configure.ac was modified to improve readability.
Some functionality was put out the file to separated m4 files
as prof.m4, func.m4 and verbs.m4

Signed-off-by: Igor Ivanov <[email protected]>

.gitignore

@@ -26,14 +26,14 @@ config.h.in
 config.h.in~
 config.log
 config.status
-config/config.guess
-config/config.sub
-config/install-sh
-config/missing
-config/decomp
-config/ltmain.sh
-config/compile
-config/depcomp
+config/aux/config.guess
+config/aux/config.sub
+config/aux/install-sh
+config/aux/missing
+config/aux/decomp
+config/aux/ltmain.sh
+config/aux/compile
+config/aux/depcomp
 config/m4/libtool.m4
 config/m4/ltoptions.m4
 config/m4/ltsugar.m4

Makefile.am

@@ -22,7 +22,7 @@ mydocdir = $(if $(docdir),$(docdir),${datadir}/doc/$(distdir))
 mydoc_DATA = README.txt journal.txt VMA_VERSION
 
 install-exec-hook:
-	$(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d
+	mkdir -p $(DESTDIR)/$(sysconfdir)/init.d
 	cp $(top_builddir)/contrib/scripts/vma.init $(DESTDIR)/$(sysconfdir)/init.d/vma
 	chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/vma
 

config/m4/func.m4

@@ -0,0 +1,36 @@
+# func.m4 - Collection of functions
+# 
+# Copyright (C) Mellanox Technologies Ltd. 2016-2017.  ALL RIGHTS RESERVED.
+# See file LICENSE for terms.
+#
+
+##########################
+# Configure functions
+#
+# Some helper script functions
+#
+AC_DEFUN([FUNC_CONFIGURE_INIT],
+[
+show_section_title()
+{
+    cat <<EOF
+
+============================================================================
+== ${1}
+============================================================================
+EOF
+}
+
+show_summary_title()
+{
+    cat <<EOF
+
+Mellanox VMA library
+============================================================================
+Version: ${VMA_LIBRARY_MAJOR}.${VMA_LIBRARY_MINOR}.${VMA_LIBRARY_REVISION}.${VMA_LIBRARY_RELEASE}
+Git: ${GIT_VER}
+
+EOF
+}
+
+])

config/m4/nl.m4

@@ -0,0 +1,47 @@
+# nl.m4 - Detect nl package
+#
+# Copyright (C) Mellanox Technologies Ltd. 2001-2017.  ALL RIGHTS RESERVED.
+# See file LICENSE for terms.
+#
+
+##########################
+# Checking nl library
+#
+AC_DEFUN([CHECK_NL_LIB],
+[
+# checking for libnl1 or libnl3 in libibverbs
+if test -f "$ac_cv_ofed_path/lib64/libibverbs.so" ; then
+	libibverbs_file="$ac_cv_ofed_path/lib64/libibverbs.so"
+else
+	libibverbs_file="$ac_cv_ofed_path/lib/libibverbs.so"
+fi
+
+have_libnl1=no
+have_libnl3=no
+
+ldd $libibverbs_file | grep libnl >/dev/null 2>&1
+if test $? -eq 0 ; then
+	ldd $libibverbs_file | grep -e 'libnl3' -e 'libnl-3' >/dev/null 2>&1
+	if test $? -eq 0 ; then
+		# libnl3 case
+		PKG_CHECK_MODULES([LIBNL3],[libnl-route-3.0],have_libnl3=yes AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-route-3.0]),[:])
+		if test "$have_libnl3" == no; then
+			AC_MSG_ERROR([libibverbs is linked with libnl3 while libnl3-devel is not installed. Please install libnl3-devel and try again])
+		fi
+		AC_SUBST([LIBNL_LIBS], "$LIBNL3_LIBS")
+		AC_SUBST([LIBNL_CFLAGS], "$LIBNL3_CFLAGS")
+		AC_SUBST([LIBNLX_DEVEL], "libnl3-devel")
+	else
+		# libnl1 case
+		PKG_CHECK_MODULES([LIBNL1],[libnl-1], have_libnl1=yes AC_DEFINE([HAVE_LIBNL1], [1], [Use libnl-1]), [:])
+		if test "$have_libnl1" == no; then
+			AC_MSG_ERROR([libibverbs is linked with libnl1 while libnl1-devel is not installed. Please install libnl1-devel and try again])
+		fi
+		AC_SUBST([LIBNL_LIBS], "$LIBNL1_LIBS")
+		AC_SUBST([LIBNL_CFLAGS], "$LIBNL1_CFLAGS")
+		AC_SUBST([LIBNLX_DEVEL], "libnl-devel")
+	fi
+fi
+
+AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl1" = "yes" -o "$have_libnl3" = "yes"])
+])

config/m4/opt.m4

@@ -9,26 +9,25 @@
 #
 # VMA defined log levels
 #
-AC_DEFINE(DEFINED_VLOG_INIT,		-2,	VMA Log Init Definition)
-AC_DEFINE(DEFINED_VLOG_NONE,		-1,	VMA Log None Definition)
-AC_DEFINE(DEFINED_VLOG_PANIC,		0,	VMA Log Panic Definition)
-AC_DEFINE(DEFINED_VLOG_ERROR,		1,	VMA Log Error Definition)
-AC_DEFINE(DEFINED_VLOG_WARNING,		2,	VMA Log Warning Definition)
-AC_DEFINE(DEFINED_VLOG_INFO,		3,	VMA Log Info Definition)
-AC_DEFINE(DEFINED_VLOG_DETAILS,		4,	VMA Log Details Definition)
-AC_DEFINE(DEFINED_VLOG_DEBUG,		5,	VMA Log Debug Definition)
-AC_DEFINE(DEFINED_VLOG_FINE,		6,	VMA Log Fine Definition) 
-AC_DEFINE(DEFINED_VLOG_FINER,		7,	VMA Log Finer Definition)
-AC_DEFINE(DEFINED_VLOG_ALL,		8,	VMA Log All Definition)
+AC_DEFUN([OPT_VMA_LOGGING],
+[
+AC_DEFINE(DEFINED_VLOG_INIT,       -2, VMA Log Init Definition)
+AC_DEFINE(DEFINED_VLOG_NONE,       -1, VMA Log None Definition)
+AC_DEFINE(DEFINED_VLOG_PANIC,       0, VMA Log Panic Definition)
+AC_DEFINE(DEFINED_VLOG_ERROR,       1, VMA Log Error Definition)
+AC_DEFINE(DEFINED_VLOG_WARNING,     2, VMA Log Warning Definition)
+AC_DEFINE(DEFINED_VLOG_INFO,        3, VMA Log Info Definition)
+AC_DEFINE(DEFINED_VLOG_DETAILS,     4, VMA Log Details Definition)
+AC_DEFINE(DEFINED_VLOG_DEBUG,       5, VMA Log Debug Definition)
+AC_DEFINE(DEFINED_VLOG_FINE,        6, VMA Log Fine Definition)
+AC_DEFINE(DEFINED_VLOG_FINER,       7, VMA Log Finer Definition)
+AC_DEFINE(DEFINED_VLOG_ALL,         8, VMA Log All Definition)
 
-AC_ARG_ENABLE(
-    [opt-log],
-    AC_HELP_STRING(
-        [--enable-opt-log],
+AC_ARG_ENABLE([opt-log],
+    AC_HELP_STRING([--enable-opt-log],
         [Optimize latency (none, medium, high) by limiting max log level (default=medium)]),,
     enableval=medium)
-AC_MSG_CHECKING(
-    [checking for logging optimization])
+AC_MSG_CHECKING([for logging optimization])
 enable_opt_log=DEFINED_VLOG_ALL
 case "$enableval" in
     no | none)
@@ -45,4 +44,4 @@ case "$enableval" in
 esac
 AC_DEFINE_UNQUOTED([VMA_MAX_DEFINED_LOG_LEVEL], [$enable_opt_log], [Log optimization level])
 AC_MSG_RESULT([$enableval])
-
+])