[sword-devel] 1.6.1 final changes

[Manfred Bergmann]

Yes, thank you.
The files in SVN HEAD work.


Manfred


Am 23.12.2009 um 23:40 schrieb Troy A. Griffitts:

> Dear Manfred,
> 
> In the file your errors mention, where INCLUDES is not first being set with '=', I have it set with '=' in line 2.  Line 2 was one of the lines previously removed in a patch posted on this list a few days ago, before we encorporated it into SVN.  You should not be applying that patch any longer.  My guess is that your current environment has both the old patch applied and merged to the latest svn which has a modification of that patch commited.  Hope this helps.  Please let me know if you are still having troubles.  Your feedback is greatly appreciated in this final hour :)
> 
> Troy
> 
> 
> 
> On 12/23/2009 01:35 PM, Manfred Bergmann wrote:
>> Am 23.12.2009 um 15:16 schrieb Troy A. Griffitts:
>> 
>>   
>>> Since things have been fairly quiet after the small patches from last week, I'd like to release 1.6.1 tomorrow morning (MST) so the Xiphos guys can release against an official baseline.
>>> 
>>> I've just commited what I hope are about the last changes.  Could we get people to compile against SVN and report back today if they have any troubles?
>>>     
>> I'm getting two errors(?) from the automake call (last line) in autogen.sh:
>> 
>> examples/cmdline/Makefile.am:4: INCLUDES must be set with `=' before using `+='
>> tests/Makefile.am:4: INCLUDES must be set with `=' before using `+='
>> 
>> Not sure why but subsequent calls (configure) in the script of mine are not called so I'm guessing this automake is exiting with an error code.
>> 
>> 
>> 
>> Manfred
>> 
>>   
>>> The recent changes were to fix a bug Dima found:
>>> we had our own internal regex.h in sword/include/.
>>> and since sword/include was first in the include path, even if we were linking against the system regex library, we were including our internal regex.h file.  Very bad.
>>> 
>>> I've moved the regex.h file into a new subdirectory sword/include/internal/regex/regex.h
>>> 
>>> I'm guessing this will break the projects that depend on our internal regex lib, like the MSVC project files.
>>> 
>>> Is there any MSVC user who can update the project files to add this include directory?
>>> 
>>> Thanks for all the help in so many ways.
>>> 
>>> May our Lord remind you of His Great Love for you this Christmas.
>>> 
>>> Troy
>>> 
>>> 
>>> 
>>> _______________________________________________
>>> sword-devel mailing list: sword-devel at crosswire.org
>>> http://www.crosswire.org/mailman/listinfo/sword-devel
>>> Instructions to unsubscribe/change your settings at above page
>>>     
>> 
>> _______________________________________________
>> sword-devel mailing list: sword-devel at crosswire.org
>> http://www.crosswire.org/mailman/listinfo/sword-devel
>> Instructions to unsubscribe/change your settings at above page
>>   
> 
> 
> _______________________________________________
> sword-devel mailing list: sword-devel at crosswire.org
> http://www.crosswire.org/mailman/listinfo/sword-devel
> Instructions to unsubscribe/change your settings at above page