diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-01-06 20:12:13 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-01-06 20:12:13 +0000 |
| commit | a0ea6f10629730e343169614c7c3935048cbf16b (patch) | |
| tree | ec823176cf8e54daf2691b41fdef1d26e0f1d923 /aclocal/target.m4 | |
| parent | 2002-02-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-a0ea6f10629730e343169614c7c3935048cbf16b.tar.bz2 | |
2002-02-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/check-newlib.m4: Apply AS_IF.
* aclocal/config-subdirs.m4: Remove _RTEMS_PUSH_BUILDDIR,
_RTEMS_POP_BUILDDIR, _RTEMS_GIVEN_INSTALL, _RTEMS_SUB_SRCDIR.
* aclocal/subdirs.m4: Fix comments, apply AS_IF.
* aclocal/sysv-ipc.m4: Reflect autoconf-2.5x canonicalization
changes.
* aclocal/target.m4: Add _RTEMS_PUSH_BUILDDIR, _RTEMS_POP_BUILDDIR,
_RTEMS_GIVEN_INSTALL, _RTEMS_SUB_SRCDIR.
* automake/compile.am: Remove librtemsall from LINK_FILES.
Diffstat (limited to 'aclocal/target.m4')
| -rw-r--r-- | aclocal/target.m4 | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/aclocal/target.m4 b/aclocal/target.m4 index 5c0d67d0ea..6a23ea82c1 100644 --- a/aclocal/target.m4 +++ b/aclocal/target.m4 @@ -88,3 +88,66 @@ rtems_configure_args="$ac_configure_args" ## FIXME: This is obsolete. Only kept for backward compatibility AU_DEFUN([RTEMS_OUTPUT_BUILD_SUBDIRS],[]) + + +dnl +dnl Misc utility macros for subdir handling to work around missing abilities +dnl in autoconf, automake and structural issues with RTEMS +dnl +dnl Contains parts derived from autoconf-2.13 AC_OUTPUT_SUBDIRS and Cygnus' +dnl configure.in. +dnl + +dnl +dnl _RTEMS_PUSH_BUILDDIR(SUBDIR) +dnl +AC_DEFUN(_RTEMS_PUSH_BUILDDIR, +[ +# _RTEMS_PUSH_BUILDDIR + echo configuring in $1 + case "$srcdir" in + .) ;; + *) AS_MKDIR_P([$1]) + ;; + esac + + ac_popdir=`pwd` + cd $1 +]) + +dnl +dnl _RTEMS_POP_BUILDDIR +dnl +AC_DEFUN(_RTEMS_POP_BUILDDIR, +[ + cd $ac_popdir +]) + +dnl +dnl _RTEMS_GIVEN_INSTALL +dnl +AC_DEFUN(_RTEMS_GIVEN_INSTALL, +[ +ifdef([AC_PROVIDE_AC_PROG_INSTALL],[ + case "$ac_given_INSTALL" in + [[\\/]]* | ?:[[\\/]]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac +])dnl +]) + +dnl +dnl _RTEMS_SUB_SRCDIR(AC_CONFIG_DIR[,TARGET_SUBDIR]) +dnl +AC_DEFUN(_RTEMS_SUB_SRCDIR,[ +# _RTEMS_SUB_SRCDIR + _RTEMS_ADJUST_SRCDIR(ac_sub_srcdir,$1,$2) + + # Check for configure + if test -f $ac_sub_srcdir/configure; then + ac_sub_configure=$ac_sub_srcdir/configure + else + AC_MSG_WARN([no configuration information is in $1]) + ac_sub_configure= + fi +]) |