X-Git-Url: http://git.alex.org.uk

diff --git a/configure.ac b/configure.ac
index 9cc59e6..6ebfa1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Configure script for NBD system
 dnl (c) 1998 Martin Mares <mj@ucw.cz>, (c) 2000 Pavel Machek <pavel@ucw.cz>,
 dnl (c) 2003-2006 Wouter Verhelst <wouter@debian.org>
-AC_INIT([nbd],[SVN],[wouter@debian.org])
+AC_INIT([nbd],[2.9.21a],[wouter@debian.org])
 AM_INIT_AUTOMAKE(foreign dist-bzip2)
 AM_MAINTAINER_MODE
 
@@ -82,41 +82,7 @@ AC_ARG_ENABLE(
   ]
 )
 
-AC_MSG_CHECKING(for klcc)
-AC_ARG_WITH(
-  klcc,
-  AC_HELP_STRING(--with-klcc,[Build a version of nbd-client against klibc (for initramfs uses). Specify the path to 'klcc' (default autodetected)]),
-  [
-    if test "x$withval" != "x"; then
-      if test -x "$withval"; then
-        KLCC="$withval"
-	sbin_PROGRAMS=knbd-client
-	AC_MSG_RESULT($KLCC)
-      else
-        AC_MSG_ERROR("specified klcc is not executable or does not exist.")
-      fi
-    else
-      if test -x /usr/bin/klcc; then
-        KLCC=/usr/bin/klcc
-	sbin_PROGRAMS=knbd-client
-	AC_MSG_RESULT($KLCC)
-      else
-        AC_MSG_ERROR("klcc not found! Please specify it as a parameter to the --with-klcc option");
-      fi
-    fi
-  ],
-  [ if test -x /usr/bin/klcc; then
-      sbin_PROGRAMS=knbd-client
-      KLCC=/usr/bin/klcc
-      AC_MSG_RESULT($KLCC)
-    else
-      AC_MSG_RESULT(not found)
-    fi
-  ]
-)
-AC_SUBST(KLCC)
-
-AC_PROG_CC
+AC_PROG_CC_C99
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_CANONICAL_HOST
@@ -127,82 +93,36 @@ AC_CHECK_SIZEOF(unsigned short int)
 AC_CHECK_SIZEOF(unsigned int)
 AC_CHECK_SIZEOF(unsigned long int)
 AC_CHECK_SIZEOF(unsigned long long int)
-AC_CHECK_FUNCS([llseek alarm gethostbyname inet_ntoa memset socket strerror strstr])
+AC_CHECK_FUNCS([llseek alarm gethostbyname inet_ntoa memset socket strerror strstr mkstemp])
+AC_CHECK_FUNC([sync_file_range],
+	[AC_DEFINE([HAVE_SYNC_FILE_RANGE], [sync_file_range(2) is not supported], [sync_file_range(2) is supported])],
+        [])
 AC_FUNC_FORK
 AC_FUNC_SETVBUF_REVERSED
 AC_MSG_CHECKING(whether client should be built)
 case $host_os in
-     linux*) sbin_PROGRAMS="$sbin_PROGRAMS nbd-client"
-	      AC_MSG_RESULT(yes)
-              ;;
-     *) AC_MSG_RESULT(no) ;;
+	linux*) NBD_CLIENT_NAME="nbd-client"
+		AC_MSG_RESULT(yes)
+		;;
+	*)	NBD_CLIENT_NAME=""
+		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 <linux/nbd.h>
-#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='<linux/nbd.h>'],
-    AC_TRY_COMPILE([#include <linux/nbd.h>
-#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='<linux/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" = '<linux/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_SUBST(NBD_CLIENT_NAME)
 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]))
 AC_CHECK_HEADERS([sys/mount.h],,,
 [[#include <sys/param.h>
 ]])
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h syslog.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/ioctl.h sys/socket.h syslog.h linux/types.h])
 AM_PATH_GLIB_2_0(2.6.0, [HAVE_GLIB=yes], AC_MSG_ERROR([Missing glib]))
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
-AC_SUBST(sbin_PROGRAMS)
 nbd_server_CPPFLAGS=$nbd_server_CPPFLAGS" -DSYSCONFDIR='\"$sysconfdir\"'"
 AC_SUBST(nbd_server_CPPFLAGS)
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile Doxyfile nbd-server.1 nbd-server.5])
+AC_CONFIG_FILES([Makefile doc/Doxyfile man/Makefile man/nbd-client.8.sh man/nbd-server.5.sh man/nbd-server.1.sh man/nbd-trdump.8.sh])
 AC_OUTPUT