bean: just use AWTLIB on all platfroms to simplify this

Change-Id: I6c8bc792a57750b7fd5f36e3eb97f76870a7a632

bean/Library_officebean.mk

@@ -44,29 +44,15 @@ $(eval $(call gb_Library_add_cobjects,officebean,\
 ))
 endif
 
-ifeq ($(GUI),WNT)
-
 $(eval $(call gb_Library_use_libraries,officebean,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_use_system_win32_libs,officebean,\
-    jawt \
-))
-
-else
-
 $(eval $(call gb_Library_add_libs,officebean,\
-	$(AWTLIB) \
-))
-
-$(eval $(call gb_Library_add_ldflags,officebean,\
 	$(JAVALIB) \
+	$(AWTLIB) \
 ))
 
-
-endif
-
 $(eval $(call gb_Library_add_standard_system_libs,officebean))
 
 # vim: set noet sw=4 ts=4:

configure.in

@@ -5982,7 +5982,11 @@ if test "$SOLAR_JAVA" != ""; then
         LD_LIBRARY_PATH=$save_LD_LIBRARY_PATH
     fi
     if test -z "$AWTLIB"; then
-        AWTLIB=-ljawt
+        if test $_os = WINNT -a "$WITH_MINGW" != yes; then
+            AWTLIB=jawt.lib
+        else
+            AWTLIB=-ljawt
+        fi
     fi
     AC_MSG_RESULT([$AWTLIB])
     AC_SUBST(AWTLIB)