Include a stripped-down version of fribidi to avoid the extra dependency.

Sun Nov 12 16:07:06 2000  Owen Taylor  <otaylor@redhat.com>

	* configure.in pango/pango-utils.[ch] pango/Makefile.am
	pango/mini-fribidi/*: Include a stripped-down version of fribidi
	to avoid the extra dependency. No fribidi symbols are
	exported so conflicts with the real fribidi should not
	happen. Library can optionally be compiled with the
	real libfribidi.

	* pango/pango-utils.[ch]: Wrappers for
	fribidi_ functions when compiling with fribiid.

	* modules/basic/basic-ft2.c modules/basic/basic-win32.c
	modules/basic/basic.c modules/thai/thai.c pango/Makefile.am
	pango/itemize.c pango/pango-context.c pango/pangoft2.c
	pango/pangowin32.c pango/pangox.c: Use pango_ versions of fribidi
	functions.

6 files changed, 12 insertions, 15 deletions

diff --git a/modules/basic/basic-ft2.c b/modules/basic/basic-ft2.c
index 2faa9788..973e8a43 100644
--- a/modules/basic/basic-ft2.c
+++ b/modules/basic/basic-ft2.c
@@ -23,8 +23,7 @@
 
 #include "pango.h"
 #include "pangoft2.h"
-
-#include <fribidi/fribidi.h>
+#include "pango-utils.h"
 
 static PangoEngineRange basic_ranges[] = {
   /* Basic Latin, Latin-1 Supplement, Latin Extended-A, Latin Extended-B,
@@ -240,13 +239,13 @@ basic_engine_shape (PangoFont        *font,
   for (i = 0; i < n_chars; i++)
     {
       gunichar wc;
-      FriBidiChar mirrored_ch;
+      gunichar mirrored_ch;
       PangoGlyph index;
 
       wc = g_utf8_get_char (p);
 
       if (analysis->level % 2)
-	if (fribidi_get_mirror_char (wc, &mirrored_ch))
+	if (pango_get_mirror_char (wc, &mirrored_ch))
 	  wc = mirrored_ch;
 
       if (wc == 0x200B || wc == 0x200E || wc == 0x200F)	/* Zero-width characters */
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index 66082ee8..a6a4b036 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -22,7 +22,7 @@
 #include <glib.h>
 #include "pango.h"
 #include "pangowin32.h"
-#include <fribidi/fribidi.h>
+#include "pango-utils.h"
 
 static PangoEngineRange basic_ranges[] = {
   /* Language characters */
@@ -178,13 +178,13 @@ basic_engine_shape (PangoFont        *font,
   for (i = 0; i < n_chars; i++)
     {
       gunichar wc;
-      FriBidiChar mirrored_ch;
+      gunichar mirrored_ch;
       PangoGlyph index;
 
       wc = g_utf8_get_char (p);
 
       if (analysis->level % 2)
-	if (fribidi_get_mirror_char (wc, &mirrored_ch))
+	if (pango_get_mirror_char (wc, &mirrored_ch))
 	  wc = mirrored_ch;
 
       if (wc == 0x200B || wc == 0x200E || wc == 0x200F)	/* Zero-width characters */
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c
index 944ec41c..f044043b 100644
--- a/modules/basic/basic-x.c
+++ b/modules/basic/basic-x.c
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include "pango.h"
 #include "pangox.h"
-#include <fribidi/fribidi.h>
+#include "pango-utils.h"
 
 typedef struct _CharRange CharRange;
 typedef struct _Charset Charset;
@@ -376,7 +376,7 @@ basic_engine_shape (PangoFont        *font,
   for (i=0; i < n_chars; i++)
     {
       gunichar wc;
-      FriBidiChar mirrored_ch;
+      gunichar mirrored_ch;
       PangoGlyph index;
       char buf[6];
       const char *input;
@@ -385,7 +385,7 @@ basic_engine_shape (PangoFont        *font,
 
       input = p;
       if (analysis->level % 2)
-	if (fribidi_get_mirror_char (wc, &mirrored_ch))
+	if (pango_get_mirror_char (wc, &mirrored_ch))
 	  {
 	    wc = mirrored_ch;
 	    
diff --git a/modules/basic/basic.c b/modules/basic/basic.c
index 944ec41c..f044043b 100644
--- a/modules/basic/basic.c
+++ b/modules/basic/basic.c
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include "pango.h"
 #include "pangox.h"
-#include <fribidi/fribidi.h>
+#include "pango-utils.h"
 
 typedef struct _CharRange CharRange;
 typedef struct _Charset Charset;
@@ -376,7 +376,7 @@ basic_engine_shape (PangoFont        *font,
   for (i=0; i < n_chars; i++)
     {
       gunichar wc;
-      FriBidiChar mirrored_ch;
+      gunichar mirrored_ch;
       PangoGlyph index;
       char buf[6];
       const char *input;
@@ -385,7 +385,7 @@ basic_engine_shape (PangoFont        *font,
 
       input = p;
       if (analysis->level % 2)
-	if (fribidi_get_mirror_char (wc, &mirrored_ch))
+	if (pango_get_mirror_char (wc, &mirrored_ch))
 	  {
 	    wc = mirrored_ch;
 	    
diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c
index 0b237d46..59364d7a 100644
--- a/modules/thai/thai-x.c
+++ b/modules/thai/thai-x.c
@@ -24,7 +24,6 @@
 #include <glib.h>
 #include "pango.h"
 #include "pangox.h"
-#include <fribidi/fribidi.h>
 
 /* We handle the range U+0e01 to U+0e5b exactly
  */
diff --git a/modules/thai/thai.c b/modules/thai/thai.c
index 0b237d46..59364d7a 100644
--- a/modules/thai/thai.c
+++ b/modules/thai/thai.c
@@ -24,7 +24,6 @@
 #include <glib.h>
 #include "pango.h"
 #include "pangox.h"
-#include <fribidi/fribidi.h>
 
 /* We handle the range U+0e01 to U+0e5b exactly
  */