From 106974a9d2d5caa5188322507980e3d57d2e3517 Mon Sep 17 00:00:00 2001
From: Kent Mein <mein@cs.umn.edu>
Date: Thu, 8 May 2008 18:38:21 +0000
Subject: [PATCH] Fixing up the webplugin defines for the Makefiles.

Now you can do one of the following to disable it:
export NAN_NO_PLUGIN=true
export WITH_BF_WEBPLUGIN=false

or
export WITH_BF_WEBPLUGIN=true to enable building it.
(Its set to false by default)

Kent
---
 source/Makefile                       | 10 ++++------
 source/gameengine/GamePlayer/Makefile |  2 +-
 source/nan_definitions.mk             |  6 +++++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/source/Makefile b/source/Makefile
index e5dffbf532d..5ebff3bbbf5 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -315,12 +315,10 @@ ifeq ($(WITH_BF_BLENDERPLAYER), true)
 endif
 
 ifeq ($(WITH_BF_WEBPLUGIN), true)
-    ifneq ($(NAN_NO_PLUGIN), true)
-        BINTARGETS += plugin
-        ifeq ($(OS),linux)
-            ifeq ($(CPU),i386)
-                 BINTARGETS += xplink
-             endif
+    BINTARGETS += plugin
+    ifeq ($(OS),linux)
+        ifeq ($(CPU),i386)
+             BINTARGETS += xplink
         endif
     endif
 endif
diff --git a/source/gameengine/GamePlayer/Makefile b/source/gameengine/GamePlayer/Makefile
index 747a82fc333..c4f78f23117 100644
--- a/source/gameengine/GamePlayer/Makefile
+++ b/source/gameengine/GamePlayer/Makefile
@@ -34,7 +34,7 @@ SOURCEDIR = source/gameengine/GamePlayer
 DIR = $(OCGDIR)/gameengine/GamePlayer
 DIRS = common ghost
 
-ifneq ($(NAN_NO_PLUGIN),true)
+ifeq ($(WITH_BF_WEBPLUGIN),true)
 ifeq ($(OS),$(findstring $(OS), "freebsd irix windows"))
 	ifneq ($(FREE_WINDOWS),true)
 	    DIRS += netscape
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 43345817f2e..e19d10dba64 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -64,7 +64,11 @@ all debug::
     export WITH_BF_STATICOPENGL ?= false
     export WITH_BF_BLENDERGAMEENGINE ?= true
     export WITH_BF_BLENDERPLAYER ?= true
-    export WITH_BF_WEBPLUGIN ?= false
+    ifeq ($(NAN_NO_PLUGIN), true)
+        export WITH_BF_WEBPLUGIN = false
+    else
+        export WITH_BF_WEBPLUGIN ?= false
+    endif
 
     export NAN_MOTO ?= $(LCGDIR)/moto
 ifeq ($(FREE_WINDOWS), true)