From 12152d253e48353254645b768c28d67e1e280a70 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Tue, 11 Dec 2012 23:06:47 +0200
Subject: Replace GUIBASE checks with equivalent OS checks

The idea is to get rid of GUIBASE and GUI checks as much as possible.

GUIBASE=aqua <=> OS=MACOSX
GUIBASE=WIN <=> OS=WNT
GUIBASE=cocoatouch <=> OS=IOS
GUIBASE=android <=> OS=ANDROID

Don't set GUIBASE to these values any more in configure.ac
either.

GUIBASE_FOR_BUILD is not used anywhere.

Conflicts:
	configure.ac
	postprocess/packcomponents/makefile.mk
	postprocess/packregistry/makefile.mk

Change-Id: Ie0526b40e1073f2328ba6c333e28752104b0fed3
---
 np_sdk/StaticLibrary_nputils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'np_sdk')

diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk
index d9ff1aef77fd..264ea0382166 100644
--- a/np_sdk/StaticLibrary_nputils.mk
+++ b/np_sdk/StaticLibrary_nputils.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_StaticLibrary_use_externals,nputils,\
 	npapi_headers \
 ))
 
-ifeq ($(GUIBASE),aqua)
+ifeq ($(OS),MACOSX)
 $(eval $(call gb_StaticLibrary_add_defs,nputils,\
 	-DNO_X11 \
 ))
-- 
cgit