From 61703aea4a92b9ee177c1c4bd01123629fa9510c Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed, 30 Jun 2010 23:15:52 -0700
Subject: Don't link against libXaw since the calls to it are #ifdef NOTDEF

We still need it in CFLAGS for #defines from <X11/Xaw/Cardinals.h>

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 Makefile.am  | 2 +-
 b4light.c    | 2 ++
 configure.ac | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3ba9624..93e6896 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@
 
 bin_PROGRAMS = beforelight
 
-AM_CFLAGS = $(BEFORELIGHT_CFLAGS) $(CWARNFLAGS)
+AM_CFLAGS = $(BEFORELIGHT_CFLAGS) $(XAW_CFLAGS) $(CWARNFLAGS)
 beforelight_LDADD = $(BEFORELIGHT_LIBS)
 
 beforelight_SOURCES =	\
diff --git a/b4light.c b/b4light.c
index 791f5f5..735742d 100644
--- a/b4light.c
+++ b/b4light.c
@@ -32,7 +32,9 @@ in this Software without prior written authorization from the X Consortium.
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
+#ifdef NOTDEF
 #include <X11/Xaw/Label.h>
+#endif
 #include <X11/Xaw/Cardinals.h>
 #include <X11/extensions/scrnsaver.h>
 #include <X11/Xcms.h>
diff --git a/configure.ac b/configure.ac
index f5c0232..a866d9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,8 @@ AC_PROG_INSTALL
 
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(BEFORELIGHT, x11 xscrnsaver xt xaw7)
+PKG_CHECK_MODULES(BEFORELIGHT, x11 xscrnsaver xt)
+PKG_CHECK_MODULES(XAW, xaw7)
 AC_SUBST(BEFORELIGHT_CFLAGS)
 AC_SUBST(BEFORELIGHT_LIBS)
 
-- 
cgit v1.2.3