Changeset 1bcbe41 in rtems

Timestamp:

Nov 27, 2003, 2:36:23 PM (16 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

7cdf8b7e

Parents:

69a6204c

Message:

2003-11-27 Ralf Corsepius <corsepiu@…>

• configure.ac: Use here-documents to generate cpuopts.tmp. Various fixes and changes to argument processing. Reflect changes to librpc Makefile.ams.
• acinclude.m4: Use here-documents to generate cpuopts.tmp.
• aclocal/check-itron.m4: Remove HAS_IRON_API.
• aclocal/check-multiprocessing.m4: Remove HAS_MP.
• aclocal/check-posix.m4: Remove HAS_POSIX_API.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• acinclude.m4 (modified) (1 diff)
• aclocal/check-itron.m4 (modified) (1 diff)
• aclocal/check-multiprocessing.m4 (modified) (1 diff)
• aclocal/check-posix.m4 (modified) (1 diff)
• configure.ac (modified) (8 diffs)

cpukit/ChangeLog

@@ +1 @@
+2003-11-27      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * configure.ac: Use here-documents to generate cpuopts.tmp.
+        Various fixes and changes to argument processing.
+        Reflect changes to librpc Makefile.ams.
+        * acinclude.m4: Use here-documents to generate cpuopts.tmp.
+        * aclocal/check-itron.m4: Remove HAS_IRON_API.
+        * aclocal/check-multiprocessing.m4: Remove HAS_MP.
+        * aclocal/check-posix.m4: Remove HAS_POSIX_API.
+
 2003-11-26      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

cpukit/acinclude.m4

@@ -3 +3 @@
 AC_DEFUN([RTEMS_CPUOPT],
 [
-  echo >> cpuopts.tmp
-  echo "/* $4 */" >> cpuopts.tmp
   if $2; then
-    echo "#define $1 $3" >> cpuopts.tmp
+cat >>cpuopts.tmp <<\_ACEOF
+
+/* $4 */
+#define $1 $3
+_ACEOF
+## FIXME: Duplicate the define to the autoheader
+## Sanity check - Should be removed in future
+    AC_DEFINE([$1],[$3],[$4])
   else
-    echo "/* #undef $1 */" >> cpuopts.tmp
-  fi 
+cat >>cpuopts.tmp <<\_ACEOF
+
+/* $4 */
+/* #undef $1 */
+_ACEOF
+  fi
 ])

cpukit/aclocal/check-itron.m4

@@ -21 +21 @@
       ;;
     esac])
-if test "$rtems_cv_HAS_ITRON_API" = "yes"; then
-  HAS_ITRON_API="yes";
-else
-  HAS_ITRON_API="no";
-fi
-AC_SUBST(HAS_ITRON_API)dnl
 ])
-
-AC_DEFUN([RTEMS_DEFINE_ITRON_API],
-[AC_REQUIRE([RTEMS_CHECK_ITRON_API])dnl
-if test x"${HAS_ITRON_API}" = x"yes";
-then
-  AC_DEFINE_UNQUOTED(RTEMS_ITRON_API,1,[if itron api is supported])
-fi
-])

cpukit/aclocal/check-multiprocessing.m4

@@ -7 +7 @@
 AC_REQUIRE([RTEMS_ENV_RTEMSCPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl
-
-AS_IF([test "$enable_multiprocessing" = "yes"],
-  [HAS_MP="yes"],
-  [HAS_MP="no"])
 ])
-
-AC_DEFUN([RTEMS_DEFINE_MULTIPROCESSING],
-[AC_REQUIRE([RTEMS_CHECK_MULTIPROCESSING])dnl
-if test x"${HAS_MP}" = x"yes";
-then
-  AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is enabled])
-fi
-])

cpukit/aclocal/check-posix.m4

@@ -21 +21 @@
       ;;
     esac])
-if test "$rtems_cv_HAS_POSIX_API" = "yes"; then
-  HAS_POSIX_API="yes";
-else
-  HAS_POSIX_API="no";
-fi
-AC_SUBST(HAS_POSIX_API)dnl
 ])
-
-AC_DEFUN([RTEMS_DEFINE_POSIX_API],
-[AC_REQUIRE([RTEMS_CHECK_POSIX_API])dnl
-AS_IF(
-  [test x"${HAS_POSIX_API}" = x"yes"],
-  [AC_DEFINE_UNQUOTED(RTEMS_POSIX_API,1,[if posix api is supported])])
-])

cpukit/configure.ac

@@ -45 +45 @@
 RTEMS_CHECK_ITRON_API
 RTEMS_CHECK_NETWORKING
-
-AC_DEFINE(RTEMS_VERSION,["][_RTEMS_VERSION]["],[RTEMS version string])
 
 RTEMS_CPU_SUBDIRS([score/cpu])
@@ -69 +67 @@
 esac],[enable_ada=no])
 
-RTEMS_DEFINE_POSIX_API
-RTEMS_DEFINE_ITRON_API
-RTEMS_DEFINE_MULTIPROCESSING
-
 # HACK: We should use a feature-based configuration.
 AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
@@ -86 +80 @@
 AC_CHECK_FUNCS([isascii fileno])
 
-cat << EOF > cpuopts.tmp
+cat >>cpuopts.tmp <<\_ACEOF
 /* target cpu dependent options file */
 /* automatically generated -- DO NOT EDIT!! */
 #ifndef __CPU_OPTIONS_h
 #define __CPU_OPTIONS_h
-EOF
+_ACEOF
 
 RTEMS_CPUOPT([RTEMS_DEBUG],
@@ -114 +108 @@
 
 RTEMS_CPUOPT([RTEMS_MULTIPROCESSING],
-  [test x"$HAS_MP" = "yes"],
+  [test x"$enable_multiprocessing" = x"yes"],
   [1],
   [if multiprocessing is enabled])
@@ -124 +118 @@
 
 RTEMS_CPUOPT([RTEMS_POSIX_API],
-  [test x"$HAS_POSIX_API" = x"yes"],
+  [test x"$rtems_cv_HAS_POSIX_API" = x"yes"],
   [1],
   [if posix api is supported])
@@ -140 +134 @@
 RTEMS_CPUOPT([RTEMS_VERSION],
   [true],
-  [\"]_RTEMS_VERSION[\"],
+  ["]_RTEMS_VERSION["],
   [RTEMS version string])
 
-echo >> cpuopts.tmp
-echo "#endif" >> cpuopts.tmp
+cat >>cpuopts.tmp <<\_ACEOF
+
+#endif
+_ACEOF
 
 AS_MKDIR_P(score/include/rtems/score)
@@ -253 +249 @@
 AM_CONDITIONAL(INLINE,test x"$enable_rtems_inlines" = x"yes" )
 AM_CONDITIONAL(MACROS,test x"$enable_rtems_inlines" = x"no" )
-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_MP,test x"$enable_multiprocessing" = x"yes" )
+
+AM_CONDITIONAL(HAS_POSIX,test x"$rtems_cv_HAS_POSIX_API" = x"yes")
+AM_CONDITIONAL(HAS_ITRON,test x"$rtems_cv_HAS_ITRON_API" = x"yes")
 AM_CONDITIONAL(HAS_NETWORKING,test x"$HAS_NETWORKING" = x"yes")
 
@@ -296 +292 @@
 libnetworking/libc/Makefile
 librpc/Makefile
-librpc/src/Makefile
-librpc/src/xdr/Makefile
-librpc/src/rpc/Makefile
 libmisc/Makefile
 libmisc/cpuuse/Makefile