--- old/src/solaris/native/sun/awt/awt_LoadLibrary.c	2012-05-15 20:33:54.000000000 +0400
+++ new/src/solaris/native/sun/awt/awt_LoadLibrary.c	2012-05-15 20:33:53.000000000 +0400
@@ -110,7 +110,7 @@
     /* Check if toolkit is specified in env variable */
 #ifdef MACOSX
     envvar = getenv("AWT_TOOLKIT");
-    if (envvar && strstr(envvar, "XToolkit")) {
+    if ((envvar && strstr(envvar, "XToolkit")) || AWTIsHeadless()) {
 #endif
         fmanager = (*env)->NewStringUTF(env, "sun.awt.X11FontManager");
         tk = "/xawt/libmawt";
@@ -127,15 +127,11 @@
     }
 
     /* Calculate library name to load */
-#ifndef MACOSX
     if (AWTIsHeadless()) {
         strcpy(p, "/headless/libmawt");
     } else if (tk) {
-#endif
         strcpy(p, tk);
-#ifndef MACOSX
     }
-#endif
 
 #ifdef MACOSX
     strcat(p, ".dylib");