diff options
Diffstat (limited to 'Build/source/utils/axodraw2')
-rw-r--r-- | Build/source/utils/axodraw2/ChangeLog | 8 | ||||
-rw-r--r-- | Build/source/utils/axodraw2/ac/withenable.ac | 6 | ||||
-rwxr-xr-x | Build/source/utils/axodraw2/configure | 20 | ||||
-rw-r--r-- | Build/source/utils/axodraw2/configure.ac | 10 |
4 files changed, 26 insertions, 18 deletions
diff --git a/Build/source/utils/axodraw2/ChangeLog b/Build/source/utils/axodraw2/ChangeLog index 7a3000318c1..92371f1d65c 100644 --- a/Build/source/utils/axodraw2/ChangeLog +++ b/Build/source/utils/axodraw2/ChangeLog @@ -1,3 +1,11 @@ +2020-06-07 Karl Berry <karl@freefriends.org> + + * configure.ac, + * ac/withenable.ac: omit $Id$ from generated output. + + * configure.ac (AC_CHECK_LIB([m]): check for erf, not sqrt. + (Missed this in earlier changes in other dirs.) + 2019-09-07 Akira Kakuto <kakuto@w32tex.org> Import v1.3 from ctan.org/pkg/axodraw2. diff --git a/Build/source/utils/axodraw2/ac/withenable.ac b/Build/source/utils/axodraw2/ac/withenable.ac index 8208d94b072..8bfeb759b5f 100644 --- a/Build/source/utils/axodraw2/ac/withenable.ac +++ b/Build/source/utils/axodraw2/ac/withenable.ac @@ -1,7 +1,7 @@ -## utils/autosp/ac/withenable.ac: configure.ac fragment for TeX Live subdir -## $Id$ +## utils/axodraw2/ac/withenable.ac: configure.ac fragment for TL subdir +dnl $Id$ dnl -dnl Copyright 2018 Karl Berry <tex-live@tug.org> +dnl Copyright 2018-2020 Karl Berry <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries for axodraw2. diff --git a/Build/source/utils/axodraw2/configure b/Build/source/utils/axodraw2/configure index 3c60d0d64fa..6eef9a8b333 100755 --- a/Build/source/utils/axodraw2/configure +++ b/Build/source/utils/axodraw2/configure @@ -3616,9 +3616,9 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 -$as_echo_n "checking for sqrt in -lm... " >&6; } -if ${ac_cv_lib_m_sqrt+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for erf in -lm" >&5 +$as_echo_n "checking for erf in -lm... " >&6; } +if ${ac_cv_lib_m_erf+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3632,27 +3632,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char sqrt (); +char erf (); int main () { -return sqrt (); +return erf (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_sqrt=yes + ac_cv_lib_m_erf=yes else - ac_cv_lib_m_sqrt=no + ac_cv_lib_m_erf=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 -$as_echo "$ac_cv_lib_m_sqrt" >&6; } -if test "x$ac_cv_lib_m_sqrt" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_erf" >&5 +$as_echo "$ac_cv_lib_m_erf" >&6; } +if test "x$ac_cv_lib_m_erf" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 _ACEOF diff --git a/Build/source/utils/axodraw2/configure.ac b/Build/source/utils/axodraw2/configure.ac index a7c325de032..1d381273530 100644 --- a/Build/source/utils/axodraw2/configure.ac +++ b/Build/source/utils/axodraw2/configure.ac @@ -1,7 +1,7 @@ -# $Id$ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. -dnl Copyright 2018 John Collins +dnl $Id$ +dnl -*- Autoconf -*- +dnl Process this file with autoconf to produce a configure script. +dnl Copyright 2018-2020 John Collins dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,7 @@ AC_CONFIG_MACRO_DIR([../../m4]) KPSE_BASIC([axodraw2], [no-define]) -AC_CHECK_LIB([m], [sqrt],, +AC_CHECK_LIB([m], [erf],, AC_MSG_ERROR([*** Please install libm on your system ***])) AC_PROG_CC |