diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2005-05-21 Alan Coopersmith <alan.coopersmith@sun.com> + + * configure.ac: + * src/Makefile.am: + Add libXext to required modules + Fix CFLAGS & LIBS to pass through correctly + 2005-05-17 <ssp@aware-of-vacuity.boston.redhat.com> * configure.ac: Remove rest of half-removed if statement diff --git a/configure.ac b/configure.ac index a4d53a5..1c51193 100644 --- a/configure.ac +++ b/configure.ac @@ -36,10 +36,10 @@ AC_PROG_CC AC_PROG_LIBTOOL # Check for X and print proto -PKG_CHECK_MODULES(XPRINT, x11 printproto) +PKG_CHECK_MODULES(XPRINT, x11 xext printproto) -AC_SUBST(XP_CFLAGS) -AC_SUBST(XP_LIBS) +AC_SUBST(XPRINT_CFLAGS) +AC_SUBST(XPRINT_LIBS) AC_OUTPUT([Makefile src/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index d6b91a4..7ec307b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,9 @@ libXp_la_SOURCES = \ \ XpExtUtil.h -libXp_la_LIBADD = @X_LIBS@ +libXp_la_LIBADD = $(XPRINT_LIBS) + +libXp_la_CFLAGS = $(XPRINT_CFLAGS) INCLUDES = -I$(top_srcdir)/include/X11/extensions |