diff options
| author | Glynn Foster <glynn.foster@sun.com> | 2004-07-18 23:37:06 +0000 |
|---|---|---|
| committer | Glynn Foster <gman@src.gnome.org> | 2004-07-18 23:37:06 +0000 |
| commit | e6290c86ffbb3c29a2bb071744ab7e425327dc27 (patch) | |
| tree | ed75cc4138e5bd1a4010625716ab5a41d4783ac8 | |
| parent | 7a71be6387c47b6160ea4e7f289bec1ec2111fd4 (diff) | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | configure.in | 34 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
4 files changed, 43 insertions, 1 deletions
@@ -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 @@ -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 5e6d950..11c9012 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 b09aacd..c5c9fcd 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 |