From d2a13178a109b8b2319c0ab1050ae62d80898687 Mon Sep 17 00:00:00 2001 From: yoe Date: Wed, 16 Feb 2005 08:46:03 +0000 Subject: [PATCH] r104: Unbreak VPATH builds; release rc2 --- configure.ac | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 80f6181..70a2b10 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Configure script for NBD system dnl (c) 1998 Martin Mares , (c) 2000 Pavel Machek , dnl (c) 2003-2004 Wouter Verhelst -AC_INIT([nbd],[2.8.0-rc1],[wouter@debian.org]) +AC_INIT([nbd],[2.8.0-rc2],[wouter@debian.org]) AM_INIT_AUTOMAKE(foreign dist-bzip2) AM_MAINTAINER_MODE @@ -74,18 +74,16 @@ 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_COMPILE([#include -#define MY_NAME "conftest" -#define NBD_H_LOCAL -#include "cliserv.h" +AC_TRY_COMPILE([#define u32 int +#define u64 int +#include "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([#include -#define MY_NAME "conftest" -#define NBD_H_LINUX -#include "cliserv.h" + AC_TRY_COMPILE([#define u32 int +#define u64 int +#include ], [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=''], -- 1.7.10.4