Skip to content

Small bugfixes to Autotools#4

Merged
robert-ancell merged 3 commits into
ubuntu:masterfrom
besser82:bugfix/qtchooser
Jan 21, 2018
Merged

Small bugfixes to Autotools#4
robert-ancell merged 3 commits into
ubuntu:masterfrom
besser82:bugfix/qtchooser

Conversation

@besser82
Copy link
Copy Markdown
Contributor

No description provided.

Comment thread configure.ac
if test x"$MOC4" = xmoc; then
if test x"$(readlink $(which $MOC4))" = xqtchooser; then
MOC4="$MOC4 --qt=qt4"
MOC4="$MOC4 --qt=4"
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this not working somewhere? I get the following (which suggests 4 and 5 are the recommended value to be passed).

$ qtchooser -l
4
5
default
qt4-x86_64-linux-gnu
qt4
qt5-x86_64-linux-gnu
qt5

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a downstream patch we carried in Fedora / EPEL since some long time. The patch actually changes to an invocation with the recommend values, as you described.

Comment thread configure.ac Outdated
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
AM_SILENT_RULES(yes)
LT_INIT
AC_PROG_CC_STDC
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is occurring with this not set?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without that being set building lightdm v1.25.1 fails to build on RHEL7 / CentOS7, because the changes in code require the compiler to be run in -std=c99 mode.

Comment thread Makefile.am
@@ -1,3 +1,4 @@
ACLOCAL_AMFLAGS = -I m4
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is occurring with this not set?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am..

@besser82 besser82 force-pushed the bugfix/qtchooser branch 2 times, most recently from 7347d4b to 4520eae Compare January 19, 2018 12:38
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