support dashes in os from config.sub

diff --git a/ChangeLog b/ChangeLog
index 3a467e45991a0eb50ae06d3a13b1f1310b6b598c..7e394dcd6aef1a14cb40227332f66466b6073e65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 10 22:29:37 1996  David J MacKenzie  <djm@catapult.va.pubnix.com>
+
+       * acgeneral.m4 (AC_CANONICAL_HOST, AC_CANONICAL_TARGET,
+       AC_CANONICAL_BUILD): Allow the os part of the string returned by
+       config.sub to contain dashes, as in "linux-gnu".
+
 Fri Jul 19 16:59:00 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
        * acgeneral.m4 (AC_CHECK_TYPE): Add dnl so regexp doesn't have a

diff --git a/acgeneral.m4 b/acgeneral.m4
index b02ec6c3d42a55d8cb41efed725c05242c8de37a..0834862f7047485c538d488c3a9d084fa0676a82 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -917,10 +917,12 @@ NONE)
 esac
 
 dnl Set the other host vars.
+changequote(<<, >>)dnl
 host=`$ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+changequote([, ])dnl
 AC_MSG_RESULT($host)
 AC_SUBST(host)dnl
 AC_SUBST(host_alias)dnl
@@ -945,10 +947,12 @@ NONE)
 esac
 
 dnl Set the other target vars.
+changequote(<<, >>)dnl
 target=`$ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+changequote([, ])dnl
 AC_MSG_RESULT($target)
 AC_SUBST(target)dnl
 AC_SUBST(target_alias)dnl
@@ -973,10 +977,12 @@ NONE)
 esac
 
 dnl Set the other build vars.
+changequote(<<, >>)dnl
 build=`$ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+changequote([, ])dnl
 AC_MSG_RESULT($build)
 AC_SUBST(build)dnl
 AC_SUBST(build_alias)dnl

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index b02ec6c3d42a55d8cb41efed725c05242c8de37a..0834862f7047485c538d488c3a9d084fa0676a82 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -917,10 +917,12 @@ NONE)
 esac
 
 dnl Set the other host vars.
+changequote(<<, >>)dnl
 host=`$ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+changequote([, ])dnl
 AC_MSG_RESULT($host)
 AC_SUBST(host)dnl
 AC_SUBST(host_alias)dnl
@@ -945,10 +947,12 @@ NONE)
 esac
 
 dnl Set the other target vars.
+changequote(<<, >>)dnl
 target=`$ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+changequote([, ])dnl
 AC_MSG_RESULT($target)
 AC_SUBST(target)dnl
 AC_SUBST(target_alias)dnl
@@ -973,10 +977,12 @@ NONE)
 esac
 
 dnl Set the other build vars.
+changequote(<<, >>)dnl
 build=`$ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+changequote([, ])dnl
 AC_MSG_RESULT($build)
 AC_SUBST(build)dnl
 AC_SUBST(build_alias)dnl