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

diff --git a/configure.ac b/configure.ac
index 5ea27b1..d300bd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,13 @@
 dnl Configure script for NBD system
 dnl (c) 1998 Martin Mares <mj@ucw.cz>, (c) 2000 Pavel Machek <pavel@ucw.cz>,
 dnl (c) 2003-2004 Wouter Verhelst <wouter@debian.org>
-AC_INIT([nbd],[2.7.99pre2.8],[wouter@debian.org])
-AM_INIT_AUTOMAKE()
+AC_INIT([nbd],[SVN],[wouter@debian.org])
+AM_INIT_AUTOMAKE(foreign dist-bzip2)
+AM_MAINTAINER_MODE
 
 AC_ARG_ENABLE(
   lfs,
-  AC_HELP_STRING(--enable-lfs,Enable Large File Support),
+  AC_HELP_STRING(--disable-lfs,Disable Large File Support (default on)),
   [
     if test "x$enableval" = "xyes" ; then
       NBD_LFS=1
@@ -14,7 +15,7 @@ AC_ARG_ENABLE(
       NBD_LFS=0
     fi
   ],
-  [NBD_LFS=0]
+  [NBD_LFS=1]
 )
 AC_MSG_CHECKING([whether Large File Support should be enabled])
 if test $NBD_LFS -eq 1; then
@@ -66,37 +67,47 @@ case "`uname`" in
      *) AC_MSG_RESULT(no) ;;
 esac
 AC_MSG_CHECKING(where to find a working nbd.h)
-dnl We need to check for NBD_CMD_DISC, but that's part of an enum, it is not
-dnl #define'd. Therefore, we check for something which is differently #define'd
-dnl in the old or new versions, even if we don't really care about that.
-dnl This might break at some time, but it should work for now, so...
-AC_TRY_CPP([#include "nbd.h"
-#ifdef LOCAL_END_REQUEST
-#error not here
-#endif
-], 
-  [AC_DEFINE(NBD_H, "nbd.h", Set to where a (recent enough) nbd.h can be found)
-    NBD_H='"nbd.h"'],
-  AC_TRY_CPP([#include <linux/nbd.h>
-#ifdef LOCAL_END_REQUEST
-#error not here
-#endif
+AC_TRY_COMPILE([#define u32 int
+#define u64 int
+#define __be32 int
+#define __be64 int
+#include "nbd.h"
 ],
-    [AC_DEFINE(NBD_H, <linux/nbd.h>) NBD_H='<linux/nbd.h>'],
-    AC_MSG_ERROR(Could not find a (recent enough) nbd.h)
+[int 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>
+  ],
+[int 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_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])
-AM_PATH_GLIB_2_0(2.2.0, [HAVE_GLIB=yes], AC_MSG_ERROR([Missing glib]))
+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])
+AC_CONFIG_FILES([Makefile Doxyfile])
 AC_OUTPUT