From 4f8a2e34e5098e9960b2a72d031303fa4ec77ac9 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Tue, 29 Oct 2019 18:35:54 -0600
Subject: [PATCH] configure: Add -lDtXinerama to DTCLIENTLIBS and set
 USE_XINERAMA in CFLAGS

So that means Xinerama support is required now, but then it always has
been anyway.

In time, this can be made configurable if needed.
---
 cde/configure.ac | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cde/configure.ac b/cde/configure.ac
index b267da7d..f22c02db 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -164,7 +164,8 @@ AC_SUBST(LIBMMDB, '$(top_builddir)/lib/DtMmdb/libDtMmdb.la')
 AC_SUBST(LIBHELP, '$(top_builddir)/lib/DtHelp/libDtHelp.la')
 AC_SUBST(LIBCSA, '$(top_builddir)/lib/csa/libcsa.la')
 
-AC_SUBST(DTCLIENTLIBS, '$(LIBPRINT) $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT)')
+AC_SUBST(DTCLIENTLIBS, '$(LIBPRINT) $(LIBHELP) $(LIBWIDGET) $(LIBSVC) \
+$(LIBTT) $(LIBXIN)')
 
 dnl set up come convenience replacements for global include dirs
 AC_SUBST(DT_INCDIR, '-I$(top_builddir)/include/Dt')
@@ -247,6 +248,7 @@ dnl libraries
 AC_CHECK_LIB(tirpc, main, [TIRPCINC="-DOPT_TIRPC -I/usr/include/tirpc"; TIRPCLIB=-ltirpc])
 AC_SUBST(TIRPCINC)
 AC_SUBST(TIRPCLIB)
+AC_CHECK_LIB(Xinerama, XineramaQueryScreens, ,[AC_MSG_ERROR([libXinerama not found])])
 
 dnl Setup XTOOLLIB
 XTOOLLIB=""
@@ -256,6 +258,10 @@ AC_CHECK_LIB(ICE, IceCloseConnection, [XTOOLLIB="-lICE ${XTOOLLIB}"])
 AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"])
 AC_SUBST([XTOOLLIB])
 
+dnl Add -DUSE_XINERAMA to SOURCE_CPP_DEFINES for now.  Eventually this
+dnl should be configurable.
+SOURCE_CPP_DEFINES="${SOURCE_CPP_DEFINES} -DUSE_XINERAMA"
+
 dnl set CPPFLAGS, CFLAGS, and CXXFLAGS.
 dnl The Autoconf manual says that these are user variables and
 dnl shouldn't be modified.  It suggests that you create a special
-- 
2.25.1