Changeset 07da959 in rtems

Timestamp:

Jul 8, 2003, 3:27:02 PM (19 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

b5825ab

Parents:

44c889a

Message:

2003-07-08 Ralf Corsepius <corsepiu@…>

• configure.ac: Merge-in libcsupport/configure.ac.
• Makefile.am: Add libcsupport to SUBDIRS.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• configure.ac (modified) (6 diffs)

cpukit/ChangeLog

@@ +1 @@
+2003-07-08      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * configure.ac: Merge-in libcsupport/configure.ac.
+        * Makefile.am: Add libcsupport to SUBDIRS.
+
 2003-07-08      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

cpukit/Makefile.am

@@ -8 +8 @@
 
 SUBDIRS = . include ada score rtems sapi posix itron
-SUBDIRS += libblock libfs
+SUBDIRS += libcsupport libblock libfs
 SUBDIRS += libnetworking
 SUBDIRS += @subdirs@ 

cpukit/configure.ac

@@ -49 +49 @@
 
 RTEMS_CPU_SUBDIRS([score/cpu])
-AC_CONFIG_SUBDIRS([libcsupport])
 
 AS_IF([test x"$HAS_NETWORKING" = x"yes"],[
@@ -64 +63 @@
   ])
 ])
+
 AC_ARG_ENABLE([ada],
 [AC_HELP_STRING([--enable-ada],[enable ada support])],
@@ -82 +82 @@
   test -n "${enable_unixlib}" || enable_unixlib="yes"
 ])
-
 
 AS_IF([test x"${enable_unixlib}" = x"yes"],
@@ -152 +151 @@
 ])
 
+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)
+
+
+# ... far too many conditionals ...
 AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"])
 AM_CONDITIONAL(UNIX,[test x"${RTEMS_CPU}" = x"unix"])
+AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes")
 
 AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" )
@@ -169 +220 @@
 AM_CONDITIONAL(RTEMS_ADA,[test x"$enable_ada" = x"yes" \
   && test x"$HAS_POSIX_API" = x"yes"])
+
+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_CONDITIONAL([LIBSHELL],[test x"$HAVE_ASSIGNABLE_STDIO" = x"yes"])
@@ -189 +244 @@
 libfs/src/imfs/Makefile
 libfs/src/dosfs/Makefile
+libcsupport/Makefile
 libnetworking/Makefile
 libnetworking/lib/Makefile