Index: ../trunk-jpl/m4/issm_options.m4
===================================================================
--- ../trunk-jpl/m4/issm_options.m4	(revision 18372)
+++ ../trunk-jpl/m4/issm_options.m4	(revision 18373)
@@ -8,9 +8,10 @@
 
 	dnl ISSM's internal options
 	dnl Build info{{{
+	
+	dnl build date
 	AC_PATH_PROGS(DATE, date)
 	AC_MSG_CHECKING(for build date)
-	dnl system checks require uname
 	if test "$DATE" ; then
 		PACKAGE_DATE=`date`
 	else
@@ -18,6 +19,74 @@
 	fi
 	AC_DEFINE_UNQUOTED(PACKAGE_BUILD_DATE,"$PACKAGE_DATE", Build date)
 	AC_MSG_RESULT($PACKAGE_DATE)
+
+	dnl user name
+	AC_MSG_CHECKING([user name])
+	if test -n "$USER"
+	then
+		user_name="$USER"
+	else
+		if test -n "$LOGNAME"
+		then
+			user_name="$LOGNAME"
+		else
+		   user_name=`(whoami) 2>/dev/null` || user_name=unknown
+		fi
+	fi
+	AC_DEFINE_UNQUOTED(USER_NAME, "$user_name", Build user name)
+	AC_MSG_RESULT($user_name)
+
+	AC_MSG_CHECKING([host full OS name and version])
+	dnl normalize some host OS names
+	case ${host_os} in
+	  dnl linux is linux is linux, regardless of RMS.
+	  linux-gnu* | lignux* )	host_os=linux ;;
+	esac
+	AC_DEFINE_UNQUOTED(HOST_OS, "$host_os", Host full OS name and version)
+	AC_MSG_RESULT($host_os)
+
+  AC_MSG_CHECKING([host cpu])
+  AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu",Host cpu)
+  AC_MSG_RESULT($host_cpu)
+
+  AC_MSG_CHECKING([vendor])
+  AC_DEFINE_UNQUOTED(HOST_VENDOR, "$host_vendor",Host vendor)
+  AC_MSG_RESULT($host_vendor)
+
+  AC_MSG_CHECKING([host OS name])
+  host_os_name=`echo $host_os | sed 's/\..*//g'`
+  dnl normalize some OS names
+  case ${host_os_name} in
+	dnl linux is linux is linux, regardless of RMS.
+	linux-gnu* | lignux* )	host_os_name=linux ;;
+  esac
+  AC_DEFINE_UNQUOTED(HOST_OS_NAME, "$host_os_name", Host OS name)
+  AC_MSG_RESULT($host_os_name)
+
+	dnl parse out the OS version of the host
+  AC_MSG_CHECKING([host OS version])
+  host_os_version=`echo $host_os | sed 's/^[[^0-9]]*//g'`
+  if test -z "$host_os_version"
+  then
+	host_os_version=`(uname -r) 2>/dev/null` || host_os_version=unknown
+  fi
+  AC_DEFINE_UNQUOTED(HOST_OS_VERSION, "$host_os_version", Host OS version)
+  AC_MSG_RESULT($host_os_version)
+
+
+	dnl figure out host architecture (different than CPU)
+  AC_MSG_CHECKING([host OS architecture])
+  host_arch=`(uname -m) 2>/dev/null` || host_arch=unknown
+  dnl normalize some names
+  case ${host_arch} in
+	sun4* )	host_arch=sun4 ;;
+	sun3x )	host_arch=sun3 ;;
+	sun )	host_arch=`(arch) 2>/dev/null` || host_arch=unknown ;;
+	i?86 )	host_arch=i386 ;; # all x86 should show up as i386
+  esac
+  AC_DEFINE_UNQUOTED(HOST_ARCH, "$host_arch",Host Archictecture)
+  AC_MSG_RESULT($host_arch)
+
 	dnl }}}
 	dnl Debugging {{{
 	AC_ARG_ENABLE([debugging],                                        dnl feature
