Skip to content

Commit

Permalink
a few updates
Browse files Browse the repository at this point in the history
  • Loading branch information
wjcunningham7 committed May 17, 2019
1 parent 544b003 commit 65d35dd
Show file tree
Hide file tree
Showing 22 changed files with 130 additions and 379 deletions.
3 changes: 0 additions & 3 deletions .fastmath

This file was deleted.

6 changes: 3 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ ACLOCAL_AMFLAGS = -I m4 --install

SUBDIRS = nint src inc test

lib_LIBRARIES = libfastmath.a
libfastmath_a_LIBADD = nint/nint.o src/FastMath.o src/FastNumInt.o src/stopwatch.o src/progressbar.o
libfastmath_a_SOURCES =
lib_LIBRARIES = libfastmath@PLATFORM@.a
libfastmath@PLATFORM@_a_LIBADD = nint/nint.o src/FastMath.o src/FastNumInt.o src/stopwatch.o src/progressbar.o
libfastmath@PLATFORM@_a_SOURCES =

distclean-local:
rm -rf $(top_builddir)/{autom4te.cache,aclocal.m4,AUTHORS,ChangeLog,config.guess,config.log,config.status,config.sub,configure,depcomp,install-sh,Makefile,Makefile.in,missing,NEWS,.deps,inc/config.h*,inc/Makefile.in,src/.dirstamp,src/Makefile.in,nint/Makefile.in,test/Makefile.in,compile}
7 changes: 4 additions & 3 deletions ax_fastmath.m4
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fi
if [[[ $VALID_FASTMATH == "yes" ]]] ; then
FASTMATH_INCLUDE="-I $FASTMATH_HOME/include"
FASTMATH_LDFLAGS="-L $FASTMATH_HOME/lib -lfastmath"
FASTMATH_LDFLAGS="-L $FASTMATH_HOME/lib -lfastmath$2"
cxx_flags=$CXXFLAGS
ld_flags=$LDFLAGS
Expand All @@ -48,9 +48,10 @@ if [[[ $VALID_FASTMATH == "yes" ]]] ; then
AC_CHECK_HEADER([FastMath.h],, AC_MSG_WARN([Could not find FastMath.h]); VALID_FASTMATH=no, [#include <FastMath.h>])
AC_CHECK_HEADER([nint.h],, AC_MSG_WARN([Could not find nint.h]); VALID_FASTMATH=no, [#include <nint.h>])
AC_CHECK_HEADER([FastNumInt.h],, AC_MSG_WARN([Could not find FastNumInt.h]); VALID_FASTMATH=no, [#include <FastNumInt.h>])
dnl This next line sometimes gives errors for newer compilers, so we will exclude it
AC_CHECK_HEADER([FastBitset.h],, AC_MSG_WARN([Could not find FastBitset.h]); VALID_FASTMATH=no, [#include <FastBitset.h>])
AC_CHECK_HEADER([stopwatch.h],, AC_MSG_WARN([Could not find stopwatch.h]); VALID_FASTMATH=no, [#include <stopwatch.h>])
AC_CHECK_FILE([$FASTMATH_HOME/lib/libfastmath.a],, AC_MSG_WARN([Could not find libfastmath]); VALID_FASTMATH=no)
AC_CHECK_FILE([$FASTMATH_HOME/lib/libfastmath$2.a],, AC_MSG_WARN([Could not find libfastmath]); VALID_FASTMATH=no)
CXXFLAGS=$cxx_flags
LDFLAGS=$ld_flags
Expand All @@ -64,7 +65,7 @@ if [[[ $VALID_FASTMATH == "yes" ]]] ; then
AC_SUBST([FASTMATH_ENABLED], [yes])
else
AC_MSG_RESULT([no])
if [[[ "$#" -ge 2 && "$2" == "mandatory" ]]] ; then
if [[[ "$#" -ge 2 && "$3" == "mandatory" ]]] ; then
AC_MSG_ERROR([Fastmath is required for this package.])
fi
fi
Expand Down
348 changes: 0 additions & 348 deletions compile

This file was deleted.

Loading

0 comments on commit 65d35dd

Please sign in to comment.