From bc839d2a419442d0bd9aac0066d5e67fe0fe7ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Sat, 25 May 2019 09:55:50 +0200 Subject: [PATCH] aclocal: fix typo in test for complex float --- src/aclocal.m4 | 9 ++++++--- src/configure | 26 ++++++++++---------------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/aclocal.m4 b/src/aclocal.m4 index ac80f587e..4efef743d 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -9,8 +9,8 @@ AC_DEFUN([ECL_COMPLEX_C99],[ [enable_c99complex=no], [#include ]) fi - dnl some retarded platforms (*cough* Android *cough*) have complex - dnl types defined, but not all corresponding numeric functions + dnl Android have complex types defined, but not all corresponding + dnl numeric functions. if test "$enable_c99complex" != "no" ; then AC_CHECK_FUNCS([crealf creal creall cimagf cimag cimagl] \ [cabsf cabs cabsl conjf conj conjl csqrtf csqrt csqrtl] \ @@ -18,12 +18,15 @@ AC_DEFUN([ECL_COMPLEX_C99],[ [ccoshf ccosh ccoshl csinhf csinh csinhl ctanhf ctanh ctanhl] \ [cexpf cexp cexpl cpowf cpow cpowl clogf clog clogl] \ [casinf casin casinl cacosf cacos cacosl catanf catan catanl] \ - [casinhf casinh casinhl cacoshf cacosh cacoshl catanhf catanh catanhl] \ + [casinhf casinh casinhl cacoshf cacosh cacoshl catanhf catanh catanhl], [], [enable_c99complex=no]) fi if test "$enable_c99complex" != "no" ; then AC_DEFINE([ECL_COMPLEX_FLOAT], [], [ECL_COMPLEX_FLOAT]) + AC_MSG_RESULT("C99 Complex Float support is available") + else + AC_MSG_RESULT("C99 Complex Float support is not available") fi]) dnl -------------------------------------------------------------- diff --git a/src/configure b/src/configure index 40619fbdc..457f283a3 100755 --- a/src/configure +++ b/src/configure @@ -740,7 +740,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -866,7 +865,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1119,15 +1117,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1265,7 +1254,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1418,7 +1407,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -8266,8 +8254,7 @@ fi ccoshf ccosh ccoshl csinhf csinh csinhl ctanhf ctanh ctanhl \ cexpf cexp cexpl cpowf cpow cpowl clogf clog clogl \ casinf casin casinl cacosf cacos cacosl catanf catan catanl \ - casinhf casinh casinhl cacoshf cacosh cacoshl catanhf catanh catanhl \ - + casinhf casinh casinhl cacoshf cacosh cacoshl catanhf catanh catanhl do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -8275,7 +8262,9 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - enable_c99complex=no + +else + enable_c99complex=no fi done @@ -8284,6 +8273,11 @@ done $as_echo "#define ECL_COMPLEX_FLOAT /**/" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"C99 Complex Float support is available\"" >&5 +$as_echo "\"C99 Complex Float support is available\"" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"C99 Complex Float support is not available\"" >&5 +$as_echo "\"C99 Complex Float support is not available\"" >&6; } fi