diff m4/acinclude.m4 @ 15863:b316429bfa89

build: Use $host_os variable to clarify configure.ac * configure.ac: Use $host_os instead of $canonical_host_type when operating system is being tested. * m4/acinclude.m4(OCTAVE_HOST_TYPE): Rename macro to OCTAVE_CANONICAL_HOST to be similar to Autoconf macro of same purpose. Guarantee that $host, $host_cpu, $host_vendor, and $host_os all have a value.
author Rik <rik@octave.org>
date Fri, 28 Dec 2012 12:21:11 -0800
parents f366e9948259
children 139f4b19a3ac
line wrap: on
line diff
--- a/m4/acinclude.m4	Fri Dec 28 21:08:26 2012 +0100
+++ b/m4/acinclude.m4	Fri Dec 28 12:21:11 2012 -0800
@@ -1276,19 +1276,23 @@
 dnl
 dnl Figure out the hardware-vendor-os info.
 dnl
-dnl Hanging '])' in AC_MSG_WARN is for adding newline to output
-dnl
-AC_DEFUN([OCTAVE_HOST_TYPE], [
+AC_DEFUN([OCTAVE_CANONICAL_HOST], [
   AC_CANONICAL_HOST
   if test -z "$host"; then
-    host=unknown
+    host=unknown-unknown-unknown
+    AC_MSG_WARN([configuring Octave for unknown system type])
   fi
   canonical_host_type=$host
-  if test "$host" = unknown; then
-    AC_MSG_WARN([configuring Octave for unknown system type
-])
+  AC_SUBST(canonical_host_type)
+  if test -z "$host_cpu"; then
+    host_cpu=unknown
   fi
-  AC_SUBST(canonical_host_type)
+  if test -z "$host_vendor"; then
+    host_vendor=unknown
+  fi
+  if test -z "$host_os"; then
+    host_os=unknown
+  fi
 ])
 dnl
 dnl Check for IEEE 754 data format.