From 89f91f009169284b3dba6a3ba7f569223d4dd6cc Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 22 Nov 2019 13:13:41 -0700 Subject: [PATCH] dtpdmd: make it build --- cde/configure.ac | 3 +++ cde/programs/dtpdmd/Makefile.am | 11 +++++------ cde/programs/dtpdmd/dtpdmdP.h | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cde/configure.ac b/cde/configure.ac index 3794fc4d..051dbbe0 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -285,6 +285,7 @@ dnl Setup XTOOLLIB - we do it in this specific order to avoid ordering dnl issues XTOOLLIB="$X_LIBS" AC_CHECK_LIB(X11, XOpenDisplay, [XTOOLLIB="-lX11"]) +AC_CHECK_LIB(Xau, XauReadAuth, [XTOOLLIB="-lXau ${XTOOLLIB}"]) AC_CHECK_LIB(Xt, XtInitialize, [XTOOLLIB="-lXt ${XTOOLLIB}"]) AC_CHECK_LIB(ICE, IceCloseConnection, [XTOOLLIB="-lICE ${XTOOLLIB}"]) AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"]) @@ -460,6 +461,8 @@ programs/dtpdm/Makefile programs/dtsr/Makefile +programs/dtpdmd/Makefile + ]) AC_OUTPUT diff --git a/cde/programs/dtpdmd/Makefile.am b/cde/programs/dtpdmd/Makefile.am index b429788f..08fb020c 100644 --- a/cde/programs/dtpdmd/Makefile.am +++ b/cde/programs/dtpdmd/Makefile.am @@ -2,14 +2,13 @@ MAINTAINERCLEANFILES = Makefile.in bin_PROGRAMS = dtpdmd -dtpdmd_CFLAGS = -DCDE_INSTALLATION_TOP='"'${prefix}'"' +dtpdmd_CFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" -dtpdmd_LDADD = $(XTOOLLIB) ${X_LIBS} +dtpdmd_LDADD = $(XTOOLLIB) if SOLARIS -dtpdmd_LDADD += -lm -ldl +dtpdmd_LDADD += -ldl endif -dtpdmd_SOURCES = dispatch.c dtpdmd.c mailbox.c \ - manager.c records.c setup.c \ - util.c +dtpdmd_SOURCES = dispatch.c dtpdmd.c mailbox.c manager.c records.c \ + nlmsg.c setup.c util.c dtpdmdP.h nlmsg.h diff --git a/cde/programs/dtpdmd/dtpdmdP.h b/cde/programs/dtpdmd/dtpdmdP.h index 5d2b49c9..7c6f941c 100644 --- a/cde/programs/dtpdmd/dtpdmdP.h +++ b/cde/programs/dtpdmd/dtpdmdP.h @@ -34,10 +34,12 @@ *****************************************************************************/ #include +#include #include #include #include #include +#include #include #include #include -- 2.25.1