frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use AC_PROG_SED and respect its result 

AC_PROG_SED 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).

This is a follow up to commit 9be4157391.

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
This commit is contained in:
Yaakov Selkowitz 2010-03-23 04:47:27 -05:00
parent b557571dbf
commit 40972576b6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -77,7 +77,7 @@ AC_PROG_LEX
AC_PROG_YACC AC_PROG_YACC
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
XORG_PROG_RAWCPP XORG_PROG_RAWCPP
AC_PATH_PROG(SED,sed) AC_PROG_SED
# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow # Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow
# easier overrides at build time. # easier overrides at build time.
@ -1167,8 +1167,8 @@ fi
dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed 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 dnl XKB_COMPILED_DIR (used in Makefiles) must not or install-sh gets confused
XKBOUTPUT=`echo $XKBOUTPUT/ | sed 's|/*$|/|'` XKBOUTPUT=`echo $XKBOUTPUT/ | $SED 's|/*$|/|'`
XKB_COMPILED_DIR=`echo $XKBOUTPUT | sed 's|/*$||'` XKB_COMPILED_DIR=`echo $XKBOUTPUT | $SED 's|/*$||'`
AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir]) AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])
AC_SUBST(XKB_COMPILED_DIR) AC_SUBST(XKB_COMPILED_DIR)
@ -1646,11 +1646,11 @@ if test "x$XORG" = xyes; then
AC_CHECK_HEADERS([sys/vt.h], [solaris_vt=yes], [solaris_vt=no]) AC_CHECK_HEADERS([sys/vt.h], [solaris_vt=yes], [solaris_vt=no])
# Check for minimum supported release # Check for minimum supported release
AC_MSG_CHECKING([Solaris version]) 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 if test "${OS_MINOR}" -ge 7 ; then
AC_MSG_RESULT(Solaris ${OS_MINOR}) AC_MSG_RESULT(Solaris ${OS_MINOR})
else else
AC_MSG_RESULT(Solaris `echo ${host_os}|sed -e 's/^.*solaris//`) AC_MSG_RESULT(Solaris `echo ${host_os}|$SED -e 's/^.*solaris//`)
fi fi
if test "${OS_MINOR}" -lt 8 ; then if test "${OS_MINOR}" -lt 8 ; then
AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.]) AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.])