[gnutls-devel] [PATCH] build: fix librt requirement

[Alon Bar-Lev]

Please see[1]

[1] https://bugs.gentoo.org/show_bug.cgi?id=494940


On Sun, Dec 22, 2013 at 9:47 PM, Alon Bar-Lev <alon.barlev at gmail.com> wrote:

> The librt is added by the gl m4 macros, AC_CHECK_FUNCS to will not fail
> to find functions.
>
> Move the AC_CHECK_FUNCS above gl initialization.
>
> Signed-off-by: Alon Bar-Lev <alon.barlev at gmail.com>
> ---
>  configure.ac | 73
> ++++++++++++++++++++++++++++++++----------------------------
>  1 file changed, 39 insertions(+), 34 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index fadb954..b8eefc2 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -149,6 +149,45 @@ AM_GNU_GETTEXT_VERSION([0.18])
>
>  AC_C_BIGENDIAN
>
> +dnl No fork on MinGW, disable some self-tests until we fix them.
> +dnl Check clock_gettime and pthread_mutex_lock in libc (avoid linking to
> other libs)
> +AC_CHECK_FUNCS([fork getrusage getpwuid_r nanosleep daemon getpid
> clock_gettime pthread_mutex_lock iconv localtime vasprintf],,)
> +AM_CONDITIONAL(HAVE_FORK, test "$ac_cv_func_fork" != "no")
> +
> +AC_LIB_HAVE_LINKFLAGS(rt,, [#include <time.h>
> +#include <signal.h>
> +], [timer_create (0,0,0);])
> +
> +if test "$ac_cv_func_pthread_mutex_lock" != "yes";then
> +  AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>],
> [pthread_mutex_lock (0);])
> +fi
> +
> +if test "$ac_cv_func_nanosleep" != "yes";then
> +  AC_LIB_HAVE_LINKFLAGS(rt,, [#include <time.h>], [nanosleep (0, 0);])
> +  gnutls_needs_librt=yes
> +fi
> +
> +if test "$ac_cv_func_clock_gettime" != "yes";then
> +  AC_LIB_HAVE_LINKFLAGS(rt,, [#include <time.h>], [clock_gettime (0, 0);])
> +  gnutls_needs_librt=yes
> +fi
> +
> +ac_have_unicode=no
> +if test "$ac_cv_func_iconv" != "yes";then
> +  AC_LIB_HAVE_LINKFLAGS(iconv,, [#include <iconv.h>], [iconv (0, 0, 0, 0,
> 0);])
> +  if test "$HAVE_LIBICONV" = "yes";then
> +    ac_have_unicode=yes
> +  fi
> +else
> +  ac_have_unicode=yes
> +fi
> +
> +if test "$ac_have_unicode" != "yes";then
> +  if test "$have_win" = "yes";then
> +    ac_have_unicode=yes
> +  fi
> +fi
> +
>  gl_INIT
>  ggl_INIT
>
> @@ -224,40 +263,6 @@ AC_LIBTOOL_WIN32_DLL
>  AC_PROG_LIBTOOL
>
>
> -dnl No fork on MinGW, disable some self-tests until we fix them.
> -dnl Check clock_gettime and pthread_mutex_lock in libc (avoid linking to
> other libs)
> -AC_CHECK_FUNCS([fork getrusage getpwuid_r nanosleep daemon getpid
> clock_gettime pthread_mutex_lock iconv localtime vasprintf],,)
> -AM_CONDITIONAL(HAVE_FORK, test "$ac_cv_func_fork" != "no")
> -
> -AC_LIB_HAVE_LINKFLAGS(rt,, [#include <time.h>
> -#include <signal.h>
> -], [timer_create (0,0,0);])
> -
> -if test "$ac_cv_func_pthread_mutex_lock" != "yes";then
> -  AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>],
> [pthread_mutex_lock (0);])
> -fi
> -
> -if test "$ac_cv_func_nanosleep" != "yes";then
> -  AC_LIB_HAVE_LINKFLAGS(rt,, [#include <time.h>], [nanosleep (0, 0);])
> -  gnutls_needs_librt=yes
> -fi
> -
> -ac_have_unicode=no
> -if test "$ac_cv_func_iconv" != "yes";then
> -  AC_LIB_HAVE_LINKFLAGS(iconv,, [#include <iconv.h>], [iconv (0, 0, 0, 0,
> 0);])
> -  if test "$HAVE_LIBICONV" = "yes";then
> -    ac_have_unicode=yes
> -  fi
> -else
> -  ac_have_unicode=yes
> -fi
> -
> -if test "$ac_have_unicode" != "yes";then
> -  if test "$have_win" = "yes";then
> -    ac_have_unicode=yes
> -  fi
> -fi
> -
>  AC_MSG_CHECKING([whether to build libdane])
>  AC_ARG_ENABLE(libdane,
>      AS_HELP_STRING([--disable-libdane],
> --
> 1.8.3.2
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/attachments/20131222/420db50f/attachment.html>