X-Git-Url: http://git.alex.org.uk diff --git a/configure.ac b/configure.ac index 2676ff0..d549567 100644 --- a/configure.ac +++ b/configure.ac @@ -103,57 +103,6 @@ case $host_os in ;; *) AC_MSG_RESULT(no) ;; esac -AC_MSG_CHECKING(where to find a working nbd.h) -AC_TRY_COMPILE([#define u32 int -#define u64 int -#define __be32 int -#define __be64 int -#include "nbd.h" -#ifdef __GNUC__ -#define UNUSED __attribute__((__unused__)) -#else -#define UNUSED -#endif -], -[int UNUSED foo=NBD_CMD_DISC], - [AC_DEFINE(NBD_H_LOCAL, 1, Set to 1 if a (2.6) nbd.h can be found in the current directory) - NBD_H='"nbd.h"'], - AC_TRY_COMPILE([#define u32 int -#define u64 int -#define __be32 int -#define __be64 int -#include -#ifdef __GNUC__ -#define UNUSED __attribute__((__unused__)) -#else -#define UNUSED -#endif - ], -[int UNUSED foo=NBD_CMD_DISC], - [AC_DEFINE(NBD_H_LINUX, 1, Set to 1 if a (2.6) nbd.h can be found in the linux directory in the search path) - NBD_H=''], - AC_TRY_COMPILE([#include -#ifdef __GNUC__ -#define UNUSED __attribute__((__unused__)) -#else -#define UNUSED -#endif - ], - [int UNUSED foo=NBD_CMD_DISC], - [AC_DEFINE(NBD_H_LINUX, 1, Set to 1 if a (2.6) nbd.h can be found in the linux directory in the search path) - NBD_H=''], - AC_MSG_ERROR(Could not find an nbd.h from 2.6 or above.) - ) - ) -) -if test -f nbd.h -then - if test "$NBD_H" = '' - then - AC_MSG_WARN([there is a local nbd.h, but it is from the 2.4-series of kernels. Using the system-provided, working, nbd.h]) - fi -fi -AC_MSG_RESULT($NBD_H) AC_SEARCH_LIBS(bind, socket,, AC_MSG_ERROR([Could not find an implementation of the bind() system call])) AC_SEARCH_LIBS(inet_ntoa, nsl,, AC_MSG_ERROR([Could not find an implementation of the inet_ntoa() system call])) AC_SEARCH_LIBS(daemon, resolv,, AC_MSG_ERROR([Could not find an implementation of the daemon() system call]))