Branch: refs/heads/master
Home: https://github.com/Starlink/starlink
Commit: 8671b224a79d9489429e88522dad3b87ff5bdbce
https://github.com/Starlink/starlink/commit/8671b224a79d9489429e88522dad3b87ff5bdbce
Author: Tim Jenness <[log in to unmask]>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M applications/ccdpack/Makefile.am
M applications/ccdpack/main/Makefile.am
M libraries/gks/configure.ac
M libraries/gks/drivers/xwindows/Makefile.am
M libraries/gks/drivers/xwindows/x.c
M libraries/gwm/Makefile.am
M libraries/idi/Makefile.am
M libraries/idi/configure.ac
Log Message:
-----------
Explicitly use X_CFLAGS
It turns out that IDI, GWM, GKS and CCDPACK were not explicitly
adding the X11 includes path to the compiler options. This was noticed
when OS X Mountain Lion stopped adding /usr/X11/include to the build
automatically. We now add $X_CLAGS to AM_CFLAGS or equivalent.
GKS was also tweaked to stop the build early if X11 was missing
rather than stopping the build when the xwindows driver was being
built. This was partly driven by the global GKS configure.ac not
adding X_FLAGS to includes before attempting to check whether X11
includes were available.
|