From 87b4f1237ce8ea5417f71a3c4b49e36bf59a7158 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 1 Dec 2010 05:43:07 +0000 Subject: =?UTF-8?q?2010-12-01=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * configure.ac: Check for complex.h. Add AM_CONDITIONAL(HAS_COMPLEX) to allow building with outdated toolchains. * complex/Makefile.am: Apply HAS_COMPLEX. --- testsuites/libtests/ChangeLog | 7 +++++++ testsuites/libtests/complex/Makefile.am | 4 ++++ testsuites/libtests/configure.ac | 3 +++ 3 files changed, 14 insertions(+) (limited to 'testsuites') diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog index e5860afb78..be67058759 100644 --- a/testsuites/libtests/ChangeLog +++ b/testsuites/libtests/ChangeLog @@ -1,3 +1,10 @@ +2010-12-01 Ralf Corsépius + + * 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 * Makefile.am: Add complex, math subdirs. diff --git a/testsuites/libtests/complex/Makefile.am b/testsuites/libtests/complex/Makefile.am index 61154d2ae7..b9a12c5b2e 100644 --- a/testsuites/libtests/complex/Makefile.am +++ b/testsuites/libtests/complex/Makefile.am @@ -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 diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac index dbff9cf136..74ea49396f 100644 --- a/testsuites/libtests/configure.ac +++ b/testsuites/libtests/configure.ac @@ -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 -- cgit v1.2.3