Cleanup the ClientWallet, SingleSignon and CookieManagement mess.

config/autoconf.mk.in

@@ -51,6 +51,11 @@ BUILD_IDLC = @BUILD_IDLC@
 MODULAR_NETLIB  = @MODULAR_NETLIB@
 STANDALONE_IMAGE_LIB = @STANDALONE_IMAGE_LIB@
 
+ClientWallet=@ClientWallet@
+CookieManagement=@CookieManagement@
+SingleSignon=@SingleSignon@
+
+
 MOZ_ENABLE_GTK_MOZILLA     = @MOZ_ENABLE_GTK_MOZILLA@
 MOZ_BUILD_ROOT             = @MOZ_BUILD_ROOT@
 
@@ -66,7 +71,6 @@ MOZ_INSURE_DIRS = @MOZ_INSURE_DIRS@
 MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@
 
 MOZ_BUILD_XPFE = @MOZ_BUILD_XPFE@
-MOZ_NO_WALLET_HACK = @MOZ_BUILD_XPFE@
 MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@
 
 # Should the extra CFLAGS only be added in Makefile.ins that need them? 

config/config.mk

@@ -472,12 +472,6 @@ MOZILLA_CLIENT	= 1
 MOZ_JSD		= 1
 endif
 
-MOZ_COOKIEMANAGEMENT    = 1
-ifdef MOZ_NO_WALLET_HACK
-MOZ_SINGLESIGNON        = 1
-MOZ_CLIENTWALLET        = 1
-endif
-
 ifndef USE_AUTOCONF
 ifdef MOZ_LITE
 NO_UNIX_LDAP	= 1
@@ -515,18 +509,6 @@ MOZ_OFFLINE	= 1
 MOZ_TASKBAR	= 1
 endif
 
-ifdef MOZ_SINGLESIGNON
-DEFINES         += -DSingleSignon
-endif
-
-ifdef MOZ_COOKIEMANAGEMENT
-DEFINES         += -DCookieManagement
-endif
-
-ifdef MOZ_CLIENTWALLET
-DEFINES         += -DClientWallet
-endif
-
 ifdef MOZ_SMOOTH_PROGRESS
 DEFINES         += -DSMOOTH_PROGRESS
 endif

configure.in

@@ -1361,6 +1361,48 @@ MOZ_ARG_ENABLE_BOOL(brprof,
   MOZ_BRPROF=1
   AC_DEFINE(MOZ_BRPROF))
 
+dnl ========================================================
+dnl =
+dnl = ClientWallet, CookieManagement, SingleSignon hacks
+dnl = 
+dnl = Dont ask why these variables are named this way.
+dnl = 
+dnl ========================================================
+ClientWallet=1
+CookieManagement=1
+SingleSignon=1
+
+MOZ_ARG_DISABLE_BOOL(client-wallet,
+[  --disable-client-wallet         Disable ClientWallet],
+  ClientWallet= )
+
+MOZ_ARG_DISABLE_BOOL(cookie-management,
+[  --disable-cookie-management         Disable CookieManagement],
+  CookieManagement= )
+
+MOZ_ARG_DISABLE_BOOL(single-signon,
+[  --disable-single-signon         Disable SingleSignon],
+  SingleSignon= )
+
+if test "$ClientWallet"
+then
+  AC_DEFINE(ClientWallet)
+  
+  # I guess one depends on the other
+  SingleSignon=1
+fi
+
+if test "$CookieManagement"
+then
+  AC_DEFINE(CookieManagement)
+fi
+
+if test "$SingleSignon"
+then
+  AC_DEFINE(SingleSignon)
+fi
+
+
 dnl ========================================================
 dnl =
 dnl = GtkMozilla support
@@ -1673,6 +1715,10 @@ AC_SUBST(BUILD_IDLC)
 AC_SUBST(MOZ_ENABLE_GTK_MOZILLA)
 AC_SUBST(MOZ_BUILD_ROOT)
 
+AC_SUBST(ClientWallet)
+AC_SUBST(CookieManagement)
+AC_SUBST(SingleSignon)
+
 dnl system JPEG support
 dnl ========================================================
 AC_ARG_WITH(jpeg,

extensions/Makefile.in

@@ -22,7 +22,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS=wallet
+ifdef ClientWallet
+DIRS += wallet
+endif
 
 ifdef ENABLE_PICS
 DIRS += pics