Autoconf: Retire Ultrix-specific workarounds. [skip appveyor]

(same as in tcpslice and tcpdump)

3 files changed, 1 insertions, 59 deletions

diff --git a/Makefile.in b/Makefile.in
index 94a7cc5d..c42660b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,12 +100,7 @@ SRC =	$(PLATFORM_C_SRC) \
 	$(MODULE_C_SRC) $(REMOTE_C_SRC) $(COMMON_C_SRC) \
 	$(GENERATED_C_SRC)
 
-# We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
-# hack the extra indirection
-OBJ =	$(PLATFORM_C_SRC:.c=.o) \
-	$(MODULE_C_SRC:.c=.o) $(REMOTE_C_SRC:.c=.o) $(COMMON_C_SRC:.c=.o) \
-	$(GENERATED_C_SRC:.c=.o) \
-	$(LIBOBJS)
+OBJ =	$(SRC:.c=.o) $(LIBOBJS)
 
 PUBHDR = \
 	pcap.h \
@@ -296,7 +291,6 @@ EXTRA_DIST = \
 	lbl/os-osf5.h \
 	lbl/os-solaris2.h \
 	lbl/os-sunos4.h \
-	lbl/os-ultrix4.h \
 	libpcap.pc.in \
 	missing/asprintf.c \
 	missing/getopt.c \
diff --git a/aclocal.m4 b/aclocal.m4
index 5aff656e..ea495421 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -196,22 +196,6 @@ AC_DEFUN(AC_LBL_C_INIT,
 		    #
 		    AC_LBL_CHECK_COMPILER_OPT($1, -xldscope=hidden)
 		    ;;
-
-	    ultrix*)
-		    AC_MSG_CHECKING(that Ultrix $CC hacks const in prototypes)
-		    AC_CACHE_VAL(ac_cv_lbl_cc_const_proto,
-			AC_TRY_COMPILE(
-			    [#include <sys/types.h>],
-			    [struct a { int b; };
-			    void c(const struct a *)],
-			    ac_cv_lbl_cc_const_proto=yes,
-			    ac_cv_lbl_cc_const_proto=no))
-		    AC_MSG_RESULT($ac_cv_lbl_cc_const_proto)
-		    if test $ac_cv_lbl_cc_const_proto = no ; then
-			    AC_DEFINE(const,[],
-			        [to handle Ultrix compilers that don't support const in prototypes])
-		    fi
-		    ;;
 	    esac
 	    $1="$$1 -O"
     fi
diff --git a/lbl/os-ultrix4.h b/lbl/os-ultrix4.h
deleted file mode 100644
index 21e57023..00000000
--- a/lbl/os-ultrix4.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 1990, 1993, 1994, 1995, 1996
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* Prototypes missing in Ultrix 4 */
-int	bcmp(const char *, const char *, u_int);
-void	bcopy(const void *, void *, u_int);
-void	bzero(void *, u_int);
-int	getopt(int, char * const *, const char *);
-#ifdef __STDC__
-struct timeval;
-struct timezone;
-#endif
-int	gettimeofday(struct timeval *, struct timezone *);
-int	ioctl(int, int, caddr_t);
-int	pfopen(char *, int);
-int	setlinebuf(FILE *);
-int	socket(int, int, int);
-int	strcasecmp(const char *, const char *);