diff options
| -rw-r--r-- | cpukit/libcsupport/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/libcsupport/Makefile.am | 14 | ||||
| -rw-r--r-- | cpukit/libcsupport/configure.ac | 86 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/config.h | 5 |
4 files changed, 18 insertions, 94 deletions
diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog index a067b7b23c..ee0b4153ac 100644 --- a/cpukit/libcsupport/ChangeLog +++ b/cpukit/libcsupport/ChangeLog @@ -1,3 +1,10 @@ +2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Remove (Merged-in into ../configure.ac) + * Makefile.am: DOC_FILES = src/TODO src/CASES, + Reflect having merged configure.ac into ../configure.ac. + * src/config.h: New. + 2003-07-02 Chris Johns <cjohns@cybertec.com.au> * include/rtems/libio.h, src/termios.c: Patch by Chris Johns diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index d9ea99770b..41497338ad 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -2,11 +2,9 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../aclocal - -include $(top_srcdir)/../automake/multilib.am -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am +include $(top_srcdir)/automake/multilib.am +include $(top_srcdir)/automake/compile.am +include $(top_srcdir)/automake/lib.am include_HEADERS = include/chain.h include/console.h include/clockdrv.h \ include/iosupp.h include/ringbuf.h include/rtc.h \ @@ -98,7 +96,7 @@ all-local: $(PREINSTALL_FILES) LIB = ${ARCH}/libcsupport.a -AM_CPPFLAGS += -Isrc +AM_CPPFLAGS += -I$(srcdir)/src ERROR_C_FILES = src/error.c @@ -174,9 +172,9 @@ ${ARCH}/%.$(OBJEXT): src/%.c $(LIB): ${OBJS} $(make-library) -DOC_FILES = TODO CASES +DOC_FILES = src/TODO src/CASES EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ $(UNIX_C_FILES) -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/libcsupport/configure.ac b/cpukit/libcsupport/configure.ac deleted file mode 100644 index ec2d3e2430..0000000000 --- a/cpukit/libcsupport/configure.ac +++ /dev/null @@ -1,86 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ(2.57) -AC_INIT([rtems-cpukit-lib],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) -AC_CONFIG_SRCDIR([src]) -RTEMS_TOP(../..) - -RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2]) -AM_MAINTAINER_MODE - -RTEMS_ENV_RTEMSCPU - -RTEMS_CHECK_CPU -RTEMS_CANONICAL_HOST - -RTEMS_PROG_CC_FOR_TARGET -RTEMS_CANONICALIZE_TOOLS -AC_PROG_RANLIB - -RTEMS_CHECK_NEWLIB -RTEMS_CHECK_MULTIPROCESSING - -AM_CONDITIONAL(UNIX,test x"$RTEMS_CPU" = x"unix") -AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes") - -AS_IF([test x"$RTEMS_USE_NEWLIB" != x"yes"],[ -## Provide headers only if the host doesn't. - AC_CHECK_HEADERS([sys/cdefs.h],[NEED_SYS_CDEFS_H=no],[NEED_SYS_CDEFS_H=yes]) - AC_CHECK_HEADERS([stdint.h],[NEED_STDINT_H=no],[NEED_STDINT_H=yes]) - AC_CHECK_HEADERS([inttypes.h],[NEED_INTTYPES_H=no],[NEED_INTTYPES=yes]) -],[ -## Using newlib, we provide sys/cdefs.h - NEED_SYS_CDEFS_H=yes - NEED_STDINT_H=yes - NEED_INTTYPES_H=yes -]) - -# FIXME: These checks are only in here to provide -# configuration-time diagnostics and are not really used. -AC_CHECK_DECLS([_POSIX_LOGIN_NAME_MAX],,,[#include <limits.h>]) -AC_CHECK_DECLS([CHAR_BIT],,,[#include <limits.h>]) - -AS_IF([test x"${RTEMS_USE_NEWLIB}" = x"yes"],[ -ac_cv_have_decl_XTABS=yes -ac_cv_have_decl_OLCUC=yes -## SUSV3, but seemingly not available on some platforms (reportedly FreeBSD) -ac_cv_have_decl_ONLRET=yes -ac_cv_have_decl_ONOCR=yes -ac_cv_have_decl_TABDLY=yes -ac_cv_have_decl_OCRNL=yes -ac_cv_have_decl_IUCLC=yes -## SUSV3-XSI extension -ac_cv_have_decl_ECHOPRT=yes -]) - -# FIXME: Some cruft to work around portability issues with termios.c -## Seemingly not covered by any standard. -AC_CHECK_DECLS([XTABS],,,[#include <termios.h>]) -AC_CHECK_DECLS([OLCUC],,,[#include <termios.h>]) -## SUSV3, but seemingly not available on some platforms (reportedly FreeBSD) -AC_CHECK_DECLS([ONLRET],,,[#include <termios.h>]) -AC_CHECK_DECLS([ONOCR],,,[#include <termios.h>]) -AC_CHECK_DECLS([TABDLY],,,[#include <termios.h>]) -AC_CHECK_DECLS([OCRNL],,,[#include <termios.h>]) -AC_CHECK_DECLS([IUCLC],,,[#include <termios.h>]) -## SUSV3-XSI extension -AC_CHECK_DECLS([ECHOPRT],,,[#include <termios.h>]) - -## BSD-ism, excluded from POSIX, but available on most platforms -AC_CHECK_DECLS([sbrk],,,[#include <unistd.h>]) - -## Check if libc provides BSD's strlcpy/strlcat -AC_CHECK_FUNCS(strlcpy strlcat) - -AM_CONDITIONAL([NEED_SYS_CDEFS_H],[test x"$NEED_SYS_CDEFS_H" = x"yes"]) -AM_CONDITIONAL([NEED_STDINT_H],[test x"$NEED_STDINT_H" = x"yes"]) -AM_CONDITIONAL([NEED_INTTYPES_H],[test x"$NEED_INTTYPES_H" = x"yes"]) - -AM_CONFIG_HEADER([src/config.h]) - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/cpukit/libcsupport/src/config.h b/cpukit/libcsupport/src/config.h new file mode 100644 index 0000000000..09fe652e2c --- /dev/null +++ b/cpukit/libcsupport/src/config.h @@ -0,0 +1,5 @@ +/* HACK: + * Pull-in RTEMS global config-header cpuopts.h as local config.h + */ + +#include <rtems/score/cpuopts.h> |