---
 Makefile                          |   33 +++++++++++++++++++++++----------
 config.mk.svn                     |    3 +++
 img/etc/directfbrc                |    2 +-
 src/DirectFB/lib/direct/signals.c |    2 +-
 4 files changed, 28 insertions(+), 12 deletions(-)

Index: b/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,6 @@
 #    linux-fusion
 #    wx
 #    font
-#    font-dzs
 #    wxecs
 #    test-multiapp
 #    test-fonts
@@ -51,11 +50,17 @@ else
 MULTIAPP_CONFFLAG:=disable
 endif
 
+ifeq ($(ENABLE_UNICODE), 1)
+UNICODE_CONFFLAG:=enable
+else
+UNICODE_CONFFLAG:=disable
+endif
+
 TESTPROJECTS := wxecs test-multiapp test-fonts test-printing test-sockets \
                 test-supervisor test-xrc test-bitmap
 
 # projects with bakefile-generated makefiles:
-BKLPROJECTS := $(TESTPROJECTS) font-dzs
+BKLPROJECTS := $(TESTPROJECTS)
 
 SUBPROJECTS := freetype DirectFB font wx $(BKLPROJECTS)
 ifeq ($(ENABLE_MULTIAPP), 1)
@@ -122,8 +127,6 @@ MAKEOPTS_freetype := CCexe=$(HOST_CC)
 
 HOSTBUILD_font := 1
 
-BUILDDEPS_font-dzs := DirectFB
-
 CONFIGDEPS_DirectFB := freetype
 ifeq ($(ENABLE_MULTIAPP), 1)
 CONFIGDEPS_DirectFB += linux-fusion
@@ -152,28 +155,38 @@ CONFIGOPTS_wx := \
 			--disable-all-features \
 			--without-subdirs \
 			--with-directfb \
-			--with-themes=mono \
-			--enable-unicode --enable-utf8 --enable-utf8only \
+			--with-themes=mono,win32,metal \
+			--$(UNICODE_CONFFLAG)-unicode \
+			--$(UNICODE_CONFFLAG)-utf8only \
+			--$(DEBUG_CONFFLAG)-debug \
 			--disable-stl --disable-std_string \
 			--disable-compat{26,28} \
 			--enable-optimise \
 			--with-libtiff=builtin \
-			--with-expat=builtin \
+			--with-{expat,regex}=builtin \
+			--with-{libpng,zlib} \
+			--enable-datetime \
 			--enable-streams \
 			--enable-file --enable-text{buf,file} \
 			--enable-config \
 			--enable-{longlong,stopwatch,sockets,timer} \
-			--$(DEBUG_CONFFLAG)-debug \
 			--enable-{xpm,intl,xml,fontmap,xrc} \
 			--enable-caret \
 			--enable-image \
+			--enable-popupwin \
 			--enable-{,bmp}button \
 			--enable-{check,combo,list}box \
 			--enable-radiobtn \
 			--enable-imaglist \
-			--enable-{{combo,list}ctrl,{scroll,status}bar} \
-			--enable-{textctrl,stat{bmp,text}} \
+			--enable-fontenum \
+			--enable-{combo,list,text}ctrl \
+			--enable-{scroll,status}bar \
+			--enable-stat{bmp,text} \
 			--enable-msgdlg \
+			--enable-{baseevt,epool,select}loop \
+			--enable-{cmdline,ipc,threads} \
+			--enable-validators \
+			--enable-catch_segvs
 
 build/wx.built: build/wx.make-removed-wxrc
 
Index: b/img/etc/directfbrc
===================================================================
--- a/img/etc/directfbrc
+++ b/img/etc/directfbrc
@@ -10,7 +10,7 @@ vt-num=2
 
 # don't switch to the TTY used by the app, only supervisor
 # can do that
-no-vt-switch
+#no-vt-switch
 
 # supress verbose output to standard output
 quiet
Index: b/config.mk.svn
===================================================================
--- a/config.mk.svn
+++ b/config.mk.svn
@@ -24,3 +24,6 @@ DEBUG:=0
 # Set this to 0 to compile without the ability to run multiple applications
 # on the same framebuffer
 ENABLE_MULTIAPP:=1
+
+# Set this to 1 to compile with Unicode (UTF-8)
+ENABLE_UNICODE:=1
Index: b/src/DirectFB/lib/direct/signals.c
===================================================================
--- a/src/DirectFB/lib/direct/signals.c
+++ b/src/DirectFB/lib/direct/signals.c
@@ -69,7 +69,7 @@ typedef struct {
 static int sigs_to_handle[] = { /*SIGALRM,*/ SIGHUP, SIGINT, /*SIGPIPE,*/ /*SIGPOLL,*/
                                 SIGTERM, /*SIGUSR1, SIGUSR2,*/ /*SIGVTALRM,*/
                                 /*SIGSTKFLT,*/ SIGABRT, SIGFPE, SIGILL, SIGQUIT,
-                                SIGSEGV, SIGTRAP, /*SIGSYS, SIGEMT,*/ SIGBUS,
+                                SIGSEGV, /*SIGTRAP, SIGSYS, SIGEMT,*/ SIGBUS,
                                 SIGXCPU, SIGXFSZ };
 
 #define NUM_SIGS_TO_HANDLE ((int)(sizeof(sigs_to_handle)/sizeof(sigs_to_handle[0])))