Improve cpow function test

Issue: #113
dspinellis · Sep 23, 2020 · 719e2d7 · 719e2d7
1 parent 63228a8
commit 719e2d7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/core-tools/configure.ac b/core-tools/configure.ac
@@ -39,6 +39,7 @@ AC_CHECK_HEADERS([stdlib.h])
 
 # Checks for library functions.
 AC_FUNC_MALLOC
+AC_CHECK_FUNCS(cpow)
 
 # Output files
 AC_CONFIG_HEADERS([config.h])
@@ -47,7 +48,6 @@ AC_CONFIG_FILES([Makefile
                  src/Makefile
                  tests/Makefile])
 
-AM_CONDITIONAL([FREEBSD], [test $(uname) = "FreeBSD"])
 AM_CONDITIONAL([LINUX], [test $(uname) = "Linux"])
 AM_CONDITIONAL([DARWIN], [test $(uname) = "Darwin"])
 

diff --git a/core-tools/src/Makefile.am b/core-tools/src/Makefile.am
@@ -1,11 +1,5 @@
 include ../../.config
 
-if FREEBSD
-CPOW = ../../unix-tools/cpow.c
-else
-CPOW =
-endif
-
 if LINUX
 DGSH_ASSEMBLY_FILE=dgsh-elf.s
 else

diff --git a/core-tools/src/dgsh-w.c b/core-tools/src/dgsh-w.c
@@ -10,6 +10,10 @@
 #include "dgsh.h"
 #include "dgsh-debug.h"
 
+#if !defined(HAVE_CPOW)
+#include "../../unix-tools/cpow.c"
+#endif
+
 void
 read_number(int fd, long double *x, long double complex *xc)
 {