--- a/ChangeLog	Wed Jan 07 12:02:05 2009 +0100
+++ b/ChangeLog	Thu Jan 08 20:45:32 2009 +0100
@@ -1,3 +1,11 @@
+2009-01-08  Christian Thalinger  <christian.thalinger@gmail.com>
+
+	* acinclude.m4 (SET_OS_DIRS): New function.
+	* configure.ac: Call SET_OS_DIRS and made ALSA check conditional.
+	* Makefile.am (LINUX_DIR): Renamed to OS_DIR and use BUILD_OS_DIR
+	variable.
+	(ICEDTEA_ENV, ICEDTEA_ENV_ECJ): Added OS_PATH to PATH.
+
 2009-01-07  Matthias Klose  <doko@ubuntu.com>
 
 	* patches/hotspot/14.0b08/icedtea-hotspot-dispatch.patch: New, fix

--- a/Makefile.am	Wed Jan 07 12:02:05 2009 +0100
+++ b/Makefile.am	Thu Jan 08 20:45:32 2009 +0100
@@ -112,9 +112,9 @@
 # name is completely irrelevant; only contains the plugs to build IcedTea.
 
 # OpenJDK build environment.
-LINUX_DIR = linux-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
-ECJ_BUILD_OUTPUT_DIR = openjdk-ecj/control/build/$(LINUX_DIR)
+OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR)
+BUILD_OUTPUT_DIR = openjdk/control/build/$(OS_DIR)
+ECJ_BUILD_OUTPUT_DIR = openjdk-ecj/control/build/$(OS_DIR)
 ICEDTEA_BUILD_DIR = \
 	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
 ICEDTEA_RT = \
@@ -150,7 +150,7 @@
         "JRE_RELEASE_VERSION=1.6.0_$(COMBINED_VERSION)" \
 	"MILESTONE=fcs" \
 	"LANG=C" \
-	"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$$PATH" \
+	"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
@@ -220,7 +220,7 @@
         "JRE_RELEASE_VERSION=1.6.0_$(COMBINED_VERSION)" \
 	"MILESTONE=fcs" \
 	"LANG=C" \
-	"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$$PATH" \
+	"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
 	"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \

--- a/acinclude.m4	Wed Jan 07 12:02:05 2009 +0100
+++ b/acinclude.m4	Thu Jan 08 20:45:32 2009 +0100
@@ -66,6 +66,25 @@
   AC_SUBST(ARCH_PREFIX)
 ])
 
+AC_DEFUN([SET_OS_DIRS],
+[
+  case "${host_os}" in
+    *linux*)
+      BUILD_OS_DIR=linux
+      OS_PATH=
+      ;;
+    *solaris*)
+      BUILD_OS_DIR=solaris
+      OS_PATH=/opt/SunStudioExpress/bin:/opt/SUNWpro/bin:/usr/gnu/bin
+      ;;
+    *)
+      AC_MSG_ERROR([unsupported operating system ${host_os}])
+      ;;
+  esac
+  AC_SUBST(BUILD_OS_DIR)
+  AC_SUBST(OS_PATH)
+])
+
 AC_DEFUN([FIND_JAVAC],
 [
   user_specified_javac=

--- a/configure.ac	Wed Jan 07 12:02:05 2009 +0100
+++ b/configure.ac	Thu Jan 08 20:45:32 2009 +0100
@@ -203,6 +203,8 @@
 AC_SUBST(DIST_ID)
 
 SET_ARCH_DIRS
+SET_OS_DIRS
+
 if test "${with_openjdk}" = true
 then
   AC_CHECK_FOR_OPENJDK
@@ -374,15 +376,18 @@
 AC_SUBST(FREETYPE2_CFLAGS)
 AC_SUBST(FREETYPE2_LIBS)
 
-dnl Check for alsa headers and libraries.
-PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no])
-if test "x${ALSA_FOUND}" = xno
+dnl Check for alsa headers and libraries (only required for Linux).
+if test "x${BUILD_OS_DIR}" = "xlinux"
 then
-  AC_MSG_ERROR([Could not find alsa - \
-  Try installing alsa-lib-devel.])
-fi
+  PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no])
+  if test "x${ALSA_FOUND}" = xno
+  then
+    AC_MSG_ERROR([Could not find alsa - \
+    Try installing alsa-lib-devel.])
+  fi
 AC_SUBST(ALSA_CFLAGS)
 AC_SUBST(ALSA_LIBS)
+fi
 
 if test "x${enable_pulse_java}" = "xyes"
 then