summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-05
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-25
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/Makefile.am4
8 files changed, 37 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3aee624f..8c9d45a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (pango_querymodules_LDADD): Add
+ $(X_EXTRA_LIBS) (reported Richard Warren)
+
Tue Feb 26 19:06:07 2002 Owen Taylor <otaylor@redhat.com>
* pango/mini-xft/minixftint.h: Fix some C++ style
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 3aee624f..8c9d45a7 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (pango_querymodules_LDADD): Add
+ $(X_EXTRA_LIBS) (reported Richard Warren)
+
Tue Feb 26 19:06:07 2002 Owen Taylor <otaylor@redhat.com>
* pango/mini-xft/minixftint.h: Fix some C++ style
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 3aee624f..8c9d45a7 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (pango_querymodules_LDADD): Add
+ $(X_EXTRA_LIBS) (reported Richard Warren)
+
Tue Feb 26 19:06:07 2002 Owen Taylor <otaylor@redhat.com>
* pango/mini-xft/minixftint.h: Fix some C++ style
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 3aee624f..8c9d45a7 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (pango_querymodules_LDADD): Add
+ $(X_EXTRA_LIBS) (reported Richard Warren)
+
Tue Feb 26 19:06:07 2002 Owen Taylor <otaylor@redhat.com>
* pango/mini-xft/minixftint.h: Fix some C++ style
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 3aee624f..8c9d45a7 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (pango_querymodules_LDADD): Add
+ $(X_EXTRA_LIBS) (reported Richard Warren)
+
Tue Feb 26 19:06:07 2002 Owen Taylor <otaylor@redhat.com>
* pango/mini-xft/minixftint.h: Fix some C++ style
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 3aee624f..8c9d45a7 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (pango_querymodules_LDADD): Add
+ $(X_EXTRA_LIBS) (reported Richard Warren)
+
Tue Feb 26 19:06:07 2002 Owen Taylor <otaylor@redhat.com>
* pango/mini-xft/minixftint.h: Fix some C++ style
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 3aee624f..8c9d45a7 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Wed Feb 27 08:55:32 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pango/Makefile.am (pango_querymodules_LDADD): Add
+ $(X_EXTRA_LIBS) (reported Richard Warren)
+
Tue Feb 26 19:06:07 2002 Owen Taylor <otaylor@redhat.com>
* pango/mini-xft/minixftint.h: Fix some C++ style
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 418f2e69..bc395b34 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -158,7 +158,7 @@ libpango_la_LIBADD = mini-fribidi/libmini-fribidi.la
endif
libpangox_la_LDFLAGS = -release $(VERSION)
-libpangox_la_LIBADD = libpango.la $(INCLUDED_X_MODULES) $(X_LIBS)
+libpangox_la_LIBADD = libpango.la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS)
libpangox_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango.la
libpangowin32_la_SOURCES = \
@@ -263,7 +263,7 @@ if HAVE_XFT
pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la $(GLIB_LIBS) $(FRIBIDI_LIBS) $(XFT_LIBS) $(FREETYPE_LIBS)
pango_querymodules_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) libpangoxft.la libpango.la
else
-pango_querymodules_LDADD = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) $(GLIB_LIBS) $(FRIBIDI_LIBS) $(X_LIBS) $(FREETYPE_LIBS)
+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_DEPENDENCIES = $(FT2_BUILD_LIBS) $(X_BUILD_LIBS) $(WIN32_BUILD_LIBS) libpango.la
endif