I'm getting pretty much what you have now, was tinkering around with some complaints it had, though duno if these fixes in the patch below are legit or not, but the first set stopped it from complaining as much.
It looks like it has the conf.h generated in the build directory in addition to the one in the src? So it will complain on redefinitions if I add the second patch but if it is not there, it complains because time is not defined.
Code:
diff --git a/src/comm.h b/src/comm.h
index 9837c86..7d1ff1d 100644
--- a/src/comm.h
+++ b/src/comm.h
@@ -52,7 +52,8 @@ int write_to_descriptor(socket_t desc, const char *txt);
size_t write_to_output(struct descriptor_data *d, const char *txt, ...) __attribute__ ((format (printf, 2, 3)));
size_t vwrite_to_output(struct descriptor_data *d, const char *format, va_list args);
-typedef RETSIGTYPE sigfunc(int);
+//typedef RETSIGTYPE sigfunc(int);
+#define RETSIGTYPE void;
void echo_off(struct descriptor_data *d);
void echo_on(struct descriptor_data *d);
diff --git a/src/sysdep.h b/src/sysdep.h
index 27b45db..4ff031e 100644
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -173,17 +173,19 @@ extern void abort(), exit();
#endif
#endif
+
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
-# if HAVE_SYS_TIME_H
+# ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
+
#ifdef HAVE_ASSERT_H
#include <assert.h>
#else
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f8670d..acaa2e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,15 @@ check_include_file("signal.h" HAVE_SIGNAL_H)
check_include_file("sys/uio.h" HAVE_SYS_UIO_H)
check_include_file("mcheck.h" HAVE_MCHECK_H)
+# Add the detected defines
+if(HAVE_SYS_TIME_H)
+ add_compile_definitions(HAVE_SYS_TIME_H)
+endif()
+
+if(HAVE_TIME_H)
+ add_compile_definitions(HAVE_TIME_H)
+endif()
+
# macro for checking for functions in libraries
macro(check_function_with_libx FUNCTION LIB VARIABLE)
check_function_exists(${FUNCTION} ${VARIABLE})
diff --git a/src/comm.h b/src/comm.h
index 9837c86..7d1ff1d 100644
