From 67bf7e0061fc1c778b9fee0f2bb4ce23059c476f Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 15 Dec 2009 15:01:01 -0800 Subject: Combine pkg-config checks now that we can hardcode xaw7 Signed-off-by: Alan Coopersmith --- Makefile.am | 2 +- configure.ac | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index f0b0fa5..bbca4ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = listres -AM_CFLAGS = $(LISTRES_CFLAGS) -D_BSD_SOURCE +AM_CFLAGS = $(CWARNFLAGS) $(LISTRES_CFLAGS) -D_BSD_SOURCE listres_LDADD = $(LISTRES_LIBS) listres_SOURCES = \ diff --git a/configure.ac b/configure.ac index 71e6bc2..96f2a26 100644 --- a/configure.ac +++ b/configure.ac @@ -38,14 +38,9 @@ AC_PROG_CC AC_PROG_INSTALL -PKG_CHECK_MODULES(XAW, xaw7) - # Checks for pkg-config packages -PKG_CHECK_MODULES(LISTRES, x11 xt xmu) -LISTRES_CFLAGS="$CWARNFLAGS $LISTRES_CFLAGS $XAW_CFLAGS" -LISTRES_LIBS="$LISTRES_LIBS $XAW_LIBS" +PKG_CHECK_MODULES(LISTRES, xaw7 x11 xt xmu) AC_SUBST(LISTRES_CFLAGS) AC_SUBST(LISTRES_LIBS) - AC_OUTPUT([Makefile]) -- cgit v1.2.3