Changeset b422de6c in rtems

Timestamp:

Jul 8, 2003, 1:50:16 PM (18 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

44c889a

Parents:

13482e5d

Message:

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

• configure.ac: Merge-in posix/configure.ac. Merge-in itron/configure.ac. Misc. cosmetical changes.
• Makefile.am: Add posix, itron to SUBDIRS.

Location:

cpukit

Files:

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

cpukit/ChangeLog

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

cpukit/Makefile.am

@@ -7 +7 @@
 include $(top_srcdir)/automake/multilib.am
 
-SUBDIRS = . include ada score rtems sapi libblock libfs
+SUBDIRS = . include ada score rtems sapi posix itron
+SUBDIRS += libblock libfs
 SUBDIRS += libnetworking
 SUBDIRS += @subdirs@ 

cpukit/configure.ac

@@ -46 +46 @@
   [INLINEdir="inline"])
 AC_SUBST(INLINEdir)
-AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" )
-AM_CONDITIONAL(MACROS,test x"$INLINEdir" = x"macros" )
-AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" )
-
 AC_DEFINE(RTEMS_VERSION,["][_RTEMS_VERSION]["],[RTEMS version string])
 
-AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes")
-AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes")
-AM_CONDITIONAL(HAS_NETWORKING,test x"$HAS_NETWORKING" = x"yes")
-
-AS_IF([test x"$HAS_POSIX_API" = x"yes"],
-  [AC_CONFIG_SUBDIRS([posix])]
-)
-AS_IF([test x"$HAS_ITRON_API" = x"yes"],
-  [AC_CONFIG_SUBDIRS(itron)]
-)
 RTEMS_CPU_SUBDIRS([score/cpu])
-# FIXME: All ports should have a libscorecpu.a - But the powerpc doesn't!
-AM_CONDITIONAL([LIBSCORECPU],
-[test -f "${srcdir}/score/cpu/${RTEMS_CPU}/cpu.c"])
-
 AC_CONFIG_SUBDIRS([libcsupport])
 
@@ -82 +64 @@
   ])
 ])
-AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"])
-
 AC_ARG_ENABLE([ada],
 [AC_HELP_STRING([--enable-ada],[enable ada support])],
@@ -103 +83 @@
 ])
 
-AM_CONDITIONAL(UNIX,[test x"${RTEMS_CPU}" = x"unix"])
 
 AS_IF([test x"${enable_unixlib}" = x"yes"],
@@ -110 +89 @@
 )
 
+# BSD-isms, used throughout the sources
+# Not really used by this configure script
+# FIXME: They should be eliminated if possible.
 AC_CHECK_FUNCS([strsep strcasecmp snprintf])
+AC_CHECK_FUNCS([bcopy bcmp])
+AC_CHECK_FUNCS([isascii fileno])
 
 AM_CONFIG_HEADER([score/include/rtems/score/cpuopts-tmp.h],[
@@ -168 +152 @@
 ])
 
+AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"])
+AM_CONDITIONAL(UNIX,[test x"${RTEMS_CPU}" = x"unix"])
+
+AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" )
+AM_CONDITIONAL(MACROS,test x"$INLINEdir" = x"macros" )
+AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" )
+
+AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes")
+AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes")
+AM_CONDITIONAL(HAS_NETWORKING,test x"$HAS_NETWORKING" = x"yes")
+
+# FIXME: All ports should have a libscorecpu.a - But the powerpc doesn't!
+AM_CONDITIONAL([LIBSCORECPU],
+[test -f "${srcdir}/score/cpu/${RTEMS_CPU}/cpu.c"])
+
 AM_CONDITIONAL(RTEMS_ADA,[test x"$enable_ada" = x"yes" \
   && test x"$HAS_POSIX_API" = x"yes"])
@@ -175 +174 @@
 
 # Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
+AC_CONFIG_FILES([
+Makefile
 include/Makefile
+ada/Makefile
 rtems/Makefile
 sapi/Makefile
 score/Makefile
 score/cpu/Makefile
-])
-
-AC_CONFIG_FILES([libblock/Makefile])
-
-AC_CONFIG_FILES([libfs/Makefile
+posix/Makefile
+itron/Makefile
+libblock/Makefile
+libfs/Makefile
 libfs/src/Makefile
 libfs/src/imfs/Makefile
-libfs/src/dosfs/Makefile])
-
-AC_CONFIG_FILES([libnetworking/Makefile
+libfs/src/dosfs/Makefile
+libnetworking/Makefile
 libnetworking/lib/Makefile
 libnetworking/libc/Makefile
-libnetworking/wrapup/Makefile])
-
-AC_CONFIG_FILES([ada/Makefile])
-
-AC_CONFIG_FILES([libmisc/Makefile
+libnetworking/wrapup/Makefile
+libmisc/Makefile
 libmisc/cpuuse/Makefile
 libmisc/shell/Makefile
@@ -211 +207 @@
 libmisc/mw-fb/Makefile
 libmisc/wrapup/Makefile
-])
-
-AC_CONFIG_FILES([wrapup/Makefile])
+
+wrapup/Makefile
+])
 
 AC_OUTPUT