Remove fallbacks for Imake configuration, assume autoconf

For the original 6.9/7.0 release, we supported using either autoconf or
imake to generate configuration.  For releases after that, we're only
supporting autoconf, so no longer need to check & fall back to imake.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2 files changed, 4 insertions, 30 deletions

diff --git a/def.h b/def.h
index 459bbd2..0d49c55 100644
--- a/def.h
+++ b/def.h
@@ -24,9 +24,8 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#ifdef HAVE_CONFIG_H /* Autotooled for Xorg 7.0? */
+#ifdef HAVE_CONFIG_H
 # include "makedepend-config.h"
-# define USING_AUTOCONF
 #endif
 
 #include <X11/Xos.h>
diff --git a/main.c b/main.c
index cfceb34..91c4792 100644
--- a/main.c
+++ b/main.c
@@ -113,16 +113,7 @@ boolean 	warn_multiple = FALSE;
 static void setfile_cmdinc(struct filepointer *filep, long count, char **list);
 static void redirect(const char *line, const char *makefile);
 
-static
-#ifdef RETSIGTYPE
-RETSIGTYPE
-#else
-# ifdef SIGNALRETURNSINT
-int
-# else
-void
-# endif
-#endif
+static RETSIGTYPE
 catch (int sig)
 {
 	fflush (stdout);
@@ -143,12 +134,6 @@ catch (int sig)
 static struct sigaction sig_act;
 #endif /* USGISH */
 
-#ifndef USING_AUTOCONF
-# if !defined(USGISH) && !defined(_SEQUENT_) && !defined(MINIX)
-#  define HAVE_FCHMOD	1
-# endif
-#endif
-
 int
 main(int argc, char *argv[])
 {
@@ -712,17 +697,7 @@ char *base_name(const char *in_file)
 	return(file);
 }
 
-#ifdef USING_AUTOCONF
-# ifndef HAVE_RENAME
-#  define NEED_RENAME
-# endif
-#else /* Imake configured, check known OS'es without rename() */
-# if defined(USG) && !defined(CRAY) && !defined(SVR4) && !defined(clipper) && !defined(__clipper__)
-#  define NEED_RENAME
-# endif
-#endif
-
-#ifdef NEED_RENAME
+#ifndef HAVE_RENAME
 int rename (char *from, char *to)
 {
     (void) unlink (to);
@@ -733,7 +708,7 @@ int rename (char *from, char *to)
 	return -1;
     }
 }
-#endif /* NEED_RENAME */
+#endif /* !HAVE_RENAME */
 
 static void
 redirect(const char *line, const char *makefile)