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

(same as in tcpslice)

This eliminates one more warning from Autoconf 2.71:

configure.ac:31: warning: The macro `AC_TRY_COMPILE' is obsolete.

diff --git a/Makefile.in b/Makefile.in
index 4191de59a7e61dc04e372932fbe21c822905f35d..d3a988b14f3cf6b1f9197e86c0a876e1b13fc2c9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,8 +264,6 @@ LIBNETDISSECT=libnetdissect.a
 
 SRC =  $(CSRC) $(LOCALSRC)
 
-# We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
-# hack the extra indirection
 OBJ =  $(CSRC:.c=.o)
 HDR = \
        addrtoname.h \
@@ -364,7 +362,6 @@ EXTRA_DIST = \
        lbl/os-osf4.h \
        lbl/os-solaris2.h \
        lbl/os-sunos4.h \
-       lbl/os-ultrix4.h \
        makemib \
        missing/datalinks.c \
        missing/dlnames.c \

diff --git a/aclocal.m4 b/aclocal.m4
index ea5cffc8ca5a1e8b20d0164e5ca7ca1e66c7bfdf..aa43e0bd2a370033f066e4968ba9d022157eae15 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -203,22 +203,6 @@ AC_DEFUN(AC_LBL_C_INIT,
                    #
                    ac_lbl_cc_force_warning_errors=-errwarn
                    ;;
-
-           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 (file)
index 2f0c430..0000000
--- a/lbl/os-ultrix4.h
+++ /dev/null
@@ -1,35 +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);
-void   endservent(void);
-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    setlinebuf(FILE *);
-int    socket(int, int, int);