Remove vestiges of support for external fribidi library.

Thu Jul 24 15:37:16 2003  Owen Taylor  <otaylor@redhat.com>

        * configure.in pango/Makefile.am pango.pc.in: Remove
        vestiges of support for external fribidi library.

8 files changed, 29 insertions, 51 deletions

diff --git a/ChangeLog b/ChangeLog
index bf4094ee..ce3b82bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 24 15:37:16 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in pango/Makefile.am pango.pc.in: Remove
+	vestiges of support for external fribidi library.
+
 Thu Jul 24 15:09:22 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in examples/Makefile.am examples/viewer-qt.{cc,h}:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index bf4094ee..ce3b82bb 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Thu Jul 24 15:37:16 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in pango/Makefile.am pango.pc.in: Remove
+	vestiges of support for external fribidi library.
+
 Thu Jul 24 15:09:22 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in examples/Makefile.am examples/viewer-qt.{cc,h}:
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index bf4094ee..ce3b82bb 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Thu Jul 24 15:37:16 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in pango/Makefile.am pango.pc.in: Remove
+	vestiges of support for external fribidi library.
+
 Thu Jul 24 15:09:22 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in examples/Makefile.am examples/viewer-qt.{cc,h}:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index bf4094ee..ce3b82bb 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Thu Jul 24 15:37:16 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in pango/Makefile.am pango.pc.in: Remove
+	vestiges of support for external fribidi library.
+
 Thu Jul 24 15:09:22 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in examples/Makefile.am examples/viewer-qt.{cc,h}:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index bf4094ee..ce3b82bb 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Thu Jul 24 15:37:16 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in pango/Makefile.am pango.pc.in: Remove
+	vestiges of support for external fribidi library.
+
 Thu Jul 24 15:09:22 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in examples/Makefile.am examples/viewer-qt.{cc,h}:
diff --git a/configure.in b/configure.in
index ecf4c5cc..3fdf98e9 100644
--- a/configure.in
+++ b/configure.in
@@ -270,44 +270,6 @@ AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 
 #
-# Checks for fribidi
-#
-#AC_ARG_WITH(fribidi, [ --with-fribidi     Use external fribidi library ],,with_fribidi=no)
-#
-FRIBIDI_LIBS=""
-FRIBIDI_CFLAGS=""
-FRIBIDI_PC=""
-have_fribidi=no
-#
-#if test "x$with_fribidi" = "xyes" ; then
-#   AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no)
-#   if test x$FRIBIDI_CONFIG = xno ; then
-#     AC_MSG_ERROR([*** fribidi-config not found])
-#   fi
-#
-#   if $FRIBIDI_CONFIG --cflags | grep lib/glib/include > /dev/null ; then
-#     AC_MSG_ERROR([*** fribidi appears to be compiled against GLib-1.2.x.
-#     *** You must compile fribidi with GLib-1.3.1 or better.])
-#   fi
-# 
-#   FRIBIDI_CFLAGS="`$FRIBIDI_CONFIG --cflags`"
-#   CFLAGS="$CFLAGS $FRIBIDI_CFLAGS"
-#   FRIBIDI_LIBS="`$FRIBIDI_CONFIG --libs`"
-#   FRIBIDI_PC="fribidi,"	
-#
-#   AC_CHECK_LIB(fribidi, fribidi_get_mirror_char, :,
-#	        AC_MSG_ERROR([*** libfribidi not found.]), $FRIBIDI_LIBS)
-#
-#   AC_DEFINE(HAVE_FRIBIDI)
-#   have_fribidi=yes
-#fi
-
-AC_SUBST(FRIBIDI_LIBS)
-AC_SUBST(FRIBIDI_CFLAGS)
-AC_SUBST(FRIBIDI_PC)
-AM_CONDITIONAL(HAVE_FRIBIDI, test x$have_fribidi = xyes)
-
-#
 # Allow setting a default path for XftConfig
 #
 AC_ARG_WITH(xftconfig-dir, [  --with-xftconfig-dir=PATH   path to system XftConfig file for minixft ])
diff --git a/pango.pc.in b/pango.pc.in
index 5efe68a7..db556161 100644
--- a/pango.pc.in
+++ b/pango.pc.in
@@ -8,7 +8,7 @@ pango_module_version=@PANGO_MODULE_VERSION@
 Name: Pango
 Description: Internationalized text handling
 Version: @VERSION@
-Requires: @FRIBIDI_PC@glib-2.0,gobject-2.0,gmodule-2.0
+Requires: glib-2.0,gobject-2.0,gmodule-2.0
 Libs: -L${libdir} -lpango-@PANGO_API_VERSION@
 Cflags: -I${includedir}/pango-1.0
 
diff --git a/pango/Makefile.am b/pango/Makefile.am
index a03a7669..32553a97 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -8,12 +8,7 @@ if HAVE_FREETYPE
 OPENTYPE_SUBDIR=opentype
 endif
 
-if HAVE_FRIBIDI
-else
-FRIBIDI_SUBDIR = mini-fribidi
-endif
-
-SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR)
+SUBDIRS = $(OPENTYPE_SUBDIR) mini-fribidi
 
 DIST_SUBDIRS = mini-fribidi opentype
 
@@ -158,11 +153,7 @@ libpango_1_0_la_LDFLAGS =			\
 	$(GLIB_LIBS)				\
 	$(no_undefined) $(pango_export_symbols)
 
-if HAVE_FRIBIDI
-libpango_1_0_la_LIBADD = $(pango_win32res)
-else
 libpango_1_0_la_LIBADD = mini-fribidi/libmini-fribidi.la $(pango_win32res)
-endif
 libpango_1_0_la_DEPENDENCIES = $(pango_win32res)
 
 libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
@@ -281,10 +272,10 @@ pango_querymodules_SOURCES = \
 	querymodules.c
 
 if HAVE_XFT
-pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS)
+pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la $(GLIB_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS)
 pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la
 else
-pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS) $(X_EXTRA_LIBS)
+pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(X_LIBS) $(FREETYPE_LIBS) $(X_EXTRA_LIBS)
 pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango-$(PANGO_API_VERSION).la
 endif