Huh, that's strange, the diff in the email is not the same as the diff i get with "git log -p".
In 2.4 the variable is named LDFLAGS, in 2.5 it's named LIBS (ever since Jeff's commit 45873c, Oct 18 2010). Looking at the file after my commit, the variable name is still LIBS, just like it should be. The commit email says I switched the variable name from LDFLAGS to LIBS, but it must be comparing to the 2.4_branch that I merged in? Confusing. On Jan 19, 2012, at 10:09 , Sebastian Kuzminsky wrote: > Merge remote-tracking branch 'origin/v2.4_branch' into v2.5_branch > > Conflicts: > src/configure.in > > > http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=7b4ac36 > > > src/configure.in | 16 +++++++++++++++- > 1 files changed, 15 insertions(+), 1 deletions(-) > > diff --cc src/configure.in > index 118effb,c413cf8..3482d99 > --- a/src/configure.in > +++ b/src/configure.in > @@@ -1028,11 -959,25 +1028,25 @@@ AH_VERBATIM([_GNU_SOURCE] > AC_HEADER_STDC > AC_HEADER_SYS_WAIT > AC_CHECK_FUNCS(semtimedop) > -LDFLAGS_hold=$LDFLAGS > -LDFLAGS="$LDFLAGS -lm" > +LIBS_hold=$LIBS > +LIBS="$LIBS -lm" > - AC_CHECK_FUNCS(sincos) > + > + AC_MSG_CHECKING([for sincos function]) > + sincos_ok=yes > + AC_TRY_LINK( > + [double a, b;], > + [sincos(1.0, &a, &b);], > + AC_DEFINE( > + [HAVE_SINCOS], > + 1, > + [Define to 1 if sincos is available.] > + ), > + [sincos_ok=no] > + ) > + AC_MSG_RESULT([$sincos_ok]) > + > AC_CHECK_FUNCS(__sincos) > -LDFLAGS=$LDFLAGS_hold > +LIBS=$LIBS_hold > > AH_BOTTOM(#endif > ) > > ------------------------------------------------------------------------------ > Keep Your Developer Skills Current with LearnDevNow! > The most comprehensive online learning library for Microsoft developers > is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, > Metro Style Apps, more. Free future releases when you subscribe now! > http://p.sf.net/sfu/learndevnow-d2d > _____________________________________________ > Emc-commit mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/emc-commit -- Sebastian Kuzminsky ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
