summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliot Lee <sopwith@src.gnome.org>2000-06-08 17:18:51 +0000
committerElliot Lee <sopwith@src.gnome.org>2000-06-08 17:18:51 +0000
commit40bf30500165bd6a5116dc5214890781eb156a8c (patch)
tree84360d436f548477e5e3618ea2e04d535010e315
parentd6af4115ee4fb2140918d150184758b12325e57c (diff)
downloadpango-40bf30500165bd6a5116dc5214890781eb156a8c.tar.gz
Include X_LIBS in libraries for 'pangox' target.
Include X_LIBS in libraries for 'pangox' target.
-rw-r--r--ChangeLog3
-rw-r--r--ChangeLog.pre-1-03
-rw-r--r--ChangeLog.pre-1-103
-rw-r--r--ChangeLog.pre-1-23
-rw-r--r--ChangeLog.pre-1-43
-rw-r--r--ChangeLog.pre-1-63
-rw-r--r--ChangeLog.pre-1-83
-rw-r--r--pango-config.in2
8 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 41eaa55d..7ec5a0b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2000-06-08 Elliot Lee <sopwith@redhat.com>
+ * pango-config.in: Include X_LIBS in libraries for 'pangox' target.
+
2000-06-07 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_iterator_copy): New
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 41eaa55d..7ec5a0b8 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,6 @@
+2000-06-08 Elliot Lee <sopwith@redhat.com>
+ * pango-config.in: Include X_LIBS in libraries for 'pangox' target.
+
2000-06-07 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_iterator_copy): New
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 41eaa55d..7ec5a0b8 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,6 @@
+2000-06-08 Elliot Lee <sopwith@redhat.com>
+ * pango-config.in: Include X_LIBS in libraries for 'pangox' target.
+
2000-06-07 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_iterator_copy): New
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 41eaa55d..7ec5a0b8 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,6 @@
+2000-06-08 Elliot Lee <sopwith@redhat.com>
+ * pango-config.in: Include X_LIBS in libraries for 'pangox' target.
+
2000-06-07 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_iterator_copy): New
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 41eaa55d..7ec5a0b8 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,6 @@
+2000-06-08 Elliot Lee <sopwith@redhat.com>
+ * pango-config.in: Include X_LIBS in libraries for 'pangox' target.
+
2000-06-07 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_iterator_copy): New
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 41eaa55d..7ec5a0b8 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,6 @@
+2000-06-08 Elliot Lee <sopwith@redhat.com>
+ * pango-config.in: Include X_LIBS in libraries for 'pangox' target.
+
2000-06-07 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_iterator_copy): New
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 41eaa55d..7ec5a0b8 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,6 @@
+2000-06-08 Elliot Lee <sopwith@redhat.com>
+ * pango-config.in: Include X_LIBS in libraries for 'pangox' target.
+
2000-06-07 Havoc Pennington <hp@redhat.com>
* pango/pango-attributes.c (pango_attr_iterator_copy): New
diff --git a/pango-config.in b/pango-config.in
index 1ccc9a9f..cdee18a5 100644
--- a/pango-config.in
+++ b/pango-config.in
@@ -88,7 +88,7 @@ fi
if test "$echo_libs" = "yes"; then
libs="-lpango -lfribidi @UNICODE_LIBS@ @GLIB_LIBS@"
if test "$lib_pangox" = "yes"; then
- libs="-lpangox $libs"
+ libs="@X_LIBS@ -lpangox $libs"
fi
echo -L@libdir@ $libs
fi