From 86cf2ab52ad5c6b4b262c1673ad5bd4c8713e3e8 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu, 7 Jul 2011 17:16:52 -0700
Subject: Revert "Let autoconf generate x11perfcomp directly instead of doing
 it via sed"

This reverts commit 4af24b2f5b3f8f2c20271ae323b6fa528b9b2127.

Letting autoconf do it failed to handle the recursive expansion needed,
resulting in "PATH=${exec_prefix}/lib/X11/x11perfcomp:..." without having
exec_prefix defined in x11perfcomp.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
---
 Makefile.am  | 6 ++++++
 configure.ac | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index bb381d6..5cfedb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,12 @@ x11perf_SOURCES =	\
         x11perf.h
 
 bin_SCRIPTS = x11perfcomp
+CLEANFILES = $(bin_SCRIPTS)
+EXTRA_DIST = $(bin_SCRIPTS:=.in)
+DIR_SUBSTS = -e 's|@x11perfcompdir[@]|$(x11perfcompdir)|g'
+
+x11perfcomp: x11perfcomp.in
+	$(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/$@.in > $@
 
 dist_x11perfcomp_SCRIPTS = 	\
 	fillblnk		\
diff --git a/configure.ac b/configure.ac
index 1b62a88..dfbed8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,6 @@ yes)
 esac
 
 AC_CONFIG_FILES([
-	x11perfcomp
 	Makefile
 	man/Makefile])
 AC_OUTPUT
-- 
cgit v1.2.3