From: Dan N. <dbn...@gm...> - 2010-04-02 13:44:48
|
On Thu, Apr 1, 2010 at 5:15 PM, Jeremy Huddleston <jer...@fr...> wrote: > > On Apr 1, 2010, at 15:12, Dan Nicholson wrote: > >>> This is against 7.8 ... perhaps you should cherry-pick the appropriate change into the 7.8 branch then. >> >> Well, now I'm getting conflicts because you pushed this patch 25 >> minutes after you posted it. I'll try to straighten it out, though. > > Sorry. Should work now. I reverted my accidental commit. OK, I cherry-picked the 4 commits back to the 7.8 branch. This was my fault anyway since I forgot about the policy of committing on the old branch and waiting for it to get merged forward. Having a look at the darwin config, I think it will just work since you guys have the correct Xlib in APP_LIB_DEPS. This is a minor attempt to split those up some, so you can set X11_LIBS if you want. -- Dan |