On 2/4/10 6:16 PM, Geoff McLane wrote:
> Hi Jari,
>
> HOW?
I have nothing against your patch, actually I have thrown away the check
for glut.h completely in my local configure.ac. The check for glut.h is
not needed. On my machine (Mac OS X 10.6) the
AC_CHECK_HEADERS([svn_client.h glut.h])
always fail and in consequence the failure will trigger command line use
in terrasync as stated in configure.ac after the AC_CHECK_HEADERS
if test "x$ac_cv_header_svn_client_h" != "xyes"; then
echo "TerraSync will shell out for command line subversion"
svn_LIBS=""
svn_CPPFLAGS=""
else
...
While I am writing this I realize that one of course need development
libs for svn to pass the AC_CHECK_HEADERS so I suppose my statement was
not perfectly accurate. I have the devlibs for svn installed and I
actually go further in my local change of configure.ac and look for
several svn libs:
...
else
echo "TerraSync will use integrated subversion library"
AC_SEARCH_LIBS(svn_client_checkout, svn_client-1)
+ AC_SEARCH_LIBS(svn_delta_version, svn_delta-1)
+ AC_SEARCH_LIBS(svn_diff_version, svn_diff-1)
+ AC_SEARCH_LIBS(svn_ra_initialize, svn_ra-1)
+ AC_SEARCH_LIBS(svn_pool_create_ex, svn_subr-1)
+ AC_SEARCH_LIBS(svn_wc_version, svn_wc-1)
svn_LIBS=$LIBS
svn_CPPFLAGS=$CPPFLAGS
AC_SUBST(svn_LIBS)
and build a terrasync with builtin subversion calls. This is not really
a good thing since terrasync with builtin subversion calls behaves badly
when terrasync is interrupted during subversion calls. An issue
acknowledge by Alex Perry in
http://www.mail-archive.com/flightgear-devel@lists.sourceforge.net/msg25662.html
Again, the patch is valid I just wanted to highlight the fact that it
may lead to unwanted changes in the build process.
Cheers,
Jari
>
> My patch separated the check for 'svn_client.h'
> from the check for 'glut.h'... I have no idea why
> these two checks were put together in the first
> place... they are nothing to do with each other...
>
> And if you checked the config.log you would see
> that these were always done as two separate, unrelated,
> checks...
>
> So really can NOT understand why you would suggest the
> patch would 'trigger a build of a terrasync binary'
> different to anything currently built...
>
> It does nothing more that putting
> #define HAVE_GL_GLUT_H 1
> in Include/config.h
>
> Please read the patch again...
>
> Regards,
>
> Geoff.
>
> On Thu, 2010-02-04 at 17:08 +0100, Jari Häkkinen wrote:
>> The suggested patch to configure.ac may have unwanted side effects in
>> that if may trigger a build of a terrasync binary with builtin
>> subversion calls rather than use of external svn calls. The problem with
>> terrasync using builtin subversion calls is that the current
>> implementation does don't behave well when terrasync is interrupted (svn
>> working copies ends up in locked state). This has been recently
>> discussed on the mailing list.
>>
>>
>> Jari
>>
>>
>> On 2/4/10 2:44 PM, Geoff McLane wrote:
>>> On Wed, 2010-02-03 at 08:47 -0700, John Denker wrote:
>>>> There is a little script to collect that information:
>>>> http://www.av8n.com/fly/fgfs/barf
>>>>
>>> Thanks John for your 'barf' script. I modified
>>> it to suit my Ubuntu environment. My script
>>> is at :-
>>> http://geoffair.net/tmp/fgfs-info
>>>
>>> In it I noted you run tests/gl-info, and
>>> to my surprise this produced the output :-
>>>
>>> GL Utility Toolkit (glut) was not found on this system.
>>>
>>> which is CRAZY since I _DO_ have 'glut' installed!
>>> freeglut3 2.4.0-6
>>> freeglut3-dev 2.4.0-6
>>> glutg3 3.7-25
>>> glutg3-dev 3.7-25
>>> libglut3 3.7-25
>>> libglut3-dev 3.7-25
>>>
>>> Looking in src/Include/config.h showed the reason.
>>> 'HAVE_GLUT_H' was undefined! So that led me back
>>> to configure.ac...
>>>
>>> Yes, it does a check for [... glut.h], and of course
>>> does NOT find this... But tests/gl-info.cxx
>>> does NOT include<glut.h>, but includes
>>> <GL/glut.h> (if not __APPLE__)...
>>>
>>> It also checks for, and finds glutGetModifiers,
>>> and adds the library - result: -lglut
>>>
>>> So adding a test to configure.ac -
>>> AC_CHECK_HEADERS(GL/glut.h)
>>> which added -
>>> #define HAVE_GL_GLUT_H 1
>>> to src/Include/config.h...
>>>
>>> So one would have to ask how did you compile
>>> gl-info? ... Of course I also then changed
>>> 'HAVE_GLUT_H' to 'HAVE_GL_GLUT_H' in gl-info.cxx
>>> source, then all is honky dorey...
>>>
>>> I hope someone will take the time to fix
>>> this in FG CVS... Attached below is my
>>> diff... Of course this would need to be
>>> further adjusted for __APPLE__
>>>
>>> Or maybe just remove the -
>>> #ifdef HAVE_GLUT_H
>>> completely from tests/gl-info.cxx,
>>> since fgfs defaults to using the osgviewer.
>>>
>>> Does fgfs use<GL/glut.h> anywhere else
>>> but in this tests/gl-info??? 'glut.h' appears
>>> only mentioned in the old (2005) docs-mini/
>>> README.mingw...
>>>
>>> HTH
>>>
>>> Geoff.
>>>
>>> PS: My info is at -
>>> http://geoffair.net/tmp/tempinfo.txt
>>> There also seems some problems with
>>> tests/alcinfo, but have yet to look into
>>> this...
>>>
>>> attached: fg200-diff01.patch
>>>
>
>
>
> ------------------------------------------------------------------------------
> The Planet: dedicated and managed hosting, cloud storage, colocation
> Stay online with enterprise data centers and the best network in the business
> Choose flexible plans and management services without long-term contracts
> Personal 24x7 support from experience hosting pros just a phone call away.
> http://p.sf.net/sfu/theplanet-com
> _______________________________________________
> Flightgear-devel mailing list
> Flightgear-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/flightgear-devel
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
