Changeset 789694a1 in rtems for c/src/acinclude.m4

Timestamp:

Feb 20, 2004, 1:22:04 AM (17 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

a922482b

Parents:

fcf0034

Message:

2004-02-20 Ralf Corsepius <corsepiu@…>

• acinclude.m4: Fix loosing arguments when configuring cpukit and testsuites (Was exposed with --enable-multilib, only). Remove RTEMS_SUBCONFIGURE_ARGS_QUOTE. RTEMS_CONFIG_SUBDIR. Add RTEMS_BSP_CONFIG_SUBDIR.
• configure.ac: Reflect changes to acinclude.m4. Reflect new args to testsuites's configure.
• aclocal/rtems-top.m4: Remove ENDIF hack. Rework and fix setting up PROJECT_TOPdir (PACKHEX wasn't found).

File:

• c/src/acinclude.m4 (modified) (2 diffs)

c/src/acinclude.m4

@@ -6 +6 @@
 # subdirectory handling solution is introduced to RTEMS.
 
-AC_DEFUN([RTEMS_SUBCONFIGURE_ARGS_QUOTE],
+AC_DEFUN([_RTEMS_CONFIG_SUBDIR],
 [
-   RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])
-])
-
-AC_DEFUN([RTEMS_CONFIG_SUBDIR],
-[AC_REQUIRE([RTEMS_SUBCONFIGURE_ARGS_QUOTE])
 if test "$no_recursion" != yes; then
   ac_sub_sourcedir=$2
@@ -82 +77 @@
 fi
 ])
+
+## RTEMS_BSP_CONFIG_SUBDIR(builddir,srcdir,configargs,condition)
+AC_DEFUN([RTEMS_BSP_CONFIG_SUBDIR],[
+m4_expand_once([RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args])])
+AS_IF([$4],[BSP_SUBDIRS="$BSP_SUBDIRS $1"])
+AC_CONFIG_COMMANDS_POST([
+AS_IF([$4],[_RTEMS_CONFIG_SUBDIR([$1],[$2],[$3])])])
+])