diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2009-10-14 09:33:32 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2009-10-14 09:33:32 -0700 |
| commit | bbbffdfd47f498a307d31a9a929cc22b404871a9 (patch) | |
| tree | 3369a98af28bcab905ab243f7da49f2bf1d0cad5 | |
| parent | ed89bffdfde4ce6f70197de14aca36eb296f49c5 (diff) | |
xts5: Drop XP pkg-config check
The XP check for protocol tests in configure was grabbing the same
packages as the general XTS check. Consolidate them.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | xts5/XIproto/Makefile.am | 4 | ||||
| -rw-r--r-- | xts5/Xproto/Makefile.am | 4 | ||||
| -rw-r--r-- | xts5/src/libproto/Makefile.am | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index cf846ea0..ed6d8fc1 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,6 @@ AC_PROG_CC AM_PROG_CC_C_O PKG_CHECK_MODULES([XTS], [x11 xext xi xtst]) -PKG_CHECK_MODULES([XP], [x11 xext xi xtst]) PKG_CHECK_MODULES([XT], [x11 xext xt xtst]) dnl PKG_CHECK_MODULES([XAW], [x11 xext xt xtst xaw7]) diff --git a/xts5/XIproto/Makefile.am b/xts5/XIproto/Makefile.am index 30dfae2a..25b147b5 100644 --- a/xts5/XIproto/Makefile.am +++ b/xts5/XIproto/Makefile.am @@ -4,13 +4,13 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/src/tet3/inc \ -I$(top_srcdir)/xts5/include \ - $(XP_CFLAGS) + $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ $(top_builddir)/xts5/src/libproto/libXst.a \ $(top_builddir)/xts5/src/lib/libxtest.a \ $(top_builddir)/xts5/fonts/libfont.a \ $(top_builddir)/src/tet3/apilib/libapi.la \ - $(XP_LIBS) + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/Xproto/Makefile.am b/xts5/Xproto/Makefile.am index 0ad4b8d0..56557ffa 100644 --- a/xts5/Xproto/Makefile.am +++ b/xts5/Xproto/Makefile.am @@ -4,13 +4,13 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/src/tet3/inc \ -I$(top_srcdir)/xts5/include \ - $(XP_CFLAGS) + $(XTS_CFLAGS) LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \ $(top_builddir)/xts5/src/libproto/libXst.a \ $(top_builddir)/xts5/src/lib/libxtest.a \ $(top_builddir)/xts5/fonts/libfont.a \ $(top_builddir)/src/tet3/apilib/libapi.la \ - $(XP_LIBS) + $(XTS_LIBS) testprogdir = $(libexecdir)/$(subdir) nobase_testprog_PROGRAMS = $(tprogs) diff --git a/xts5/src/libproto/Makefile.am b/xts5/src/libproto/Makefile.am index f917b3fb..4fb5474e 100644 --- a/xts5/src/libproto/Makefile.am +++ b/xts5/src/libproto/Makefile.am @@ -32,7 +32,7 @@ XP_OPEN_DIS=XlibXtst.c AM_CFLAGS = -I$(top_srcdir)/include \ -I$(top_srcdir)/src/tet3/inc \ -I$(top_srcdir)/xts5/include \ - $(XP_CFLAGS) + $(XTS_CFLAGS) noinst_LIBRARIES = libXst.a libXst_a_SOURCES =\ XstlibInt.h\ |