Fix build for HP-UX and older Solaris: (un)setenv. Bug 1578

Broken-by: bc3c7bb7d4ab

6 files changed, 35 insertions, 2 deletions

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index e0bdeecfd..ff4a83e2c 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -623,7 +623,7 @@ spool_out.o:     $(HDRS) spool_out.c
 std-crypto.o:    $(HDRS) std-crypto.c
 store.o:         $(HDRS) store.c
 string.o:        $(HDRS) string.c
-tls.o:           $(HDRS) tls.c setenv.c \
+tls.o:           $(HDRS) tls.c \
 		 tls-gnu.c tlscert-gnu.c \
 		 tls-openssl.c tlscert-openssl.c
 tod.o:           $(HDRS) tod.c
diff --git a/src/OS/Makefile-HP-UX b/src/OS/Makefile-HP-UX
index 073d67aba..e00940f32 100644
--- a/src/OS/Makefile-HP-UX
+++ b/src/OS/Makefile-HP-UX
@@ -22,4 +22,6 @@ EXIMON_TEXTPOP=
 DBMLIB=-lndbm
 RANLIB=@true
 
+os.o: setenv.c
+
 # End
diff --git a/src/OS/Makefile-SunOS5 b/src/OS/Makefile-SunOS5
index e60a6c088..351b43ad1 100644
--- a/src/OS/Makefile-SunOS5
+++ b/src/OS/Makefile-SunOS5
@@ -19,4 +19,6 @@ XINCLUDE=-I$(X11)/include
 XLFLAGS=-L$(X11)/lib -R$(X11)/lib
 X11LIB=$(X11)/lib
 
+os.o: setenv.c
+
 # End
diff --git a/src/OS/os.c-HP-UX b/src/OS/os.c-HP-UX
new file mode 100644
index 000000000..1b78d7eb8
--- /dev/null
+++ b/src/OS/os.c-HP-UX
@@ -0,0 +1,14 @@
+/*************************************************
+*     Exim - an Internet mail transport agent    *
+*************************************************/
+
+/* Copyright (c) University of Cambridge 2016 */
+/* Copyright (c) Jeremy Harris 2016 */
+/* See the file NOTICE for conditions of use and distribution. */
+
+/* HP-UX-specific code. This is concatenated onto the generic
+src/os.c file. */
+
+#include "setenv.c"
+
+/* End of os.c-SunHP-UX */
diff --git a/src/OS/os.c-SunOS5 b/src/OS/os.c-SunOS5
new file mode 100644
index 000000000..e298f6d54
--- /dev/null
+++ b/src/OS/os.c-SunOS5
@@ -0,0 +1,16 @@
+/*************************************************
+*     Exim - an Internet mail transport agent    *
+*************************************************/
+
+/* Copyright (c) University of Cambridge 2016 */
+/* Copyright (c) Jeremy Harris 2016 */
+/* See the file NOTICE for conditions of use and distribution. */
+
+/* Solaris-specific code. This is concatenated onto the generic
+src/os.c file. */
+
+#ifdef MISSING_UNSETENV_3
+# include "setenv.c"
+#endif
+
+/* End of os.c-SunOS5 */
diff --git a/src/OS/os.h-HP-UX b/src/OS/os.h-HP-UX
index 1b599231d..4998734f6 100644
--- a/src/OS/os.h-HP-UX
+++ b/src/OS/os.h-HP-UX
@@ -10,7 +10,6 @@
 #define FSCALE          1.0
 
 #define HAVE_SYS_STATVFS_H
-#define MISSING_UNSETENV_3
 
 #define F_FREESP           O_TRUNC
 #define NEED_H_ERRNO       1