From e6290c86ffbb3c29a2bb071744ab7e425327dc27 Mon Sep 17 00:00:00 2001
From: Glynn Foster <glynn.foster@sun.com>
Date: Sun, 18 Jul 2004 23:37:06 +0000
Subject: Fix up compilation using Forte compiler. Based on patch from Ivan
 Noris.

2004-07-19  Glynn Foster  <glynn.foster@sun.com>

	* configure.in, src/Makefile.am: Fix up compilation
	using Forte compiler. Based on patch from Ivan Noris.
	Fixes #143041.
---
 ChangeLog       |  6 ++++++
 THANKS          |  1 +
 configure.in    | 34 ++++++++++++++++++++++++++++++++++
 src/Makefile.am |  3 ++-
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a26eee12..3c3dc087 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-19  Glynn Foster  <glynn.foster@sun.com>
+
+	* configure.in, src/Makefile.am: Fix up compilation
+	using Forte compiler. Based on patch from Ivan Noris. 
+	Fixes #143041.
+
 2004-06-18  Glynn Foster  <glynn.foster@sun.com>
 
 	* THANKS, src/about.c, src/progress.c: Patch
diff --git a/THANKS b/THANKS
index ddbe3240..0502752e 100644
--- a/THANKS
+++ b/THANKS
@@ -19,6 +19,7 @@
   "Kjartan Maraas  <kmaraas gnome org>",
   "Buhan Milne  <bgmilne linux-mandrake com>",
   "Christian Monneckes  <c-w-m gmx de>",
+  "Ivan Noris  <vix vazka sk>",
   "Havoc Pennington  <hp redhat com>",
   "Jan Arne Petersen  <jpetersen uni-bonn de>",
   "Kevin C  Krinke  <kckrinke opendoorsoftware com>",
diff --git a/configure.in b/configure.in
index 5e6d950c..11c90123 100644
--- a/configure.in
+++ b/configure.in
@@ -26,6 +26,40 @@ if test x$SCROLLKEEPER_CONFIG = xno; then
 	AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
 fi
 
+dnl ***********************************************
+dnl X development libraries check
+dnl ***********************************************
+                                                                                                                                                             
+#
+# If Pango included the shared library dependencies from X11 in
+# the pkg-config output, then we use that (to avoid duplicates).
+# but if they were omitted to avoid binary compatibility problems
+# then we need to repeat the checks.
+#
+if $PKG_CONFIG --exists pangoxft ; then
+  PANGO_PACKAGES="pangox pangoxft"
+else
+  PANGO_PACKAGES="pangox"
+fi
+                                                                                                                                                             
+x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
+case x_libs in
+  *-lX11*) pango_omitted_x_deps=no ;;
+  *)       pango_omitted_x_deps=yes ;;
+esac
+                                                                                                                                                             
+if test $pango_omitted_x_deps = yes ; then
+  AC_PATH_XTRA
+                                                                                                                                                             
+  if test x$no_x = xyes ; then
+    AC_MSG_ERROR([X development libraries not found])
+  else
+    X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+  fi
+fi
+                                                                                                                                                             
+AC_SUBST(X_LIBS)
+
 dnl *******************************
 dnl perl check
 dnl *******************************
diff --git a/src/Makefile.am b/src/Makefile.am
index b09aacd7..c5c9fcda 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,8 @@ INCLUDES = \
 	-DZENITY_DATADIR=\""$(datadir)/zenity"\"
 
 zenity_LDADD = \
-	$(ZENITY_LIBS)
+	$(ZENITY_LIBS)		\
+	$(X_LIBS)
 
 gladedir = $(datadir)/zenity
 
-- 
cgit