diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-04-15 13:22:31 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-04-19 08:52:06 -0400 |
| commit | 44baa36b9904f2afdfd00769a2d15a5eb630059e (patch) | |
| tree | 1d8095719b2677bf0e460154da5259582545c22a | |
| parent | 7fa5982d477351f7e4b825234bfa248363d3d183 (diff) | |
config: refactor and comment the sdkdir distcheck workaround
Seperate legitimate sdkdir usage from distcheck workaround.
Comment this non obvious workaround.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 47d5e78..00c7940 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# Ensure headers are installed below $(prefix) for distcheck +# Provide an sdk location that is writable by the evdev module DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' SUBDIRS = src man include diff --git a/configure.ac b/configure.ac index b1352ec..7213f73 100644 --- a/configure.ac +++ b/configure.ac @@ -60,13 +60,17 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # to satisfy silly distcheck requirements. PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) -AC_ARG_WITH([sdkdir], [], - [sdkdir="$withval"], - [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`]) -AC_SUBST([sdkdir]) - # Checks for libraries. +# X Server SDK location is required to install evdev header files +# This location is also relayed in the xorg-evdev.pc file +sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` + +# Workaround overriding sdkdir to be able to create a tarball when user has no +# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am +AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) +AC_SUBST([sdkdir]) + DRIVER_NAME=evdev AC_SUBST([DRIVER_NAME]) |