[Libvir] libvirt on OS X Leopard 10.5.1

[Jim Meyering]

Daniel Veillard <veillard at redhat.com> wrote:

> On Tue, Jan 22, 2008 at 08:00:34AM -0500, Daniel Veillard wrote:
>> On Mon, Jan 21, 2008 at 11:39:35PM +0000, Daniel P. Berrange wrote:
>> > I would point you at the snapshot tar.gz here, but it appears to be not
>> > updated since September
>> >
>> >   http://libvirt.org/downloads.html
>>
>> ./configure: line 35987: syntax error near unexpected token `libxml-2.0,LIBXML_FOUND=yes'
>> ./configure: line 35987: `    PKG_CHECK_EXISTS(libxml-2.0,LIBXML_FOUND=yes)'
>>
>>  libvirt.org is a RHEL4 box, seems the pkgconfig requirements which were
>> introduced break running autogen.sh , so no Makefile, make dist, and no
>> snapshot apparently. I will try to investigate but I can't believe we managed
>> to break detection for something as common as libxml2 *on xmlsoft.org itself*,
>> the irony ...
>
>   Upgrading pkg-config on the box this goes further but then gets stuck
> at:
>
> configure: error: conditional "HAVE_SASL" was never defined.
> Usually this means the macro was only invoked conditionally.
>
> trying to autogen with
>   ./autogen.sh --prefix=/usr --without-depends --without-sasl
>
> I don't understand the problem, it seems
>   AM_CONDITIONAL(HAVE_SASL, [test "$with_sasl" != "no"])
> is set outside of any conditional block in configure.in

Right.
Here's an untested patch:

	* configure.in (HAVE_SASL): Define unconditionally.

Signed-off-by: Jim Meyering <meyering at redhat.com>
---
 configure.in |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/configure.in b/configure.in
index 44bf59b..1876d81 100644
--- a/configure.in
+++ b/configure.in
@@ -377,6 +377,7 @@ LDFLAGS="$old_ldflags"


 dnl Cyrus SASL
+have_sasl=0
 AC_ARG_WITH(sasl,
   [  --with-sasl         use cyrus SASL for authentication],
   [],
@@ -402,8 +403,10 @@ if test "$with_sasl" != "no"; then
   CFLAGS="$old_cflags"
   LIBS="$old_libs"
   SASL_LIBS="$SASL_LIBS -lsasl2"
-  AC_DEFINE_UNQUOTED(HAVE_SASL, 1, [whether Cyrus SASL is available for authentication])
+  have_sasl=1
 fi
+AC_DEFINE_UNQUOTED(HAVE_SASL, $have_sasl,
+		   [whether Cyrus SASL is available for authentication])
 AM_CONDITIONAL(HAVE_SASL, [test "$with_sasl" != "no"])
 AC_SUBST(SASL_CFLAGS)
 AC_SUBST(SASL_LIBS)
--
1.5.4.rc4.15.g80bce