diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-11-09 09:34:18 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-11-09 09:34:18 +0000 |
| commit | 228566eb7ba6c8a416459d997ac6136db1eed164 (patch) | |
| tree | c413071285a7a9410010d0f3f28d9d68f63f7211 /testsuites/aclocal | |
| parent | 2005-11-09 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-228566eb7ba6c8a416459d997ac6136db1eed164.tar.bz2 | |
Add --enable-cpukit-root, --enable-project-root. Remove --with-project-root. Fix --enable-rtems-root.
Diffstat (limited to 'testsuites/aclocal')
| -rw-r--r-- | testsuites/aclocal/rtems-top.m4 | 42 |
1 files changed, 37 insertions, 5 deletions
diff --git a/testsuites/aclocal/rtems-top.m4 b/testsuites/aclocal/rtems-top.m4 index 51a4e95207..855ceb91b5 100644 --- a/testsuites/aclocal/rtems-top.m4 +++ b/testsuites/aclocal/rtems-top.m4 @@ -33,21 +33,53 @@ AS_HELP_STRING(--enable-rtems-root,directory containing make/custom)], RTEMS_ROOT=${enable_rtems_root} ;; *) # relative directory - rtems_rootdir=${enable_rtems_root}${rtems_updir} - RTEMS_ROOT=${enable_rtems_root}${rtems_updir}'$(top_builddir)' + rtems_rootdir=${rtems_updir}${enable_rtems_root} + RTEMS_ROOT='$(top_builddir)'/${rtems_updir}${enable_rtems_root} ;; esac],[ rtems_rootdir=${rtems_updir} -RTEMS_ROOT=${rtems_updir}'$(top_builddir)' +RTEMS_ROOT='$(top_builddir)'/${rtems_updir} ]) AC_SUBST([RTEMS_ROOT]) - + AS_IF([test -n "${with_target_subdir}"], [project_top="../${with_project_top}"], [project_top="${with_project_top}"]) AC_SUBST([PROJECT_TOPdir],[${project_top}${rtems_updir}'$(top_builddir)']) -AC_SUBST([PROJECT_ROOT],[${with_project_root}${rtems_updir}'$(top_builddir)']) +AC_ARG_ENABLE([cpukit-root],[ +AS_HELP_STRING(--enable-cpukit-root,directory containing lib/librtemscpu.a)], +[case ${enable_cpukit_root} in + [[\\/$]]* | ?:[[\\/]]* ) # absolute directory + cpukit_rootdir=${enable_cpukit_root} + CPUKIT_ROOT=${enable_cpukit_root} + ;; + *) # relative directory + cpukit_rootdir=${rtems_updir}${enable_cpukit_root} + CPUKIT_ROOT='$(top_builddir)'/${rtems_updir}${enable_cpukit_root} + ;; +esac],[ +cpukit_rootdir= +CPUKIT_ROOT= +]) +AC_SUBST([CPUKIT_ROOT]) + +AC_ARG_ENABLE([project-root],[ +AS_HELP_STRING(--enable-project-root,directory containing lib/librtemsbsp.a)], +[case ${enable_project_root} in + [[\\/$]]* | ?:[[\\/]]* ) # absolute directory + project_rootdir=${enable_project_root} + PROJECT_ROOT=${enable_project_root} + ;; + *) # relative directory + project_rootdir=${rtems_updir}${enable_project_root} + PROJECT_ROOT='$(top_builddir)'/${rtems_updir}${enable_project_root} + ;; +esac],[ +project_rootdir= +PROJECT_ROOT= +]) +AC_SUBST([PROJECT_ROOT]) AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp]) ])dnl |