From: Yaakov Selkowitz yselkow...@users.sourceforge.net
We now use libtool, which calls AC_PROG_SED and sets SED as the path to
a fully-functional 'sed' (which may also be called 'gsed' if GNU sed is
installed alongside a proprietary version). Therefore we should respect
this value of SED so we are sure to use the correct one.
This is a follow up to commit 9be4157391edf0c5fc4ee36adfb1eb1c3bdb8e3b.
Signed-off-by: Yaakov Selkowitz yselkow...@users.sourceforge.net
---
configure.ac |9 -
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6b3c002..e9f9453 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,6 @@ AC_PROG_LEX
AC_PROG_YACC
AC_SYS_LARGEFILE
XORG_PROG_RAWCPP
-AC_PATH_PROG(SED,sed)
# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow
# easier overrides at build time.
@@ -1152,8 +1151,8 @@ fi
dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
dnl XKB_COMPILED_DIR (used in Makefiles) must not or install-sh gets confused
-XKBOUTPUT=`echo $XKBOUTPUT/ | sed 's|/*$|/|'`
-XKB_COMPILED_DIR=`echo $XKBOUTPUT | sed 's|/*$||'`
+XKBOUTPUT=`echo $XKBOUTPUT/ | $SED 's|/*$|/|'`
+XKB_COMPILED_DIR=`echo $XKBOUTPUT | $SED 's|/*$||'`
AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])
AC_SUBST(XKB_COMPILED_DIR)
@@ -1631,11 +1630,11 @@ if test x$XORG = xyes; then
AC_CHECK_HEADERS([sys/vt.h], [solaris_vt=yes], [solaris_vt=no])
# Check for minimum supported release
AC_MSG_CHECKING([Solaris version])
- OS_MINOR=`echo ${host_os}|sed -e 's/^.*solaris2\.//' -e
s'/\..*$//'`
+ OS_MINOR=`echo ${host_os}|$SED -e 's/^.*solaris2\.//' -e
s'/\..*$//'`
if test ${OS_MINOR} -ge 7 ; then
AC_MSG_RESULT(Solaris ${OS_MINOR})
else
- AC_MSG_RESULT(Solaris `echo ${host_os}|sed -e
's/^.*solaris//`)
+ AC_MSG_RESULT(Solaris `echo ${host_os}|$SED -e
's/^.*solaris//`)
fi
if test ${OS_MINOR} -lt 8 ; then
AC_MSG_ERROR([This release no longer supports Solaris
versions older than Solaris 8.])
--
1.6.6.1
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
