Attachment 14556 Details for Bug 14663 – proposed patch

[patch] proposed patch

0001-Look-for-src-modes-parser-in-srcdir-not-in-the-o.patch (text/plain), 1.54 KB, created by Julien Cristau on 2008-02-25 05:57:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julien Cristau

Created: 2008-02-25 05:57:32 UTC

Size: 1.54 KB

patch

obsolete

>From a891a9cb12f46e48f28b22c45b3601956b7c495a Mon Sep 17 00:00:00 2001
>From: Julien Cristau <jcristau@debian.org>
>Date: Mon, 25 Feb 2008 14:47:02 +0100
>Subject: [PATCH] Look for src/{modes,parser} in $srcdir, not in the objdir
>
>This makes the detection work in case configure is run from another directory.
>---
> configure.ac |   10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index e707a1a..9e7c5b9 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -140,16 +140,16 @@ if test -d "$XSERVER_SOURCE"; then
> 		XSERVER_SOURCE="`cd $XSERVER_SOURCE && pwd`"
> 		;;
> 	esac
>-	if test -f src/modes/xf86Modes.h; then
>+	if test -f $srcdir/src/modes/xf86Modes.h; then
> 		:
> 	else
>-		ln -sf $XSERVER_SOURCE/hw/xfree86/modes src/modes
>+		ln -sf $XSERVER_SOURCE/hw/xfree86/modes $srcdir/src/modes
> 	fi
> 	
>-	if test -f src/parser/xf86Parser.h; then
>+	if test -f $srcdir/src/parser/xf86Parser.h; then
> 		:
> 	else
>-		ln -sf $XSERVER_SOURCE/hw/xfree86/parser src/parser
>+		ln -sf $XSERVER_SOURCE/hw/xfree86/parser $srcdir/src/parser
> 	fi
> fi
> 
>@@ -158,7 +158,7 @@ if test "x$XMODES" = xyes; then
> 	AC_DEFINE(XMODES, 1,[X server has built-in mode code])
> 	XMODES_CFLAGS=
> else
>-	if test -f src/modes/xf86Modes.h -a -f src/parser/xf86Parser.h; then
>+	if test -f $srcdir/src/modes/xf86Modes.h -a -f $srcdir/src/parser/xf86Parser.h; then
> 		AC_MSG_NOTICE([X server is missing new mode code, using local copy])
> 	else
> 		AC_MSG_ERROR([Must have X server >= 1.3 source tree for mode setting code. Please specify --with-xserver-source])
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 14663: 14556

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.