AUDIT: r17723 - gnucash/trunk - Bug #536299 Fix underlinking issue: Conditionally add -lX11 to gnome-utils
Christian Stimming
cstim at cvs.gnucash.org
Wed Nov 26 09:22:18 EST 2008
Author: cstim
Date: 2008-11-26 09:22:17 -0500 (Wed, 26 Nov 2008)
New Revision: 17723
Trac: http://svn.gnucash.org/trac/changeset/17723
Modified:
gnucash/trunk/configure.in
gnucash/trunk/src/gnome-utils/Makefile.am
Log:
Bug #536299 Fix underlinking issue: Conditionally add -lX11 to gnome-utils
Follow-up to r17683. Patch by Andi5.
BP
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2008-11-26 13:40:02 UTC (rev 17722)
+++ gnucash/trunk/configure.in 2008-11-26 14:22:17 UTC (rev 17723)
@@ -217,6 +217,7 @@
# These are unavailable on windows/mingw32
AC_CHECK_HEADERS(X11/Xlib.h glob.h)
+AM_CONDITIONAL(HAVE_X11_XLIB_H, test "x$ac_cv_header_X11_Xlib_h" = "xyes")
AC_CHECK_FUNCS(chown gethostname getppid getuid gettimeofday gmtime_r)
AC_CHECK_FUNCS(gethostid link)
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2008-11-26 13:40:02 UTC (rev 17722)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2008-11-26 14:22:17 UTC (rev 17723)
@@ -199,6 +199,10 @@
${REGEX_LIBS} \
${LIBXML2_LIBS}
+if HAVE_X11_XLIB_H
+ libgncmod_gnome_utils_la_LIBADD += -lX11
+endif
+
if BUILDING_FROM_SVN
swig-gnome-utils.c: gnome-utils.i gnc-html.h \
${top_srcdir}/src/base-typemaps.i
More information about the gnucash-changes
mailing list