minecraft-pi-reborn
/
zenity
1
0
Fork 0
Code Pull Requests Activity

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.
This commit is contained in:
Glynn Foster 2004-07-18 23:37:06 +00:00 committed by Glynn Foster
parent 7a71be6387
commit e6290c86ff
4 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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

1
THANKS
View File

@ -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>",

34
configure.in
View File

@ -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 *******************************

3
src/Makefile.am
View File

@ -23,7 +23,8 @@ INCLUDES = \
-DZENITY_DATADIR=\""$(datadir)/zenity"\"
zenity_LDADD = \
$(ZENITY_LIBS)
$(ZENITY_LIBS) \
$(X_LIBS)
gladedir = $(datadir)/zenity