You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jo...@apache.org on 2010/03/05 22:52:42 UTC
svn commit: r919632 - /qpid/trunk/qpid/cpp/configure.ac
Author: jonathan
Date: Fri Mar 5 21:52:42 2010
New Revision: 919632
URL: http://svn.apache.org/viewvc?rev=919632&view=rev
Log:
Tests for presence of xqilla/ast/XQEffectiveBooleanValue.hpp; if not
present, sets a constant to enable legacy API for effective boolean
value.
Modified:
qpid/trunk/qpid/cpp/configure.ac
Modified: qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=919632&r1=919631&r2=919632&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Fri Mar 5 21:52:42 2010
@@ -346,6 +346,8 @@
test $want_xml = no && use_xml=no
+
+
# If the user doesn't say not to use XML, see if it's available.
if test $use_xml != no; then
# Then see if XQilla is available
@@ -364,6 +366,13 @@
# Else XQilla is available - use it to build
test $use_xml = yes &&
AC_DEFINE([HAVE_XML], [1], [Compile-in XML Exchange support.])
+
+ # Check to see if we need to use legacy calls for effective boolean value
+ xqilla_has_ebv=yes
+ AC_CHECK_HEADER([xqilla/ast/XQEffectiveBooleanValue.hpp], , [xqilla_has_ebv=no])
+ test $xqilla_has_ebv = no &&
+ AC_DEFINE([XQILLA_2_1_3], [1], [Use the old XQilla 2.1.3 API to get effective boolean value.])
+
fi
AM_CONDITIONAL([HAVE_XML], [test $use_xml = yes])
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org
Re: svn commit: r919632 - /qpid/trunk/qpid/cpp/configure.ac
Posted by Gordon Sim <gs...@redhat.com>.
On 03/08/2010 02:36 PM, Jonathan Robie wrote:
> On 03/08/2010 09:30 AM, Alan Conway wrote:
>> How about XQ_EFFECTIVE_BOOLEAN_VALUE_HPP?
>
> OK.
If set, that would indicate the presence of that file however, not the
absence (at least that is what I would expect).
XQILLA_OLD_EBV (or indeed XQILLA_NEW_EBV if you reversed the sense of
the check) would also make sense, especially with a comment to explain it.
Note also that the cmake build will likely also be broken where the new
api calls are not available.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
Re: svn commit: r919632 - /qpid/trunk/qpid/cpp/configure.ac
Posted by Jonathan Robie <jo...@redhat.com>.
On 03/08/2010 09:30 AM, Alan Conway wrote:
> How about XQ_EFFECTIVE_BOOLEAN_VALUE_HPP?
OK.
Jonathan
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
Re: svn commit: r919632 - /qpid/trunk/qpid/cpp/configure.ac
Posted by Alan Conway <ac...@redhat.com>.
On 03/08/2010 09:24 AM, Jonathan Robie wrote:
> On 03/08/2010 08:07 AM, Gordon Sim wrote:
>> On 03/08/2010 01:00 PM, Jonathan Robie wrote:
>>> On 03/08/2010 06:04 AM, Gordon Sim wrote:
>>>>
>>>> Did you perhaps mean to set XQILLA_BEFORE_2_2_3 here? That is now
>>>> checked for in XmlExchange.cpp but doesn't seem to be defined anywhere.
>>>>
>>>> These changes also break the build where the new header file is not
>>>> present.
>>>
>>> Yes - it's fixed now. Sorry.
>>
>> Thanks. I still don't think the name of that define is right. It's
>> quite confusing to have XQILLA_2_1_3 defined on a system that actually
>> has 2.0.0.
>
> I can use XQILLA_BEFORE_2_2_3 instead, if you prefer, or
> XQEFFECTIVEBOOLEANVALUE_HPP. I think I prefer the latter.
>
How about XQ_EFFECTIVE_BOOLEAN_VALUE_HPP?
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
Re: svn commit: r919632 - /qpid/trunk/qpid/cpp/configure.ac
Posted by Jonathan Robie <jo...@redhat.com>.
On 03/08/2010 08:07 AM, Gordon Sim wrote:
> On 03/08/2010 01:00 PM, Jonathan Robie wrote:
>> On 03/08/2010 06:04 AM, Gordon Sim wrote:
>>>
>>> Did you perhaps mean to set XQILLA_BEFORE_2_2_3 here? That is now
>>> checked for in XmlExchange.cpp but doesn't seem to be defined anywhere.
>>>
>>> These changes also break the build where the new header file is not
>>> present.
>>
>> Yes - it's fixed now. Sorry.
>
> Thanks. I still don't think the name of that define is right. It's
> quite confusing to have XQILLA_2_1_3 defined on a system that actually
> has 2.0.0.
I can use XQILLA_BEFORE_2_2_3 instead, if you prefer, or
XQEFFECTIVEBOOLEANVALUE_HPP. I think I prefer the latter.
I don't know if there are other API changes before XQilla 2.1.3 that
might cause problems for earlier versions.
Jonathan
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
Re: svn commit: r919632 - /qpid/trunk/qpid/cpp/configure.ac
Posted by Gordon Sim <gs...@redhat.com>.
On 03/08/2010 01:00 PM, Jonathan Robie wrote:
> On 03/08/2010 06:04 AM, Gordon Sim wrote:
>>
>> Did you perhaps mean to set XQILLA_BEFORE_2_2_3 here? That is now
>> checked for in XmlExchange.cpp but doesn't seem to be defined anywhere.
>>
>> These changes also break the build where the new header file is not
>> present.
>
> Yes - it's fixed now. Sorry.
Thanks. I still don't think the name of that define is right. It's quite
confusing to have XQILLA_2_1_3 defined on a system that actually has 2.0.0.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
Re: svn commit: r919632 - /qpid/trunk/qpid/cpp/configure.ac
Posted by Jonathan Robie <jo...@redhat.com>.
On 03/08/2010 06:04 AM, Gordon Sim wrote:
>
> Did you perhaps mean to set XQILLA_BEFORE_2_2_3 here? That is now
> checked for in XmlExchange.cpp but doesn't seem to be defined anywhere.
>
> These changes also break the build where the new header file is not
> present.
Yes - it's fixed now. Sorry.
Jonathan
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
Re: svn commit: r919632 - /qpid/trunk/qpid/cpp/configure.ac
Posted by Gordon Sim <gs...@redhat.com>.
On 03/05/2010 09:52 PM, jonathan@apache.org wrote:
> Author: jonathan
> Date: Fri Mar 5 21:52:42 2010
> New Revision: 919632
>
> URL: http://svn.apache.org/viewvc?rev=919632&view=rev
> Log:
> Tests for presence of xqilla/ast/XQEffectiveBooleanValue.hpp; if not
> present, sets a constant to enable legacy API for effective boolean
> value.
>
> Modified:
> qpid/trunk/qpid/cpp/configure.ac
>
> Modified: qpid/trunk/qpid/cpp/configure.ac
> URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=919632&r1=919631&r2=919632&view=diff
> ==============================================================================
> --- qpid/trunk/qpid/cpp/configure.ac (original)
> +++ qpid/trunk/qpid/cpp/configure.ac Fri Mar 5 21:52:42 2010
> @@ -346,6 +346,8 @@
>
> test $want_xml = no&& use_xml=no
>
> +
> +
> # If the user doesn't say not to use XML, see if it's available.
> if test $use_xml != no; then
> # Then see if XQilla is available
> @@ -364,6 +366,13 @@
> # Else XQilla is available - use it to build
> test $use_xml = yes&&
> AC_DEFINE([HAVE_XML], [1], [Compile-in XML Exchange support.])
> +
> + # Check to see if we need to use legacy calls for effective boolean value
> + xqilla_has_ebv=yes
> + AC_CHECK_HEADER([xqilla/ast/XQEffectiveBooleanValue.hpp], , [xqilla_has_ebv=no])
> + test $xqilla_has_ebv = no&&
> + AC_DEFINE([XQILLA_2_1_3], [1], [Use the old XQilla 2.1.3 API to get effective boolean value.])
> +
> fi
This seems like either a poorly named define or the wrong test. (E.g.
the header isn't in xqilla 2.0.0 either, which is currently supported).
Did you perhaps mean to set XQILLA_BEFORE_2_2_3 here? That is now
checked for in XmlExchange.cpp but doesn't seem to be defined anywhere.
These changes also break the build where the new header file is not present.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org