diff options
| -rw-r--r-- | aclocal.m4 | 38 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 3 insertions, 49 deletions
@@ -39,7 +39,6 @@ AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, [ AC_BEFORE([$0], [AC_LBL_C_INIT]) AC_BEFORE([$0], [AC_PROG_CC]) - AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) AC_BEFORE([$0], [AC_LBL_DEVEL]) AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) $1="" @@ -94,7 +93,6 @@ dnl LBL_CFLAGS dnl AC_DEFUN(AC_LBL_C_INIT, [ - AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) AC_BEFORE([$0], [AC_LBL_DEVEL]) AC_BEFORE([$0], [AC_LBL_SHLIBS_INIT]) if test "$GCC" = yes ; then @@ -668,42 +666,6 @@ AC_DEFUN(AC_PCAP_C___ATOMICS, fi]) dnl -dnl If using gcc, make sure we have ANSI ioctl definitions -dnl -dnl usage: -dnl -dnl AC_LBL_FIXINCLUDES -dnl -AC_DEFUN(AC_LBL_FIXINCLUDES, - [if test "$GCC" = yes ; then - AC_MSG_CHECKING(for ANSI ioctl definitions) - AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes, - AC_TRY_COMPILE( - [/* - * This generates a "duplicate case value" when fixincludes - * has not be run. - */ -# include <sys/types.h> -# include <sys/time.h> -# include <sys/ioctl.h> -# ifdef HAVE_SYS_IOCCOM_H -# include <sys/ioccom.h> -# endif], - [switch (0) { - case _IO('A', 1):; - case _IO('B', 1):; - }], - ac_cv_lbl_gcc_fixincludes=yes, - ac_cv_lbl_gcc_fixincludes=no)) - AC_MSG_RESULT($ac_cv_lbl_gcc_fixincludes) - if test $ac_cv_lbl_gcc_fixincludes = no ; then - # Don't cache failure - unset ac_cv_lbl_gcc_fixincludes - AC_MSG_ERROR(see the INSTALL for more info) - fi - fi]) - -dnl dnl If the file .devel exists: dnl Add some warning flags if the compiler supports them dnl If an os prototype include exists, symlink os-proto.h to it diff --git a/configure.ac b/configure.ac index c943df97..397d2e89 100644 --- a/configure.ac +++ b/configure.ac @@ -168,13 +168,9 @@ AC_SYS_LARGEFILE AC_FUNC_FSEEKO dnl -dnl Even if <net/bpf.h> were, on all OSes that support BPF, fixed to -dnl include <sys/ioccom.h>, and we were to drop support for older -dnl releases without that fix, so that pcap-bpf.c doesn't need to -dnl include <sys/ioccom.h>, the test program in "AC_LBL_FIXINCLUDES" -dnl in "aclocal.m4" uses it, so we would still have to test for it -dnl and set "HAVE_SYS_IOCCOM_H" if we have it, otherwise -dnl "AC_LBL_FIXINCLUDES" wouldn't work on some platforms such as Solaris. +dnl HAVE_SYS_IOCCOM_H will be required for a few workarounds until all +dnl supported OSes that use BPF have <net/bpf.h> that includes <sys/ioccom.h> +dnl (this might have already happened). dnl AC_CHECK_HEADERS(sys/ioccom.h sys/sockio.h) AC_CHECK_HEADERS(netpacket/packet.h) @@ -198,10 +194,6 @@ haiku*) ;; esac -AC_LBL_SAVE_CHECK_STATE -AC_LBL_FIXINCLUDES -AC_LBL_RESTORE_CHECK_STATE - AC_CHECK_FUNCS(strerror) AC_CHECK_FUNC(strerror_r, [ |