r17741 - gnucash/branches/2.2 - [r17723] Bug #536299 Fix underlinking issue: Conditionally add -lX11 to gnome-utils

[Christian Stimming]

Author: cstim
Date: 2008-11-27 06:57:36 -0500 (Thu, 27 Nov 2008)
New Revision: 17741
Trac: http://svn.gnucash.org/trac/changeset/17741

Modified:
   gnucash/branches/2.2/configure.in
   gnucash/branches/2.2/src/gnome-utils/Makefile.am
Log:
[r17723] Bug #536299 Fix underlinking issue: Conditionally add -lX11 to gnome-utils

Follow-up to r17683. Patch by Andi5.

Modified: gnucash/branches/2.2/configure.in
===================================================================
--- gnucash/branches/2.2/configure.in	2008-11-27 11:57:27 UTC (rev 17740)
+++ gnucash/branches/2.2/configure.in	2008-11-27 11:57:36 UTC (rev 17741)
@@ -215,6 +215,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/branches/2.2/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/2.2/src/gnome-utils/Makefile.am	2008-11-27 11:57:27 UTC (rev 17740)
+++ gnucash/branches/2.2/src/gnome-utils/Makefile.am	2008-11-27 11:57:36 UTC (rev 17741)
@@ -195,6 +195,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