don't link libpango-ot into the module. added libpango-ot.la to

2002-02-28  Sven Neumann  <sven@gimp.org>

	* modules/arabic/Makefile.am: don't link libpango-ot into the module.
	* pango/Makefile.am: added libpango-ot.la to libpangoft2_la_LIBADD.
	Should fix #72934, reported by Raymond Wan.

9 files changed, 53 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 0fc9defd..d9ac36b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2002-02-28  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: align --help output.
+	* modules/arabic/Makefile.am: don't link libpango-ot into the module.
+	* pango/Makefile.am: added libpango-ot.la to libpangoft2_la_LIBADD.
+	Should fix #72934, reported by Raymond Wan.
+
+2002-02-28  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: beautified configure --help output.
 
 Wed Feb 27 11:10:07 2002  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 0fc9defd..d9ac36b3 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,6 +1,12 @@
 2002-02-28  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: align --help output.
+	* modules/arabic/Makefile.am: don't link libpango-ot into the module.
+	* pango/Makefile.am: added libpango-ot.la to libpangoft2_la_LIBADD.
+	Should fix #72934, reported by Raymond Wan.
+
+2002-02-28  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: beautified configure --help output.
 
 Wed Feb 27 11:10:07 2002  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 0fc9defd..d9ac36b3 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,6 +1,12 @@
 2002-02-28  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: align --help output.
+	* modules/arabic/Makefile.am: don't link libpango-ot into the module.
+	* pango/Makefile.am: added libpango-ot.la to libpangoft2_la_LIBADD.
+	Should fix #72934, reported by Raymond Wan.
+
+2002-02-28  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: beautified configure --help output.
 
 Wed Feb 27 11:10:07 2002  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 0fc9defd..d9ac36b3 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,6 +1,12 @@
 2002-02-28  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: align --help output.
+	* modules/arabic/Makefile.am: don't link libpango-ot into the module.
+	* pango/Makefile.am: added libpango-ot.la to libpangoft2_la_LIBADD.
+	Should fix #72934, reported by Raymond Wan.
+
+2002-02-28  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: beautified configure --help output.
 
 Wed Feb 27 11:10:07 2002  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 0fc9defd..d9ac36b3 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,6 +1,12 @@
 2002-02-28  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: align --help output.
+	* modules/arabic/Makefile.am: don't link libpango-ot into the module.
+	* pango/Makefile.am: added libpango-ot.la to libpangoft2_la_LIBADD.
+	Should fix #72934, reported by Raymond Wan.
+
+2002-02-28  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: beautified configure --help output.
 
 Wed Feb 27 11:10:07 2002  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 0fc9defd..d9ac36b3 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,6 +1,12 @@
 2002-02-28  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: align --help output.
+	* modules/arabic/Makefile.am: don't link libpango-ot into the module.
+	* pango/Makefile.am: added libpango-ot.la to libpangoft2_la_LIBADD.
+	Should fix #72934, reported by Raymond Wan.
+
+2002-02-28  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: beautified configure --help output.
 
 Wed Feb 27 11:10:07 2002  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 0fc9defd..d9ac36b3 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,6 +1,12 @@
 2002-02-28  Sven Neumann  <sven@gimp.org>
 
-	* configure.in: align --help output.
+	* modules/arabic/Makefile.am: don't link libpango-ot into the module.
+	* pango/Makefile.am: added libpango-ot.la to libpangoft2_la_LIBADD.
+	Should fix #72934, reported by Raymond Wan.
+
+2002-02-28  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: beautified configure --help output.
 
 Wed Feb 27 11:10:07 2002  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index a35a90af..7786a0aa 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -3,7 +3,7 @@
 pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS)
 pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs)
 pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs)
-pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(top_builddir)/pango/opentype/libpango-ot.la $(FREETYPE_LIBS) $(pangolibs)
+pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs)
 
 if HAVE_XFT
 if INCLUDE_ARABIC_XFT
diff --git a/pango/Makefile.am b/pango/Makefile.am
index f246c2d9..32e80277 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -55,11 +55,11 @@ XFT_BUILD_LIBS=
 endif
 
 if HAVE_FREETYPE
+FT2_HFILES=pangoft2.h pango-ot.h
 FT2_BUILD_LIBS=libpangoft2.la
-FT2_HFILES=pangoft2.h
 else
-FT2_BUILD_LIBS=
 FT2_HFILES=
+FT2_BUILD_LIBS=
 endif
 
 if PLATFORM_WIN32
@@ -191,7 +191,7 @@ libpangoft2_la_SOURCES =   	\
 	pangoft2-fontmap.c	\
 	module-defs-ft2.c
 
-libpangoft2_la_LIBADD = mini-xft/libmini-xft.la libpango.la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) 
+libpangoft2_la_LIBADD = mini-xft/libmini-xft.la opentype/libpango-ot.la libpango.la $(INCLUDED_FT2_MODULES) $(FREETYPE_LIBS) 
 libpangoft2_la_LDFLAGS = -release $(VERSION) $(GLIB_LIBS) $(no_undefined) $(pangoft2_export_symbols)
 libpangoft2_la_DEPENDENCIES = $(INCLUDED_FT2_MODULES) libpango.la