Skip to content

configure.in: require yapps executable#477

Merged
SebKuzminsky merged 3 commits into
LinuxCNC:masterfrom
zultron:master-lcnc-iss-475-master
Jul 31, 2018
Merged

configure.in: require yapps executable#477
SebKuzminsky merged 3 commits into
LinuxCNC:masterfrom
zultron:master-lcnc-iss-475-master

Conversation

@zultron

@zultron zultron commented Jul 31, 2018

Copy link
Copy Markdown
Contributor

Fixes #475; 2.7 counterpart for inttool-extract only in #476

@SebKuzminsky

Copy link
Copy Markdown
Collaborator

The commit message for bf985533a99e1 is wrong (talks about intltool), but the patch is right (checks for yapps). Please fix the commit message and I'll merge it.

@SebKuzminsky

Copy link
Copy Markdown
Collaborator

I merged #476 into 2.7 and merged 2.7 into master, so if you rebase bf98553 onto master you won't need the merge in this PR, simplifying it some.

@zultron zultron force-pushed the master-lcnc-iss-475-master branch from bf98553 to d9b91b8 Compare July 31, 2018 17:14
@zultron

zultron commented Jul 31, 2018

Copy link
Copy Markdown
Contributor Author

D'oh! I've been making a bunch of embarrassing copy and paste mistakes lately.

I see that #475 was merged, but I don't see it in master.

Anyway, the PR is fixed. Thanks, @SebKuzminsky.

@SebKuzminsky SebKuzminsky merged commit 773f8ca into LinuxCNC:master Jul 31, 2018
@SebKuzminsky

Copy link
Copy Markdown
Collaborator

Oops, you're right, I didn't merge #476 into master, it's just in 2.7. Derp. I'll fix it.

@zultron zultron changed the title configure.in: require yaml2 executable configure.in: require yapps executable Aug 3, 2018
@zultron

zultron commented Aug 3, 2018

Copy link
Copy Markdown
Contributor Author

Jeezus H. Beezus, @SebKuzminsky you caught the commit with the wrong name, but missed the PR misnamed "configure.in: require yaml2 executable"! I can't use the "copy'n'paste" excuse for that one.

Fixed PR title. :D

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants