r80: Make it compile again

diff --git a/cliserv.h b/cliserv.h
index b05e7ee..612fa2b 100644 (file)
--- a/cliserv.h
+++ b/cliserv.h
@@ -35,7 +35,12 @@ typedef unsigned long long u64;
 #error I need at least some 64-bit type
 #endif
 
 #error I need at least some 64-bit type
 #endif
 

-#include NBD_H
+#ifdef NBD_H_LOCAL
+#include "nbd.h"
+#endif
+#ifdef NBD_H_LINUX
+#include <linux/nbd.h>
+#endif

 
 #if NBD_LFS==1
 #define _LARGEFILE_SOURCE
 
 #if NBD_LFS==1
 #define _LARGEFILE_SOURCE

diff --git a/configure.ac b/configure.ac
index 5ea27b1..d375ca8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,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-2004 Wouter Verhelst <wouter@debian.org>
 AC_INIT([nbd],[2.7.99pre2.8],[wouter@debian.org])
 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()
+AM_INIT_AUTOMAKE(foreign dist-bzip2)

 
 AC_ARG_ENABLE(
   lfs,
 
 AC_ARG_ENABLE(
   lfs,

@@ -75,14 +75,14 @@ AC_TRY_CPP([#include "nbd.h"
 #error not here
 #endif
 ], 
 #error not here
 #endif
 ], 

-  [AC_DEFINE(NBD_H, "nbd.h", Set to where a (recent enough) nbd.h can be found)
+  [AC_DEFINE(NBD_H_LOCAL, 1, Set to 1 if a (recent enough) nbd.h can be found in the current directory)

     NBD_H='"nbd.h"'],
   AC_TRY_CPP([#include <linux/nbd.h>
 #ifdef LOCAL_END_REQUEST
 #error not here
 #endif
 ],
     NBD_H='"nbd.h"'],
   AC_TRY_CPP([#include <linux/nbd.h>
 #ifdef LOCAL_END_REQUEST
 #error not here
 #endif
 ],

-    [AC_DEFINE(NBD_H, <linux/nbd.h>) NBD_H='<linux/nbd.h>'],
+    [AC_DEFINE(NBD_H_LINUX, 1, Set to 1 if a (recent enough) nbd.h can be found in the linux directory in the search path) NBD_H='<linux/nbd.h>'],

     AC_MSG_ERROR(Could not find a (recent enough) nbd.h)
   )
 )
     AC_MSG_ERROR(Could not find a (recent enough) nbd.h)
   )
 )