From 4a3065dff45bf5b0b208e1607e1f4e8906b8432c Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Tue, 19 Sep 2023 12:11:05 -0400
Subject: [PATCH] Where gettimeofday() is required, include both time.h and
 sys/time.h

---
 citadel/server/citserver.c              | 2 +-
 citadel/server/locate_host.c            | 3 ++-
 citadel/server/modules/imap/serv_imap.c | 1 +
 textclient/config.mk                    | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/citadel/server/citserver.c b/citadel/server/citserver.c
index aa7e19139..016dad7b4 100644
--- a/citadel/server/citserver.c
+++ b/citadel/server/citserver.c
@@ -11,8 +11,8 @@
 #include <sys/stat.h>
 #include "sysdep.h"
 #include <time.h>
+#include <sys/time.h>
 #include <libcitadel.h>
-
 #include "ctdl_module.h"
 #include "housekeeping.h"
 #include "locate_host.h"
diff --git a/citadel/server/locate_host.c b/citadel/server/locate_host.c
index 98cfc9c95..635862f41 100644
--- a/citadel/server/locate_host.c
+++ b/citadel/server/locate_host.c
@@ -1,6 +1,6 @@
 // Functions which handle hostname/address lookups and resolution
 //
-// Copyright (c) 1987-2019 by the citadel.org team
+// Copyright (c) 1987-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
 // is subject to the terms of the GNU General Public License, version 3.
@@ -13,6 +13,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <sys/time.h>
 #include <libcitadel.h>
 
 #include "context.h"
diff --git a/citadel/server/modules/imap/serv_imap.c b/citadel/server/modules/imap/serv_imap.c
index 5fc769652..d55971bb5 100644
--- a/citadel/server/modules/imap/serv_imap.c
+++ b/citadel/server/modules/imap/serv_imap.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <time.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/textclient/config.mk b/textclient/config.mk
index 2e87ed94a..de21005a5 100644
--- a/textclient/config.mk
+++ b/textclient/config.mk
@@ -1,5 +1,5 @@
 CFLAGS := -g -I/usr/local/include -DHAVE_OPENSSL
 LDFLAGS := -L/usr/local/lib -lssl -lcrypto -lz
-PREFIX := /usr/local/citadel
-BINDIR := /usr/local/citadel/bin
-CTDLDIR := /usr/local/citadel
+PREFIX := /root/citadel/textclient
+BINDIR := /root/citadel/textclient/bin
+CTDLDIR := /root/citadel/citadel
-- 
2.30.2