diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-04-08 11:20:48 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-04-08 11:20:48 +0000 |
| commit | 640432200b57b21f5112958b90cd69e9f231e182 (patch) | |
| tree | d17472996f72bb011136b9ff4113c4197fa357cd /Build/source | |
| parent | 83593c4c0bfefd3cf86199c522c62e33fbb5d867 (diff) | |
pixman: Better handling of missing sqrtf(), from Mojca Miklavec
git-svn-id: svn://tug.org/texlive/trunk@29738 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/libs/pixman/ChangeLog | 4 | ||||
| -rwxr-xr-x | Build/source/libs/pixman/configure | 5 | ||||
| -rw-r--r-- | Build/source/libs/pixman/configure.ac | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog index 0faa649f52d..7d7a931ee77 100644 --- a/Build/source/libs/pixman/ChangeLog +++ b/Build/source/libs/pixman/ChangeLog @@ -1,3 +1,7 @@ +2013-04-08 Mojca Miklavec <mojca.miklavec.lists@gmail.com> + + * configure.ac: Better handling of sqrtf(). + 2013-04-07 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Define sqrtf as sqrt on systems without sqrtf(). diff --git a/Build/source/libs/pixman/configure b/Build/source/libs/pixman/configure index 4534ecdfc46..3cd34ab5e15 100755 --- a/Build/source/libs/pixman/configure +++ b/Build/source/libs/pixman/configure @@ -12670,9 +12670,7 @@ ac_res=$ac_cv_search_sqrtf if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -fi - -if test "x$ac_cv_search_sqrtf" = xno; then +else $as_echo "#define sqrtf sqrt" >>confdefs.h @@ -12680,6 +12678,7 @@ fi + ac_fn_c_check_decl "$LINENO" "SIZE_MAX" "ac_cv_have_decl_SIZE_MAX" "$ac_includes_default" if test "x$ac_cv_have_decl_SIZE_MAX" = xyes; then : diff --git a/Build/source/libs/pixman/configure.ac b/Build/source/libs/pixman/configure.ac index 511748e10dd..2532a71b3d3 100644 --- a/Build/source/libs/pixman/configure.ac +++ b/Build/source/libs/pixman/configure.ac @@ -53,11 +53,9 @@ dnl add all these to config.h.in but do not define them in config.h [Whether the tool chain supports __attribute__((constructor))]) fi -AC_SEARCH_LIBS([sqrtf], [m]) -if test "x$ac_cv_search_sqrtf" = xno; then - AC_DEFINE([sqrtf], [sqrt], - [Define to sqrt if you do not have the `sqrtf' function.]) -fi +AC_SEARCH_LIBS([sqrtf], [m], [], + [AC_DEFINE([sqrtf], [sqrt], + [Define to sqrt if you do not have the `sqrtf' function.])]) dnl PIXMAN_LINK_WITH_ENV(env-setup, program, true-action, false-action) dnl |