From c44d4f24c8ba3ecc5680d0c7bb7c6a6d07bda612 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 28 Oct 2019 20:04:10 -0600 Subject: [PATCH] configure: rework how $XTOOLLIB works --- cde/configure.ac | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cde/configure.ac b/cde/configure.ac index 177ff42a..2e088fae 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -171,9 +171,6 @@ AC_SUBST(XM_INCDIR, '-I$(top_builddir)/include/Xm') AC_SUBST(CSA_INCDIR, '-I$(top_builddir)/include/csa') AC_SUBST(SPC_INCDIR, '-I$(top_builddir)/include/SPC') -dnl JET FIXME/CHECKME -AC_SUBST(XTOOLLIB, "-lICE -lSM -lXt") - AC_ARG_ENABLE(japanese, [--build-japanese Build Japanese (default=no)]) AM_CONDITIONAL([JAPANESE], [test "build_japanese" = "yes"]) @@ -245,6 +242,13 @@ AC_CHECK_LIB(tirpc, main, [TIRPCINC="-DOPT_TIRPC -I/usr/include/tirpc"; TIRPCLIB AC_SUBST(TIRPCINC) AC_SUBST(TIRPCLIB) +dnl Setup XTOOLLIB +XTOOLLIB="" +AC_CHECK_LIB(X11, XOpenDisplay, [XTOOLLIB="-lX11"]) +AC_CHECK_LIB(Xt, XtInitialize, [XTOOLLIB="-lXt ${XTOOLLIB}"]) +AC_CHECK_LIB(ICE, IceCloseConnection, [XTOOLLIB="-lICE ${XTOOLLIB}"]) +AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"]) +AC_SUBST([XTOOLLIB]) dnl set CPPFLAGS, CFLAGS, and CXXFLAGS. dnl The Autoconf manual says that these are user variables and -- 2.25.1