summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2005-10-26 19:33:10 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2005-10-26 19:33:10 +0000
commitfa83b324833cc8400a0d020c5608054ae281a07a (patch)
treeb426abbbe20fe13217dda05cb893b0f60c73d2b7
parentba7d66c39c5896f6b326f19f4eebf1332933dee5 (diff)
Set Xaw/Xp flags correctly for xrx plugin modules
-rw-r--r--configure.ac4
-rw-r--r--plugin/Makefile.am4
-rw-r--r--xnest-plugin/Makefile.am4
3 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 2b4324a..1bb76c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,10 @@ PKG_CHECK_MODULES(XRX, x11 xt xext)
AC_SUBST(XRX_CFLAGS)
AC_SUBST(XRX_LIBS)
+XAW_CHECK_XPRINT_SUPPORT(XRX_PLUGIN)
+AC_SUBST(XRX_PLUGIN_CFLAGS)
+AC_SUBST(XRX_PLUGIN_LIBS)
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 298de44..e815212 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -24,7 +24,9 @@ lib_LTLIBRARIES = libxrx.la
INCLUDES = -I$(top_srcdir)/plugin/include -I$(top_srcdir)/rx
-AM_CFLAGS = -DXP_UNIX @XRX_CFLAGS@
+AM_CFLAGS = -DXP_UNIX @XRX_CFLAGS@ @XRX_PLUGIN_CFLAGS@
+
+libxrx_la_LIBADD = @XRX_LIBS@ @XRX_PLUGIN_LIBS@
libxrx_la_SOURCES = \
Global.c \
diff --git a/xnest-plugin/Makefile.am b/xnest-plugin/Makefile.am
index 81815d4..cafeab7 100644
--- a/xnest-plugin/Makefile.am
+++ b/xnest-plugin/Makefile.am
@@ -29,4 +29,6 @@ libxrxnest_la_SOURCES = \
SetWin.c \
XnestDis.c
-AM_CFLAGS = @XRX_CFLAGS@
+AM_CFLAGS = @XRX_CFLAGS@ @XRX_PLUGIN_CFLAGS@
+
+libxrxnest_la_LIBADD = @XRX_LIBS@ @XRX_PLUGIN_LIBS@