diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | aclocal/canonical-target-name.m4 | 10 | ||||
| -rw-r--r-- | aclocal/config-subdirs.m4 | 14 |
3 files changed, 16 insertions, 14 deletions
@@ -1,3 +1,9 @@ +2001-05-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * canonical-target-name.m4: Fix m4-quoting for autoconf-2.49f. + * aclocal/config-subdirs.m: Fix m4-quoting for autoconf-2.49f, + Add support for DOS-drive-letters. + 2001-04-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * aclocal/prog-cc.m4: Add CPPFLAGS and CFLAGS handling to diff --git a/aclocal/canonical-target-name.m4 b/aclocal/canonical-target-name.m4 index 53d1a2962c..0fb1fd777d 100644 --- a/aclocal/canonical-target-name.m4 +++ b/aclocal/canonical-target-name.m4 @@ -12,16 +12,15 @@ AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU, [ AC_CANONICAL_SYSTEM AC_MSG_CHECKING(rtems target cpu) -changequote(,)dnl case "${target}" in # hpux unix port should go here - i[34567]86-*linux*) # unix "simulator" port + i[[34567]]86-*linux*) # unix "simulator" port RTEMS_CPU=unix ;; - i[34567]86-*freebsd*) # unix "simulator" port + i[[34567]]86-*freebsd*) # unix "simulator" port RTEMS_CPU=unix ;; - i[34567]86-pc-cygwin*) # Cygwin is just enough unix like :) + i[[34567]]86-pc-cygwin*) # Cygwin is just enough unix like :) RTEMS_CPU=unix ;; no_cpu-*rtems*) @@ -31,10 +30,9 @@ case "${target}" in RTEMS_CPU=unix ;; *) - RTEMS_CPU=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'` + RTEMS_CPU=`echo $target | sed 's%^\([[^-]]*\)-\(.*\)$%\1%'` ;; esac -changequote([,])dnl AC_SUBST(RTEMS_CPU) AC_MSG_RESULT($RTEMS_CPU) ]) diff --git a/aclocal/config-subdirs.m4 b/aclocal/config-subdirs.m4 index 927973a368..f5f1af3f43 100644 --- a/aclocal/config-subdirs.m4 +++ b/aclocal/config-subdirs.m4 @@ -45,13 +45,11 @@ dnl _RTEMS_GIVEN_INSTALL dnl AC_DEFUN(_RTEMS_GIVEN_INSTALL, [ -ifdef([AC_PROVIDE_AC_PROG_INSTALL], - [ case "$ac_given_INSTALL" in -changequote(, )dnl - [/$]*) INSTALL="$ac_given_INSTALL" ;; -changequote([, ])dnl - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac +ifdef([AC_PROVIDE_AC_PROG_INSTALL],[ + case "$ac_given_INSTALL" in + [[\\/]]* | ?:[[\\/]]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac ])dnl ]) @@ -73,7 +71,7 @@ AC_DEFUN(_RTEMS_ADJUST_SRCDIR,[ case "$srcdir" in .) # No --srcdir option. We are building in place. $1=$srcdir ;; - /*) # Absolute path. + [[\\/]]* | ?:[[\\/]]*) # Absolute path. $1=$srcdir/$2 ;; *) # Relative path. $1=$ac_dots$srcdir/$2 ;; |