From: Owen Taylor <otaylor@redhat.com>
Date: Sun, 3 Mar 2002 00:50:02 +0000 (+0000)
Subject: Add -lX11 into x_libs.
X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=80bef5ac25b3d10e63730fe6f8ee27c44771b642

Add -lX11 into x_libs.

Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Add -lX11 into x_libs.
---

diff --git a/ChangeLog b/ChangeLog
index 255978ee4..5e4239a1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add -lX11 into x_libs.
+
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Add a --enable-explicit-deps option to control
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 255978ee4..5e4239a1b 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add -lX11 into x_libs.
+
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Add a --enable-explicit-deps option to control
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 255978ee4..5e4239a1b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add -lX11 into x_libs.
+
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Add a --enable-explicit-deps option to control
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 255978ee4..5e4239a1b 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add -lX11 into x_libs.
+
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Add a --enable-explicit-deps option to control
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 255978ee4..5e4239a1b 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add -lX11 into x_libs.
+
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Add a --enable-explicit-deps option to control
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 255978ee4..5e4239a1b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add -lX11 into x_libs.
+
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Add a --enable-explicit-deps option to control
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 255978ee4..5e4239a1b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Sat Mar  2 19:48:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Add -lX11 into x_libs.
+
 Fri Mar  1 00:46:49 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Add a --enable-explicit-deps option to control
diff --git a/configure.in b/configure.in
index c960c9c4f..999767269 100644
--- a/configure.in
+++ b/configure.in
@@ -955,7 +955,7 @@ if test "x$gdktarget" = "xx11"; then
       CPPFLAGS="$gtk_save_cppflags"
 
       if $have_xft ; then
-        x_libs="-lXft -lXrender -lXext $X_LIBS $FREETYPE_LIBS $X_EXTRA_LIBS"
+        x_libs="$X_LIBS -lXft -lXrender -lXext -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS"
       else
         AC_MSG_ERROR([pangoxft Pango backend found, but Xft not found])
       fi