2004-03-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* aclocal/rtems-top.m4: Add 2nd arg to RTEMS_TOP.
	Rework with_project_root/PROJECT_ROOT and with_project_top/PROJECT_TOPdir.
	Add --enable-rtems-root. Rework RTEMS_ROOT.
This commit is contained in:
Ralf Corsepius
2004-03-25 08:22:14 +00:00
parent e84c2a4643
commit 93a0f2b654
2 changed files with 22 additions and 11 deletions
+6
View File
@@ -1,3 +1,9 @@
2004-03-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/rtems-top.m4: Add 2nd arg to RTEMS_TOP.
Rework with_project_root/PROJECT_ROOT and with_project_top/PROJECT_TOPdir.
Add --enable-rtems-root. Rework RTEMS_ROOT.
2004-03-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/enable-bare.m4, aclocal/enable-cxx.m4,
+16 -11
View File
@@ -21,20 +21,25 @@ AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API])
ENDIF=endif
AC_SUBST(ENDIF)
RTEMS_TOPdir="$1";
AC_SUBST(RTEMS_TOPdir)
AC_SUBST([RTEMS_TOPdir],["$1"])
## with_target_subdirs is handled implicitly by autoconf
dots=`echo $with_target_subdir|\
sed -e 's,^\.$,,' -e 's%^\./%%' -e 's%[[^/]]$%&/%' -e 's%[[^/]]*/%../%g'`
PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
AC_SUBST([PROJECT_TOPdir])
rtems_updir=m4_if([$2],[],[],[$2/])
RTEMS_ROOT=$with_rtems_root`echo "$1/" | sed 's,^../,,'`'$(top_builddir)'
AC_SUBST(RTEMS_ROOT)
AC_ARG_ENABLE([rtems-root],[
AS_HELP_STRING(--enable-rtems-root,directory containing make/custom)],
[case ${enable_rtems_root} in
[[\\/$]]* | ?:[[\\/]]* ) # absolute directory
RTEMS_ROOT=${enable_rtems_root}
;;
*) # relative directory
RTEMS_ROOT=${enable_rtems_root}${rtems_updir}'$(top_builddir)'
;;
esac],
[RTEMS_ROOT=${rtems_updir}'$(top_builddir)'])
AC_SUBST([RTEMS_ROOT])
PROJECT_ROOT=$with_project_root`echo "$1/" | sed 's,^../,,'`'$(top_builddir)'
AC_SUBST(PROJECT_ROOT)
AC_SUBST([PROJECT_TOPdir],[${with_project_top}${rtems_updir}'$(top_builddir)'])
AC_SUBST([PROJECT_ROOT],[${with_project_root}${rtems_updir}'$(top_builddir)'])
AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp])
])dnl