From: Vincent Bernat <bernat@luffy.cx>
Date: Wed, 2 May 2012 06:03:22 +0000 (+0200)
Subject: configure: remove old unwanted cruft
X-Git-Tag: 0.6.0~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19d42b5579ce5f54e6c26c1e9ce9d3a1fb11c7b5;p=thirdparty%2Flldpd.git

configure: remove old unwanted cruft

It seems easier to fail on compilation if we cannot provide a
workaround in configure.
---

diff --git a/configure.ac b/configure.ac
index a1a627a6..6413a59c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,13 +32,7 @@ LT_INIT
 ### Checks
 
 # Checks for programs.
-AC_PROG_AWK
 AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_CXX
 AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 
@@ -64,48 +58,8 @@ AC_CACHE_SAVE
 
 # Checks for header files.
 AC_HEADER_RESOLV
-AC_CHECK_HEADERS([ \
-  arpa/inet.h \
-  fcntl.h \
-  malloc.h \
-  netdb.h \
-  netinet/in.h \
-  stdlib.h \
-  string.h \
-  sys/ioctl.h \
-  sys/param.h \
-  sys/socket.h \
-  sys/time.h \
-  sys/queue.h \
-  syslog.h \
-  unistd.h \
-  net/if.h \
-  linux/sockios.h \
-],,AC_MSG_ERROR([Required header missing.]))
-AC_CHECK_HEADERS([ \
-  linux/wireless.h \
-  linux/if_bonding.h \
-  linux/if_bridge.h \
-  linux/if_packet.h \
-],,AC_MSG_ERROR([Required header missing.]),[
-@%:@include <arpa/inet.h>
-@%:@include <linux/if.h>
-])
-AC_CHECK_HEADERS([ \
-  linux/filter.h \
-],,AC_MSG_ERROR([Required header missing.]),[
-@%:@include <linux/types.h>
-])
-AC_CHECK_HEADERS([ \
-  linux/if_vlan.h \
-],,AC_MSG_ERROR([You should get linux/if_vlan.h from some other place. See README file.]),[
-@%:@include <arpa/inet.h>
-@%:@include <linux/if.h>
-])
 AC_CHECK_HEADERS([valgrind/valgrind.h])
 
-AC_CACHE_SAVE
-
 # Check for sys/queue.h completeness, missing bits will be in compat.h
 AC_CHECK_DECLS([
 TAILQ_FIRST,
@@ -150,49 +104,25 @@ SPEED_10000],[],[],[[@%:@include <linux/ethtool.h>]])
 AC_CHECK_DECLS([ETHERTYPE_VLAN],[],[],[[@%:@include <net/ethernet.h>]])
 
 # Check some stuff in linux/if_vlan.h
+AC_CHECK_HEADERS([ \
+  linux/if_vlan.h \
+],,AC_MSG_ERROR([You should get linux/if_vlan.h from some other place. See README file.]),[
+@%:@include <arpa/inet.h>
+@%:@include <linux/if.h>
+])
 AC_CHECK_DECLS([GET_VLAN_REALDEV_NAME_CMD,GET_VLAN_VID_CMD],[],[],
                [[@%:@include <linux/if_vlan.h>]])
 
 AC_CACHE_SAVE
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_UID_T
-AC_C_INLINE
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT8_T
 lldp_CHECK___PROGNAME
-lldp_CHECK_FD_SETSIZE
 
 # Checks for library functions.
-AC_FUNC_CHOWN
-AC_FUNC_FORK
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([ \
-   atexit \
-   gethostbyname \
-   inet_ntoa memset \
-   regcomp \
-   select \
-   setenv \
-   socket \
-   strchr \
-   strdup \
-   strerror \
-   strndup \
-   tzset \
-   uname \
-],,[AC_MSG_ERROR(Required function not found.)])
-
 AC_REPLACE_FUNCS([strlcpy])
 AC_REPLACE_FUNCS([getifaddrs])
-
 AC_CACHE_SAVE
 
 ## Unit tests wich check
diff --git a/m4/fdsetsize.m4 b/m4/fdsetsize.m4
deleted file mode 100644
index 286b6d1d..00000000
--- a/m4/fdsetsize.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# lldp_CHECK_FD_SETSIZE
-#
-AC_DEFUN([lldp_CHECK_FD_SETSIZE],[
-  AC_CACHE_CHECK([real value of FD_SETSIZE], lldp_cv_check_fd_setsize, [
-    AC_RUN_IFELSE([
-       AC_LANG_PROGRAM(
-        [
-@%:@include <stdio.h>
-@%:@include <sys/select.h>
-@%:@include <sys/time.h>
-@%:@include <sys/types.h>
-@%:@include <unistd.h>
-	],
-	[
-	FILE *fd;
-	if ((fd = fopen("conftest.out", "w")) == NULL) {
-	   printf("Unable to create file conftest.out");
-	   return 1;
-        }
-	fprintf(fd, "%d\n", FD_SETSIZE);
-	fclose(fd);
-	])],
-       [ lldp_cv_check_fd_setsize=`cat conftest.out` ],
-       [ lldp_cv_check_fd_setsize="no" ],
-       [ lldp_cv_check_fd_setsize="no" ])])
-  if test x"$lldp_cv_check_fd_setsize" = x"no"; then
-     AC_DEFINE([LLDPD_FD_SETSIZE], [FD_SETSIZE], [FD_SETSIZE for select()])
-  else
-     AC_DEFINE_UNQUOTED([LLDPD_FD_SETSIZE], $lldp_cv_check_fd_setsize,
-               [FD_SETSIZE for select()])
-  fi
-])
diff --git a/src/event.c b/src/event.c
index a95461b7..a86634bb 100644
--- a/src/event.c
+++ b/src/event.c
@@ -31,10 +31,6 @@ levent_log_cb(int severity, const char *msg)
 	}
 }
 
-#if LLDPD_FD_SETSIZE != FD_SETSIZE
-# warning "FD_SETSIZE is set to an inconsistent value."
-#endif
-
 struct lldpd_events {
 	TAILQ_ENTRY(lldpd_events) next;
 	struct event *ev;