Merge branch 'master' into dtdocbook

cde/programs/dthelp/dthelpprint/PrintTopics.c

@@ -43,12 +43,13 @@ $COPYRIGHT$:
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include <autotools_config.h>
+#include <cde_config.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <sys/stat.h>    /* for stat() */
 #if defined(sun)