summaryrefslogtreecommitdiff
path: root/Build/source/libs/cairo
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-18 17:56:12 +0000
committerKarl Berry <karl@freefriends.org>2020-05-18 17:56:12 +0000
commit8f27344647a2c12386a065fbe62d8935d07c5610 (patch)
tree823a1855ae25f52d6ecd6f616132c2202f500d45 /Build/source/libs/cairo
parentf71aeb3fe9f385a634c46188515206f91c087b82 (diff)
check -lm for erf, not sqrt
git-svn-id: svn://tug.org/texlive/trunk@55198 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/cairo')
-rw-r--r--Build/source/libs/cairo/ChangeLog6
-rwxr-xr-xBuild/source/libs/cairo/configure24
-rw-r--r--Build/source/libs/cairo/configure.ac6
3 files changed, 22 insertions, 14 deletions
diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog
index 1a831e6bd8c..523b843674d 100644
--- a/Build/source/libs/cairo/ChangeLog
+++ b/Build/source/libs/cairo/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-18 Karl Berry <karl@freefriends.org>
+
+ * configure.ac ([m]): check for erf, not sqrt; the latter may
+ be implemented in hardware, so that -lm is wrongly concluded to be
+ unnecessary. E.g., on Solaris. Report from Nelson Beebe.
+
2019-01-09 Luigi Scarso <luigi.scarso@gmail.com>
* configure.ac: Enable pdf surface.
diff --git a/Build/source/libs/cairo/configure b/Build/source/libs/cairo/configure
index a11a7e222bb..14a6c3fdfa2 100755
--- a/Build/source/libs/cairo/configure
+++ b/Build/source/libs/cairo/configure
@@ -5995,9 +5995,9 @@ else
build_FALSE=
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5
-$as_echo_n "checking for library containing sqrt... " >&6; }
-if ${ac_cv_search_sqrt+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing erf" >&5
+$as_echo_n "checking for library containing erf... " >&6; }
+if ${ac_cv_search_erf+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$LIBS
@@ -6010,11 +6010,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char sqrt ();
+char erf ();
int
main ()
{
-return sqrt ();
+return erf ();
;
return 0;
}
@@ -6027,25 +6027,25 @@ for ac_lib in '' m; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_sqrt=$ac_res
+ ac_cv_search_erf=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
- if ${ac_cv_search_sqrt+:} false; then :
+ if ${ac_cv_search_erf+:} false; then :
break
fi
done
-if ${ac_cv_search_sqrt+:} false; then :
+if ${ac_cv_search_erf+:} false; then :
else
- ac_cv_search_sqrt=no
+ ac_cv_search_erf=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrt" >&5
-$as_echo "$ac_cv_search_sqrt" >&6; }
-ac_res=$ac_cv_search_sqrt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_erf" >&5
+$as_echo "$ac_cv_search_erf" >&6; }
+ac_res=$ac_cv_search_erf
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
diff --git a/Build/source/libs/cairo/configure.ac b/Build/source/libs/cairo/configure.ac
index d45775394b3..91604931a9f 100644
--- a/Build/source/libs/cairo/configure.ac
+++ b/Build/source/libs/cairo/configure.ac
@@ -1,6 +1,8 @@
+dnl $Id$
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright 2015-2020 Karl Berry <tex-live@tug.org>
+dnl Copyright 2012-2015 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -45,7 +47,7 @@ AC_CHECK_TYPES([uint64_t, uint128_t, __uint128_t])
AC_CONFIG_HEADERS([config.h cairo-features.h])
AM_CONDITIONAL([build], [test "x$enable_build" != xno])
-AC_SEARCH_LIBS([sqrt], [m])
+AC_SEARCH_LIBS([erf], [m])
CAIRO_FEATURES([dnl
[0, [fc font]],