slic
diff -u -r1.8 -r1.9
--- aclocal.m4 15 Jun 2005 23:15:32 -0000 1.8
+++ aclocal.m4 28 Jun 2005 20:28:03 -0000 1.9
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/aclocal.m4,v 1.8 2005/06/15 23:15:32 jeremy Exp $
+# $Header: /cvs/lcd/slic/aclocal.m4,v 1.9 2005/06/28 20:28:03 jeremy Exp $
#
# local m4 macros for SLIC autoconf
#
@@ -401,13 +401,11 @@
AC_HELP_STRING([--with-gdml-platform=<platform description>], [description of platform for GDML, e.g. Linux_gcc323.[[PLATFORM]] ]),
[GDML_PLATFORM=${with_gdml_platform}])
-if test -n "{with_gdml_platform}"; then
+if test -z "${with_gdml_platform}"; then
if test -n "$PLATFORM"; then
GDML_PLATFORM=${PLATFORM} # env
else
- GDML_PLATFORM=`uname`"-"${CXX}
-# AC_MSG_RESULT(No)
-# AC_MSG_ERROR(GDML's PLATFORM variable must be set with --with-gdml-platform or PLATFORM env var) # not found
+ GDML_PLATFORM=${host_os}"-"${CXX}
fi
fi
@@ -436,3 +434,30 @@
])
+# function to check the OS
+AC_DEFUN(CHECK_OS, [
+
+AC_MSG_CHECKING(for supported OS)
+
+# to lowercase
+host_os=`uname -s`
+
+supported_os=yes
+
+case "$host_os" in
+
+Linux* ) host_os="Linux";;
+CYGWIN* ) host_os="CYGWIN";;
+DARWIN* ) host_os="DARWIN";;
+* ) supported_os=no;;
+
+esac
+
+AC_MSG_RESULT([$supported_os])
+
+if test "$supported_os" = "no"; then
+ AC_MSG_ERROR( [$host_os is not in the list of supported operating systems] )
+fi
+
+])
+
slic
diff -u -r1.12 -r1.13
--- configure 15 Jun 2005 23:15:32 -0000 1.12
+++ configure 28 Jun 2005 20:28:03 -0000 1.13
@@ -2493,6 +2493,37 @@
# check for dependent packages
+# set OS string
+
+
+echo "$as_me:$LINENO: checking for supported OS" >&5
+echo $ECHO_N "checking for supported OS... $ECHO_C" >&6
+
+# to lowercase
+host_os=`uname -s`
+
+supported_os=yes
+
+case "$host_os" in
+
+Linux* ) host_os="Linux";;
+CYGWIN* ) host_os="CYGWIN";;
+DARWIN* ) host_os="DARWIN";;
+* ) supported_os=no;;
+
+esac
+
+echo "$as_me:$LINENO: result: $supported_os" >&5
+echo "${ECHO_T}$supported_os" >&6
+
+if test "$supported_os" = "no"; then
+ { { echo "$as_me:$LINENO: error: $host_os is not in the list of supported operating systems " >&5
+echo "$as_me: error: $host_os is not in the list of supported operating systems " >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
# Setup Default CPPFLAGS
@@ -2737,13 +2768,11 @@
GDML_PLATFORM=${with_gdml_platform}
fi;
-if test -n "{with_gdml_platform}"; then
+if test -z "${with_gdml_platform}"; then
if test -n "$PLATFORM"; then
GDML_PLATFORM=${PLATFORM} # env
else
- GDML_PLATFORM=`uname`"-"${CXX}
-# AC_MSG_RESULT(No)
-# AC_MSG_ERROR(GDML's PLATFORM variable must be set with --with-gdml-platform or PLATFORM env var) # not found
+ GDML_PLATFORM=${host_os}"-"${CXX}
fi
fi
slic
diff -u -r1.10 -r1.11
--- configure.ac 14 Jun 2005 21:43:49 -0000 1.10
+++ configure.ac 28 Jun 2005 20:28:03 -0000 1.11
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/configure.ac,v 1.10 2005/06/14 21:43:49 jeremy Exp $
+# $Header: /cvs/lcd/slic/configure.ac,v 1.11 2005/06/28 20:28:03 jeremy Exp $
#
# Process this file with autoconf to produce a configure script for SLIC.
#
@@ -35,6 +35,9 @@
# check for dependent packages
+# set OS string
+CHECK_OS()
+
# Setup Default CPPFLAGS
SIM_SETUP_DEF_CPPFLAGS()