diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-10-31 21:20:00 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-10-31 21:20:00 +0000 |
| commit | 3174a7edaefd2d1f59af44c7f6856c69327ecf9d (patch) | |
| tree | 101990c9e3421b7d76dd2a0962442005b357efab /macros/multilib.m4 | |
| parent | 2000-10-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-3174a7edaefd2d1f59af44c7f6856c69327ecf9d.tar.bz2 | |
2000-10-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in: New, Cygnus/GNU style configuration.
* Makefile.am: Add macros/, reflect new configure.in,
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros
* automake/compile.am: BSP_SPECS, remove RTEMS_CANONICALIZATION.
* automake/lib.am: Remove RTEMS_CANONICALIZATION.
* macros/tool-prefix.m4: Remove.
* macros/target.m4: Remove RTEMS_CONFIG_SUBDIRS, RTEMS_OUTPUT_SUBDIRS.
* macros/enable-rtemsbsp.m4: Add RTEMS_CONFIG_PER_BSP, add setting
RTEMS_ROOT.
* macros/i386-gas-code16.m4: Define NEW_GAS only for 16bit mode-
* macros/multilib.m4: Various minor fixes.
* macros/project-root.m4: Remove setting PROJECT_TOPdir,
PROJECT_ROOT, RTEMS_ROOT.
* macros/rtems-top.m4: Remove RTEMS_CANONICALIZATION, TARGET_SUBDIRS;
Add with_target_subdirs, PROJECT_TOPdir, PROJECT_ROOT.
Diffstat (limited to '')
| -rw-r--r-- | macros/multilib.m4 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/macros/multilib.m4 b/macros/multilib.m4 index 1d11561f0a..5e0c5272d1 100644 --- a/macros/multilib.m4 +++ b/macros/multilib.m4 @@ -22,8 +22,6 @@ AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) dnl We may get other options which we don't document: dnl --with-target-subdir, --with-multisrctop, --with-multisubdir -test -z "[$]{with_target_subdir}" && with_target_subdir=. - if test "[$]{srcdir}" = "."; then if test "[$]{with_target_subdir}" != "."; then multilib_basedir="[$]{srcdir}/[$]{with_multisrctop}../ifelse([$2],,,[$2])" @@ -42,18 +40,18 @@ else fi AC_OUTPUT_COMMANDS( - if test -n "$CONFIG_FILES"; do - $ac_file" = ifelse([$1],,Makefile,[$1]) \ + if test -n "$CONFIG_FILES"; then + ac_file=[]ifelse([$1],,Makefile,[$1]) \ . ${multilib_basedir}/../config-ml.in - fi, + fi,[ srcdir=${srcdir} host=${host} target=${target} -# with_multisrctop="${with_multisrctop}" -# with_target_subdir="${with_target_subdir}" + with_multisrctop="${with_multisrctop}" + with_target_subdir="${with_target_subdir}" with_multisubdir="${with_multisubdir}" ac_configure_args="${multilib_arg} ${ac_configure_args}" CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} multilib_basedir=${multilib_basedir} - CC="${CC}") + CC="${CC}"]) ]) |