Commit 3eb7b32a authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Add logging facility

parent fdea4289

Makefile.am

+9 −5
Original line number Diff line number Diff line
@@ -37,15 +37,19 @@ src_urd_SOURCES = \ 


src_urd_CXXFLAGS = 				\

	@TBB_CFLAGS@ 				\

	@LIBEV_CFLAGS@				\

	-std=gnu++11 -Wall -Wextra



src_urd_CPPFLAGS = 				\

	-I$(top_srcdir)/include

	@BOOST_CPPFLAGS@			\

	-I$(top_srcdir)/include		\

	-I$(top_srcdir)/src





src_urd_LDFLAGS = 		\

	@TBB_LIBS@	  		\

	@LIBEV_LIBS@  \

	@BOOST_LDFLAGS@		\

    @BOOST_SYSTEM_LIB@	\

    @BOOST_ASIO_LIB@	\

	-pthread



src_urd_LDADD = 	\

configure.ac

+15 −7
Original line number Diff line number Diff line
@@ -45,15 +45,23 @@ AX_CHECK_COMPILE_FLAG([-std=c++11], [CXXFLAGS+=" -std=c++11"], [ 


# Checks for libraries.I



# check that Intel's TBB

PKG_CHECK_MODULES([TBB], [tbb])

# check libev

PKG_CHECK_MODULES([LIBEV], [libev],

                  [], # action if found

                  [AC_SEARCH_LIBS([ev_version_major], [ev], [], [

                       AC_MSG_ERROR([Unable to find the libev library])



# check for pkg-config

PKG_PROG_PKG_CONFIG



# check for some BOOST libraries

AX_BOOST_BASE([1.53],, [

    AC_MSG_ERROR([

        The Norns Data Scheduler needs BOOST >= 1.53, but it was not found in your system

    ])

])

AX_BOOST_SYSTEM

AX_BOOST_FILESYSTEM

AX_BOOST_ASIO





# check that Intel's TBB

PKG_CHECK_MODULES([TBB], [tbb])

m4/ax_boost_asio.m4

0 → 100644
+110 −0
Original line number Diff line number Diff line 
# ===========================================================================

#      https://www.gnu.org/software/autoconf-archive/ax_boost_asio.html

# ===========================================================================

#

# SYNOPSIS

#

#   AX_BOOST_ASIO

#

# DESCRIPTION

#

#   Test for Asio library from the Boost C++ libraries. The macro requires a

#   preceding call to AX_BOOST_BASE. Further documentation is available at

#   <http://randspringer.de/boost/index.html>.

#

#   This macro calls:

#

#     AC_SUBST(BOOST_ASIO_LIB)

#

#   And sets:

#

#     HAVE_BOOST_ASIO

#

# LICENSE

#

#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>

#   Copyright (c) 2008 Pete Greenwell <pete@mu.org>

#

#   Copying and distribution of this file, with or without modification, are

#   permitted in any medium without royalty provided the copyright notice

#   and this notice are preserved. This file is offered as-is, without any

#   warranty.



#serial 17



AC_DEFUN([AX_BOOST_ASIO],

[

    AC_ARG_WITH([boost-asio],

    AS_HELP_STRING([--with-boost-asio@<:@=special-lib@:>@],

                   [use the ASIO library from boost - it is possible to specify a certain library for the linker

                        e.g. --with-boost-asio=boost_system-gcc41-mt-1_34 ]),

        [

        if test "$withval" = "no"; then

            want_boost="no"

        elif test "$withval" = "yes"; then

            want_boost="yes"

            ax_boost_user_asio_lib=""

        else

            want_boost="yes"

        ax_boost_user_asio_lib="$withval"

        fi

        ],

        [want_boost="yes"]

    )



    if test "x$want_boost" = "xyes"; then

        AC_REQUIRE([AC_PROG_CC])

        CPPFLAGS_SAVED="$CPPFLAGS"

        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"

        export CPPFLAGS



        LDFLAGS_SAVED="$LDFLAGS"

        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"

        export LDFLAGS



        AC_CACHE_CHECK(whether the Boost::ASIO library is available,

                       ax_cv_boost_asio,

        [AC_LANG_PUSH([C++])

         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @%:@include <boost/asio.hpp>

                                            ]],

                                  [[



                                    boost::asio::io_service io;

                                    boost::system::error_code timer_result;

                                    boost::asio::deadline_timer t(io);

                                    t.cancel();

                                    io.run_one();

                                    return 0;

                                   ]])],

                             ax_cv_boost_asio=yes, ax_cv_boost_asio=no)

         AC_LANG_POP([C++])

        ])

        if test "x$ax_cv_boost_asio" = "xyes"; then

            AC_DEFINE(HAVE_BOOST_ASIO,,[define if the Boost::ASIO library is available])

            BN=boost_system

            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`

            if test "x$ax_boost_user_asio_lib" = "x"; then

                for ax_lib in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.dylib* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_system.*\)\.a.*$;\1;' ` ; do

                    AC_CHECK_LIB($ax_lib, main, [BOOST_ASIO_LIB="-l$ax_lib" AC_SUBST(BOOST_ASIO_LIB) link_thread="yes" break],

                                 [link_thread="no"])

                done

            else

               for ax_lib in $ax_boost_user_asio_lib $BN-$ax_boost_user_asio_lib; do

                      AC_CHECK_LIB($ax_lib, main,

                                   [BOOST_ASIO_LIB="-l$ax_lib" AC_SUBST(BOOST_ASIO_LIB) link_asio="yes" break],

                                   [link_asio="no"])

                  done



            fi

            if test "x$ax_lib" = "x"; then

                AC_MSG_ERROR(Could not find a version of the library!)

            fi

            if test "x$link_asio" = "xno"; then

                AC_MSG_ERROR(Could not link against $ax_lib !)

            fi

        fi



        CPPFLAGS="$CPPFLAGS_SAVED"

    LDFLAGS="$LDFLAGS_SAVED"

    fi

])

m4/ax_boost_base.m4

0 → 100644
+285 −0
Original line number Diff line number Diff line 
# ===========================================================================

#       http://www.gnu.org/software/autoconf-archive/ax_boost_base.html

# ===========================================================================

#

# SYNOPSIS

#

#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])

#

# DESCRIPTION

#

#   Test for the Boost C++ libraries of a particular version (or newer)

#

#   If no path to the installed boost library is given the macro searchs

#   under /usr, /usr/local, /opt and /opt/local and evaluates the

#   $BOOST_ROOT environment variable. Further documentation is available at

#   <http://randspringer.de/boost/index.html>.

#

#   This macro calls:

#

#     AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)

#

#   And sets:

#

#     HAVE_BOOST

#

# LICENSE

#

#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>

#   Copyright (c) 2009 Peter Adolphs

#

#   Copying and distribution of this file, with or without modification, are

#   permitted in any medium without royalty provided the copyright notice

#   and this notice are preserved. This file is offered as-is, without any

#   warranty.



#serial 26



AC_DEFUN([AX_BOOST_BASE],

[

AC_ARG_WITH([boost],

  [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],

    [use Boost library from a standard location (ARG=yes),

     from the specified location (ARG=<path>),

     or disable it (ARG=no)

     @<:@ARG=yes@:>@ ])],

    [

    if test "$withval" = "no"; then

        want_boost="no"

    elif test "$withval" = "yes"; then

        want_boost="yes"

        ac_boost_path=""

    else

        want_boost="yes"

        ac_boost_path="$withval"

    fi

    ],

    [want_boost="yes"])





AC_ARG_WITH([boost-libdir],

        AS_HELP_STRING([--with-boost-libdir=LIB_DIR],

        [Force given directory for boost libraries. Note that this will override library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]),

        [

        if test -d "$withval"

        then

                ac_boost_lib_path="$withval"

        else

                AC_MSG_ERROR(--with-boost-libdir expected directory name)

        fi

        ],

        [ac_boost_lib_path=""]

)



if test "x$want_boost" = "xyes"; then

    boost_lib_version_req=ifelse([$1], ,1.20.0,$1)

    boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`

    boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`

    boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`

    boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`

    if test "x$boost_lib_version_req_sub_minor" = "x" ; then

        boost_lib_version_req_sub_minor="0"

        fi

    WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`

    AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)

    succeeded=no



    dnl On 64-bit systems check for system libraries in both lib64 and lib.

    dnl The former is specified by FHS, but e.g. Debian does not adhere to

    dnl this (as it rises problems for generic multi-arch support).

    dnl The last entry in the list is chosen by default when no libraries

    dnl are found, e.g. when only header-only libraries are installed!

    libsubdirs="lib"

    ax_arch=`uname -m`

    case $ax_arch in

      x86_64)

        libsubdirs="lib64 libx32 lib lib64"

        ;;

      ppc64|s390x|sparc64|aarch64|ppc64le)

        libsubdirs="lib64 lib lib64 ppc64le"

        ;;

    esac



    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give

    dnl them priority over the other paths since, if libs are found there, they

    dnl are almost assuredly the ones desired.

    AC_REQUIRE([AC_CANONICAL_HOST])

    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"



    case ${host_cpu} in

      i?86)

        libsubdirs="lib/i386-${host_os} $libsubdirs"

        ;;

    esac



    dnl first we check the system location for boost libraries

    dnl this location ist chosen if boost libraries are installed with the --layout=system option

    dnl or if you install boost with RPM

    if test "$ac_boost_path" != ""; then

        BOOST_CPPFLAGS="-I$ac_boost_path/include"

        for ac_boost_path_tmp in $libsubdirs; do

                if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then

                        BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"

                        break

                fi

        done

    elif test "$cross_compiling" != yes; then

        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do

            if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then

                for libsubdir in $libsubdirs ; do

                    if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi

                done

                BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"

                BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"

                break;

            fi

        done

    fi



    dnl overwrite ld flags if we have required special directory with

    dnl --with-boost-libdir parameter

    if test "$ac_boost_lib_path" != ""; then

       BOOST_LDFLAGS="-L$ac_boost_lib_path"

    fi



    CPPFLAGS_SAVED="$CPPFLAGS"

    CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"

    export CPPFLAGS



    LDFLAGS_SAVED="$LDFLAGS"

    LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"

    export LDFLAGS



    AC_REQUIRE([AC_PROG_CXX])

    AC_LANG_PUSH(C++)

        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

    @%:@include <boost/version.hpp>

    ]], [[

    #if BOOST_VERSION >= $WANT_BOOST_VERSION

    // Everything is okay

    #else

    #  error Boost version is too old

    #endif

    ]])],[

        AC_MSG_RESULT(yes)

    succeeded=yes

    found_system=yes

        ],[

        ])

    AC_LANG_POP([C++])







    dnl if we found no boost with system layout we search for boost libraries

    dnl built and installed without the --layout=system option or for a staged(not installed) version

    if test "x$succeeded" != "xyes"; then

        CPPFLAGS="$CPPFLAGS_SAVED"

        LDFLAGS="$LDFLAGS_SAVED"

        BOOST_CPPFLAGS=

        BOOST_LDFLAGS=

        _version=0

        if test "$ac_boost_path" != ""; then

            if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then

                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do

                    _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`

                    V_CHECK=`expr $_version_tmp \> $_version`

                    if test "$V_CHECK" = "1" ; then

                        _version=$_version_tmp

                    fi

                    VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`

                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"

                done

                dnl if nothing found search for layout used in Windows distributions

                if test -z "$BOOST_CPPFLAGS"; then

                    if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then

                        BOOST_CPPFLAGS="-I$ac_boost_path"

                    fi

                fi

            fi

        else

            if test "$cross_compiling" != yes; then

                for ac_boost_path in /usr /usr/local /opt /opt/local ; do

                    if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then

                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do

                            _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`

                            V_CHECK=`expr $_version_tmp \> $_version`

                            if test "$V_CHECK" = "1" ; then

                                _version=$_version_tmp

                                best_path=$ac_boost_path

                            fi

                        done

                    fi

                done



                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`

                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"

                if test "$ac_boost_lib_path" = ""; then

                    for libsubdir in $libsubdirs ; do

                        if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi

                    done

                    BOOST_LDFLAGS="-L$best_path/$libsubdir"

                fi

            fi



            if test "x$BOOST_ROOT" != "x"; then

                for libsubdir in $libsubdirs ; do

                    if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi

                done

                if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then

                    version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`

                    stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`

                        stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`

                    V_CHECK=`expr $stage_version_shorten \>\= $_version`

                    if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then

                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)

                        BOOST_CPPFLAGS="-I$BOOST_ROOT"

                        BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"

                    fi

                fi

            fi

        fi



        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"

        export CPPFLAGS

        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"

        export LDFLAGS



        AC_LANG_PUSH(C++)

            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

        @%:@include <boost/version.hpp>

        ]], [[

        #if BOOST_VERSION >= $WANT_BOOST_VERSION

        // Everything is okay

        #else

        #  error Boost version is too old

        #endif

        ]])],[

            AC_MSG_RESULT(yes)

        succeeded=yes

        found_system=yes

            ],[

            ])

        AC_LANG_POP([C++])

    fi



    if test "$succeeded" != "yes" ; then

        if test "$_version" = "0" ; then

            AC_MSG_NOTICE([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option.  If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation.]])

        else

            AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).])

        fi

        # execute ACTION-IF-NOT-FOUND (if present):

        ifelse([$3], , :, [$3])

    else

        AC_SUBST(BOOST_CPPFLAGS)

        AC_SUBST(BOOST_LDFLAGS)

        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])

        # execute ACTION-IF-FOUND (if present):

        ifelse([$2], , :, [$2])

    fi



    CPPFLAGS="$CPPFLAGS_SAVED"

    LDFLAGS="$LDFLAGS_SAVED"

fi



])

m4/ax_boost_filesystem.m4

0 → 100644
+118 −0
Original line number Diff line number Diff line 
# ===========================================================================

#    http://www.gnu.org/software/autoconf-archive/ax_boost_filesystem.html

# ===========================================================================

#

# SYNOPSIS

#

#   AX_BOOST_FILESYSTEM

#

# DESCRIPTION

#

#   Test for Filesystem library from the Boost C++ libraries. The macro

#   requires a preceding call to AX_BOOST_BASE. Further documentation is

#   available at <http://randspringer.de/boost/index.html>.

#

#   This macro calls:

#

#     AC_SUBST(BOOST_FILESYSTEM_LIB)

#

#   And sets:

#

#     HAVE_BOOST_FILESYSTEM

#

# LICENSE

#

#   Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>

#   Copyright (c) 2009 Michael Tindal

#   Copyright (c) 2009 Roman Rybalko <libtorrent@romanr.info>

#

#   Copying and distribution of this file, with or without modification, are

#   permitted in any medium without royalty provided the copyright notice

#   and this notice are preserved. This file is offered as-is, without any

#   warranty.



#serial 26



AC_DEFUN([AX_BOOST_FILESYSTEM],

[

	AC_ARG_WITH([boost-filesystem],

	AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@],

                   [use the Filesystem library from boost - it is possible to specify a certain library for the linker

                        e.g. --with-boost-filesystem=boost_filesystem-gcc-mt ]),

        [

        if test "$withval" = "no"; then

			want_boost="no"

        elif test "$withval" = "yes"; then

            want_boost="yes"

            ax_boost_user_filesystem_lib=""

        else

		    want_boost="yes"

		ax_boost_user_filesystem_lib="$withval"

		fi

        ],

        [want_boost="yes"]

	)



	if test "x$want_boost" = "xyes"; then

        AC_REQUIRE([AC_PROG_CC])

		CPPFLAGS_SAVED="$CPPFLAGS"

		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"

		export CPPFLAGS



		LDFLAGS_SAVED="$LDFLAGS"

		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"

		export LDFLAGS



		LIBS_SAVED=$LIBS

		LIBS="$LIBS $BOOST_SYSTEM_LIB"

		export LIBS



        AC_CACHE_CHECK(whether the Boost::Filesystem library is available,

					   ax_cv_boost_filesystem,

        [AC_LANG_PUSH([C++])

         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],

                                   [[using namespace boost::filesystem;

                                   path my_path( "foo/bar/data.txt" );

                                   return 0;]])],

					       ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)

         AC_LANG_POP([C++])

		])

		if test "x$ax_cv_boost_filesystem" = "xyes"; then

			AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])

            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`

            if test "x$ax_boost_user_filesystem_lib" = "x"; then

                for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do

                     ax_lib=${libextension}

				    AC_CHECK_LIB($ax_lib, exit,

                                 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],

                                 [link_filesystem="no"])

				done

                if test "x$link_filesystem" != "xyes"; then

                for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do

                     ax_lib=${libextension}

				    AC_CHECK_LIB($ax_lib, exit,

                                 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],

                                 [link_filesystem="no"])

				done

		    fi

            else

               for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do

				      AC_CHECK_LIB($ax_lib, exit,

                                   [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],

                                   [link_filesystem="no"])

                  done



            fi

            if test "x$ax_lib" = "x"; then

                AC_MSG_ERROR(Could not find a version of the library!)

            fi

			if test "x$link_filesystem" != "xyes"; then

				AC_MSG_ERROR(Could not link against $ax_lib !)

			fi

		fi



		CPPFLAGS="$CPPFLAGS_SAVED"

		LDFLAGS="$LDFLAGS_SAVED"

		LIBS="$LIBS_SAVED"

	fi

])