2010-12-01 Ralf Corsépius <ralf.corsepius@rtems.org>

* configure.ac: Check for complex.h.
	Add AM_CONDITIONAL(HAS_COMPLEX) to allow building with outdated
	toolchains.
	* complex/Makefile.am: Apply HAS_COMPLEX.
This commit is contained in:
Ralf Corsepius
2010-12-01 05:43:07 +00:00
parent 95b18d0118
commit 87b4f1237c
3 changed files with 14 additions and 0 deletions

View File

@@ -1,3 +1,10 @@
2010-12-01 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Check for complex.h.
Add AM_CONDITIONAL(HAS_COMPLEX) to allow building with outdated
toolchains.
* complex/Makefile.am: Apply HAS_COMPLEX.
2010-11-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Add complex, math subdirs.

View File

@@ -2,8 +2,10 @@
## $Id$
##
if HAS_COMPLEX
rtems_tests_PROGRAMS = complex
complex_SOURCES = init.c docomplex.c docomplexf.c docomplexl.c
endif
EXTRA_DIST = docomplex.in
# FIXME: Skip long double, not yet supported in newlib
@@ -34,6 +36,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
if HAS_COMPLEX
complex_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) -lm
LINK_OBJS = $(complex_OBJECTS) $(complex_LDADD)
@@ -42,5 +45,6 @@ LINK_LIBS = $(complex_LDLIBS)
complex$(EXEEXT): $(complex_OBJECTS) $(complex_DEPENDENCIES)
@rm -f complex$(EXEEXT)
$(make-exe)
endif
include $(top_srcdir)/../automake/local.am

View File

@@ -31,9 +31,12 @@ RTEMS_CHECK_CXX(RTEMS_BSP)
AC_PROG_LN_S
AC_PATH_PROG([PAX],[pax])
AC_CHECK_HEADERS([complex.h])
AM_CONDITIONAL(TARTESTS,test "$as_ln_s" = "ln -s" && test -n "$PAX")
AM_CONDITIONAL(HAS_CXX,test "$rtems_cv_HAS_CPLUSPLUS" = "yes")
AM_CONDITIONAL([HAS_COMPLEX],[test "$ac_cv_header_COMPLEX_H" = yes])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile