81241 - Config/Build changes for Qt Mozilla

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, enhancement, P4)

Description

[John Griggs]

Just a couple of small changes to the configuration and build stuff for Qt
Mozilla:

1) Change the QTDIR code to use the value of the QTDIR environment variable, if
it is set.  The new code uses any value from the --with-qtdir= option, then the
environment value and defaults to QTDIR=/usr if neither the option nor the
environment variable are set.

2) Use the moc preprocessor from $QTDIR/bin, if one exists and is executeable,
otherwise look for moc in the $PATH.  If no moc utility is found, issue an error
and exit.  This test does not verify that the version of moc matches the version
of Qt but, by preferring the copy in $QTDIR/bin, it makes it more likely that
the correct version is used when multiple copies are present.  I'm not sure that
a version check for moc would be useful or easy to code.

These two changes make it easier to work with Qt Mozilla on systems where
multiple versions of the Qt Toolkit are installed.

Comment 1

[John Griggs]

Attachment: Patch for configure.in

Comment 2

[John Griggs]

Attachment: Patch for config/config.mk

Comment 3

[cls]

Looks like you're missing a bit there.  The config.mk patch will cause gmake to
complain about recursively defining MOC since the = causes the variable
assignment to be delayed until the variable is actually used.  Even once that
occurs, MOC will be set to nothing because config.mk doesn't know about how MOC
was set in configure.  You need to remove the moc setting from config.mk and add
MOC = @MOC@ to config/autoconf.mk.in .  You will also need to add AC_SUBST(MOC)
to configure.in .

Comment 4

[John Griggs]

Attachment: Updated patch for configure.in

Comment 5

[John Griggs]

Attachment: Patch for config/autoconf.mk.in

Comment 6

[John Griggs]

Attachment: Updated patch for config/config.mk

Comment 7

[John Griggs]

Created new patches to incorporate Chris Seawood's corrections.  The new patches
supercede the originals and include a new patch for config/autoconf.mk.in. 
Hopefully I got it right this time 8^).

Comment 8

[cls]

r=cls

Comment 9

[John Griggs]

Added my home email as a CC, since today is my last day at Corel.

Comment 10

[timeless]

.

Comment 11

[John C. Griggs]

Attachment: Updated patch for configure.in

Comment 12

[John C. Griggs]

I updated the patch to configure.in to try to do a better job of configuring for
Debian Linux, BSD and other systems that don't install Qt into a QTDIR.

If you set QTDir in your environment or override it using the --with-qtdir
configure option, configure expects to find:

Qt headers in $QTDIR/include
Qt libraries in $QTDIR/lib
moc preprocessor in $QTDIR/bin

If QTDIR is not set and --with-qtdir is not given, configure expects to find:

Qt headers in /usr/include/qt
Qt libraries in /usr/lib
moc preprocessor in /usr/bin

Comment 13

[cls]

r=cls

Comment 14

[Christopher Blizzard (:blizzard)]

sr=blizzard

Comment 15

[John C. Griggs]

Committed patches to CVS.

Comment 16

[John C. Griggs]

The patches for this have been in CVS for some time now.  Marking as FIXED.