enable fribidi

diff --git a/configure.ac b/configure.ac
index 6416d307a850313aff29f010c1c360c5fdb2c2f5..4dc8c568d95b7753f1b4c415663d5be02914d374 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_PYTHON_DEVEL
 TUXBOX_APPS_DVB
 
 TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
 TUXBOX_APPS_DVB
 
 TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)

-#TUXBOX_APPS_LIB_PKGCONFIG(FRIBIDI,fribidi)
+TUXBOX_APPS_LIB_PKGCONFIG(FRIBIDI,fribidi)

 TUXBOX_APPS_LIB_PKGCONFIG(ID3TAG,id3tag)
 TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
 #TUXBOX_APPS_LIB_PKGCONFIG(PLUGINS,tuxbox-plugins)
 TUXBOX_APPS_LIB_PKGCONFIG(ID3TAG,id3tag)
 TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
 #TUXBOX_APPS_LIB_PKGCONFIG(PLUGINS,tuxbox-plugins)

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index 1f09d1bc25cddd51505fb15c1a75fcc7ac74a1d2..b2df471bbefa3f499e1860fde750a8dd9266e6e5 100644 (file)
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -18,7 +18,7 @@
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 

-//#define HAVE_FRIBIDI
+#define HAVE_FRIBIDI

 // until we have it in the cdk
 
 #ifdef HAVE_FRIBIDI
 // until we have it in the cdk
 
 #ifdef HAVE_FRIBIDI

diff --git a/main/Makefile.am b/main/Makefile.am
index 4e45e7600cd54a023addb100140a558f122d4485..33e6f34f3e9e81d359d790af5e62f930da016f40 100644 (file)
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -26,6 +26,7 @@ enigma2_LDADD = \
        @PNG_LIBS@ \
        @SIGC_LIBS@ \
        @DVBSI_LIBS@ \
        @PNG_LIBS@ \
        @SIGC_LIBS@ \
        @DVBSI_LIBS@ \

+       @FRIBIDI_LIBS@ \

        -ldl -lpthread -lcrypt -lresolv -lpython2.4
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
        -ldl -lpthread -lcrypt -lresolv -lpython2.4
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)