summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <tpearson@raptorengineering.com>2016-10-02 17:21:47 -0500
committerTimothy Pearson <tpearson@raptorengineering.com>2016-10-02 17:37:25 -0500
commitc3f7d77c7934892c62838a51444b8e70d6ba64ff (patch)
tree938dd3c4723fcff9b6f6e1c761d958e9901e7b6e
parent0809ce7076e662953465f0a8d45127ef763e8e93 (diff)
downloadffts-c3f7d77c7934892c62838a51444b8e70d6ba64ff.zip
ffts-c3f7d77c7934892c62838a51444b8e70d6ba64ff.tar.gz
Fix Autotools build
-rw-r--r--configure.ac4
-rw-r--r--src/Makefile.am5
-rw-r--r--src/ffts.c2
-rw-r--r--src/ffts_internal.h5
4 files changed, 10 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 5f1ff70..bdb19e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.68])
+AC_PREREQ([2.65])
AC_INIT(ffts, 0.7, amb@anthonix.com)
AM_INIT_AUTOMAKE(ffts, 0.7)
@@ -109,7 +109,7 @@ AC_CHECK_DECLS([posix_memalign,
#include <malloc.h>])
# Checks for header files.
-AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
+AC_CHECK_HEADERS([malloc.h stddef.h stdint.h stdlib.h string.h sys/mman.h sys/socket.h sys/time.h unistd.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL
diff --git a/src/Makefile.am b/src/Makefile.am
index aa4c3c3..d309ceb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
lib_LTLIBRARIES = libffts.la
-libffts_la_SOURCES = ffts.c ffts_small.c ffts_nd.c ffts_real.c ffts_real_nd.c patterns.c
+libffts_la_SOURCES = ffts.c ffts_nd.c ffts_real.c ffts_real_nd.c ffts_transpose.c ffts_trig.c ffts_static.c
libffts_la_SOURCES += codegen.h codegen_arm.h codegen_sse.h ffts.h ffts_nd.h ffts_real.h ffts_real_nd.h ffts_small.h ffts_static.h macros-alpha.h macros-altivec.h macros-neon.h macros-sse.h macros.h neon.h neon_float.h patterns.h types.h vfp.h
if DYNAMIC_DISABLED
@@ -14,6 +14,7 @@ endif
libffts_includedir=$(includedir)/ffts
libffts_include_HEADERS = ../include/ffts.h
+AM_CFLAGS = -I$(top_srcdir)/include -DAUTOTOOLS_BUILD=yes
if HAVE_VFP
libffts_la_SOURCES += vfp.s
@@ -28,7 +29,7 @@ endif
else
if HAVE_SSE
-libffts_la_SOURCES += sse.s
+libffts_la_SOURCES += macros-sse.h
endif
endif
endif
diff --git a/src/ffts.c b/src/ffts.c
index 5d72a52..7fa675a 100644
--- a/src/ffts.c
+++ b/src/ffts.c
@@ -536,4 +536,4 @@ ffts_init_1d(size_t N, int sign)
cleanup:
ffts_free_1d(p);
return NULL;
-} \ No newline at end of file
+}
diff --git a/src/ffts_internal.h b/src/ffts_internal.h
index 6b88b35..72ce8af 100644
--- a/src/ffts_internal.h
+++ b/src/ffts_internal.h
@@ -34,7 +34,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef FFTS_INTERNAL_H
#define FFTS_INTERNAL_H
-//#include "config.h"
+#ifdef AUTOTOOLS_BUILD
+#include "config.h"
+#endif
+
#include "ffts_attributes.h"
#include "types.h"
OpenPOWER on IntegriCloud