summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-24 10:13:45 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-25 10:16:55 -0700
commitd0d9975f459fd098e5b2cdc75edf4a9ebab6afd6 (patch)
treea24a178430636b66b38a2cceff0e39a650c80357
parentb8747f951cb3652975ce8484aaaddd50247729f7 (diff)
Only need CFLAGS, not LIBS from xau package
xhost needs the Family definitions from <X11/Xauth.h> to build, but doesn't call any libXau functions, so doesn't need to link against it. Fixes Solaris ld -z guidance warning: ld: guidance: removal of unused dependency recommended: libXau.so.6 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Jamey Sharp <jamey@minilop.net>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac5
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index be6f2c9..fbbc0f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = xhost
xhost_SOURCES = xhost.c
-AM_CFLAGS = $(CWARNFLAGS) $(XHOST_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XHOST_CFLAGS) $(XAU_CFLAGS)
xhost_LDADD = $(XHOST_LIBS)
MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index a30c5e2..96dde43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,10 @@ AC_TYPE_SIGNAL
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XHOST, x11 xmuu xau)
+# - Both CFLAGS & LIBS needed:
+PKG_CHECK_MODULES(XHOST, x11 xmuu)
+# - Only CFLAGS needed, not libs:
+PKG_CHECK_MODULES(XAU, xau)
# Transport selection macro from xtrans.m4
XTRANS_CONNECTION_FLAGS