Fix build without charset converters

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 889d74402e758a07b4878afa3ad25e3cbba7cc64..bc767e5045ce512de52eccad967d96fa20973ed4 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,6 +1,9 @@
 bin_PROGRAMS = fribidi
 
-noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types fribidi-caprtl2utf8
+noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types
+if FRIBIDI_CHARSETS
+noinst_PROGRAMS += fribidi-caprtl2utf8
+endif
 
 getopt_SOURCES = getopt.c getopt1.c getopt_int.h getopt.h gettext.h
 

diff --git a/gen.tab/gen-joining-type-tab.c b/gen.tab/gen-joining-type-tab.c
index 2db708f7fc8511c27bf0727e21e2534b53540bb9..b3994c57cb1c96c464a9d47021c33bee83325263 100644 (file)
--- a/gen.tab/gen-joining-type-tab.c
+++ b/gen.tab/gen-joining-type-tab.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * gen-joining-type-tab.c - generate joining-type.tab.i
  *
- * $Id: gen-joining-type-tab.c,v 1.6 2006-01-31 03:23:12 behdad Exp $
+ * $Id: gen-joining-type-tab.c,v 1.7 2010-12-07 19:44:26 behdad Exp $
  * $Author: behdad $
- * $Date: 2006-01-31 03:23:12 $
- * $Revision: 1.6 $
+ * $Date: 2010-12-07 19:44:26 $
+ * $Revision: 1.7 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/gen.tab/gen-joining-type-tab.c,v $
  *
  * Author:
@@ -155,6 +155,7 @@ static const char *ignored_bidi_types[] = {
 };
 
 static const char *transparent_general_categories[] = {
+  "Mn",
   "Mn",
   "Cf",
   NULL