Factor out the assignement of sdkdir and comment.
Signed-off-by: Gaetan Nadon <[email protected]>
---
Makefile.am | 2 +-
configure.ac | 15 ++++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0070abd..d4b46ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# Ensure headers are installed below $(prefix) for distcheck
+# Workaround for distcheck to succeed when user has no write permission in
sdkdir
DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
SUBDIRS = fdi src man include tools
diff --git a/configure.ac b/configure.ac
index 8ed5599..a3c8c04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,16 +71,17 @@ AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])
# Checks for extensions
XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
-# Checks for pkg-config packages. We need to be able to override sdkdir
-# to satisfy silly distcheck requirements.
+# Checks for pkg-config packages.
PKG_CHECK_MODULES(XORG, xorg-server xproto)
+PKG_CHECK_MODULES(X11, x11 xi)
-AC_ARG_WITH([sdkdir], [],
- [sdkdir="$withval"],
- [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`])
-AC_SUBST([sdkdir])
+# X Server SDK location is required to install wacom header files
+sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
-PKG_CHECK_MODULES(X11, x11 xi)
+# 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])
# Checks for header files.
AC_HEADER_STDC
--
1.6.0.4
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
