[PATCH:bitmap] atobm only depends on xproto, not x11

[Alan Coopersmith]

It only includes <X11/Xos.h>, no headers or functions from libX11.
Due to a typo in Makefile.am (also fixed) it wasn't actually linking
with libX11 even though it had x11 in its PKG_CHECK_MODULES list.

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

diff --git a/Makefile.am b/Makefile.am
index 98d7c72..99ee6f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ bmtoa_LDADD = $(BMTOA_LIBS)
 bmtoa_SOURCES = bmtoa.c
 
 atobm_CFLAGS = $(CWARNFLAGS) $(ATOBM_CFLAGS)
-atobm_LDADD = $(ATOBM_LDADD)
+atobm_LDADD = $(ATOBM_LIBS)
 atobm_SOURCES = atobm.c
 
 EXTRA_DIST = autogen.sh
diff --git a/configure.ac b/configure.ac
index 9c977a6..e2ef3ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,9 +42,9 @@ AM_PROG_CC_C_O
 
 AC_CHECK_FUNCS([mkstemp])
 
-# Obtain compiler/linker options from depedencies
+# Obtain compiler/linker options from dependencies
 PKG_CHECK_MODULES(BMTOA, x11 xmu)
-PKG_CHECK_MODULES(ATOBM, x11)
+PKG_CHECK_MODULES(ATOBM, xproto)
 PKG_CHECK_MODULES(BITMAP, xbitmaps xaw7 xmu)
 
 PKG_CHECK_MODULES(APPDEFS, xt)
-- 
1.7.3.2