cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update some m4 scripts

Browse Source
This commit is contained in:
Frank Denis 2016-12-29 08:16:17 +01:00
parent f31a4b759d
commit 0b10be1092
4 changed files with 286 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
m4/ax_check_compile_flag.m4
View File

@ -53,7 +53,7 @@
# modified version of the Autoconf Macro, you may extend this special # modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well. # exception to the GPL to apply to your modified version as well.
#serial 2 #serial 4
AC_DEFUN([AX_CHECK_COMPILE_FLAG], AC_DEFUN([AX_CHECK_COMPILE_FLAG],
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF

44
m4/ax_check_gnu_make.m4
View File

@ -8,12 +8,18 @@
# #
# DESCRIPTION # DESCRIPTION
# #
# This macro searches for a GNU version of make. If a match is found, the # This macro searches for a GNU version of make. If a match is found:
# makefile variable `ifGNUmake' is set to the empty string, otherwise it #
# is set to "#". This is useful for including a special features in a # * The makefile variable `ifGNUmake' is set to the empty string, otherwise
# Makefile, which cannot be handled by other versions of make. The # it is set to "#". This is useful for including a special features in a
# variable _cv_gnu_make_command is set to the command to invoke GNU make # Makefile, which cannot be handled by other versions of make.
# if it exists, the empty string otherwise. # * The variable `_cv_gnu_make_command` is set to the command to invoke
# GNU make if it exists, the empty string otherwise.
# * The variable `ax_cv_gnu_make_command` is set to the command to invoke
# GNU make by copying `_cv_gnu_make_command`, otherwise it is unset.
# * If GNU Make is found, its version is extracted from the output of
# `make --version` as the last field of a record of space-separated
# columns and saved into the variable `ax_check_gnu_make_version`.
# #
# Here is an example of its use: # Here is an example of its use:
# #
@ -48,31 +54,31 @@
# LICENSE # LICENSE
# #
# Copyright (c) 2008 John Darrington <j.darrington@elvis.murdoch.edu.au> # Copyright (c) 2008 John Darrington <j.darrington@elvis.murdoch.edu.au>
# Copyright (c) 2015 Enrico M. Crisostomo <enrico.m.crisostomo@gmail.com>
# #
# Copying and distribution of this file, with or without modification, are # Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice # permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 7 #serial 8
AC_DEFUN([AX_CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command, AC_DEFUN([AX_CHECK_GNU_MAKE],dnl
_cv_gnu_make_command='' ; [AC_PROG_AWK
AC_CACHE_CHECK([for GNU make],[_cv_gnu_make_command],[dnl
_cv_gnu_make_command="" ;
dnl Search all the common names for GNU make dnl Search all the common names for GNU make
for a in "$MAKE" make gmake gnumake ; do for a in "$MAKE" make gmake gnumake ; do
if test -z "$a" ; then continue ; fi ; if test -z "$a" ; then continue ; fi ;
if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then if "$a" --version 2> /dev/null | grep GNU 2>&1 > /dev/null ; then
_cv_gnu_make_command=$a ; _cv_gnu_make_command=$a ;
AX_CHECK_GNU_MAKE_HEADLINE=$("$a" --version 2> /dev/null | grep "GNU Make")
ax_check_gnu_make_version=$(echo ${AX_CHECK_GNU_MAKE_HEADLINE} | ${AWK} -F " " '{ print $(NF); }')
break ; break ;
fi fi
done ; done ;])
) ;
dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise
if test "x$_cv_gnu_make_command" != "x" ; then AS_VAR_IF([_cv_gnu_make_command], [""], [AS_VAR_SET([ifGNUmake], ["#"])], [AS_VAR_SET([ifGNUmake], [""])])
ifGNUmake='' ; AS_VAR_IF([_cv_gnu_make_command], [""], [AS_UNSET(ax_cv_gnu_make_command)], [AS_VAR_SET([ax_cv_gnu_make_command], [${_cv_gnu_make_command}])])
else AC_SUBST([ifGNUmake])
ifGNUmake='#' ;
AC_MSG_RESULT("Not found");
fi
AC_SUBST(ifGNUmake)
]) ])

2
m4/ax_check_link_flag.m4
View File

@ -53,7 +53,7 @@
# modified version of the Autoconf Macro, you may extend this special # modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well. # exception to the GPL to apply to your modified version as well.
#serial 2 #serial 4
AC_DEFUN([AX_CHECK_LINK_FLAG], AC_DEFUN([AX_CHECK_LINK_FLAG],
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF

4
m4/ax_pthread.m4
View File

@ -82,7 +82,7 @@
# modified version of the Autoconf Macro, you may extend this special # modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well. # exception to the GPL to apply to your modified version as well.
#serial 22 #serial 23
AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
AC_DEFUN([AX_PTHREAD], [ AC_DEFUN([AX_PTHREAD], [
@ -212,7 +212,7 @@ case $host_os in
ax_pthread_check_macro="_REENTRANT" ax_pthread_check_macro="_REENTRANT"
;; ;;
aix* | freebsd*) aix*)
ax_pthread_check_macro="_THREAD_SAFE" ax_pthread_check_macro="_THREAD_SAFE"
;; ;;