Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 905934 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (-11 / +11 lines)
Lines 8-18 test x$prefix = xNONE && prefix="$ac_default_prefix" Link Here
8
test x$datadir = xNONE && datadir="$ac_default_datadir"
8
test x$datadir = xNONE && datadir="$ac_default_datadir"
9
test x$sysconfdir = xNONE && sysconfdir="$ac_default_sysconfdir"
9
test x$sysconfdir = xNONE && sysconfdir="$ac_default_sysconfdir"
10
10
11
# Support for Gentoo Prefix
12
AC_MSG_CHECKING([if target installation is in an offset prefix])
13
EPREFIX=""
14
AS_CASE([$prefix],
15
  [/usr], [],
16
  [*/usr], [EPREFIX=`echo "$prefix" | sed 's:/usr$::'`])
17
AC_MSG_RESULT([${EPREFIX:-nope}])
18
AC_SUBST(EPREFIX)
19
11
# BASH may already be set in the shell, if the admin then changes the
20
# BASH may already be set in the shell, if the admin then changes the
12
# the /bin/sh symlink to a non-bash shell, all hell will break lose.
21
# the /bin/sh symlink to a non-bash shell, all hell will break lose.
13
# thanks to James Rowe for the heads up.
22
# thanks to James Rowe for the heads up.
14
unset BASH
23
unset BASH
15
AC_PATH_PROGS(BASH, bash)
24
AC_PATH_PROG(BASH, bash,, [$EPREFIX/bin:$prefix/bin:/bin:/usr/bin:$PATH])
16
if test x$BASH = x; then
25
if test x$BASH = x; then
17
    AC_MSG_ERROR([bash is required])
26
    AC_MSG_ERROR([bash is required])
18
fi
27
fi
Lines 32-38 else Link Here
32
fi
41
fi
33
42
34
AC_PATH_PROG(ENV_UPDATE, env-update, /usr/sbin/env-update,
43
AC_PATH_PROG(ENV_UPDATE, env-update, /usr/sbin/env-update,
35
  [$PATH:$prefix/sbin:/usr/sbin])
44
  [$prefix/sbin:/usr/sbin:$PATH])
36
45
37
CANONICALISE=""
46
CANONICALISE=""
38
# realpath is included with Coreutils since version 8.15 (2012)
47
# realpath is included with Coreutils since version 8.15 (2012)
Lines 60-74 AC_SUBST(CANONICALISE) Link Here
60
# distros install it w/o the .py extension
69
# distros install it w/o the .py extension
61
AC_CHECK_PROGS(RST2HTML, [rst2html rst2html.py])
70
AC_CHECK_PROGS(RST2HTML, [rst2html rst2html.py])
62
71
63
# Support for Gentoo Prefix
64
AC_MSG_CHECKING([if target installation is in an offset prefix])
65
EPREFIX=""
66
AS_CASE([$prefix],
67
  [/usr], [],
68
  [*/usr], [EPREFIX=`echo "$prefix" | sed 's:/usr$::'`])
69
AC_MSG_RESULT([${EPREFIX:-nope}])
70
AC_SUBST(EPREFIX)
71
72
# Include extra version information when building from git
72
# Include extra version information when building from git
73
AC_MSG_CHECKING([whether building from git])
73
AC_MSG_CHECKING([whether building from git])
74
EXTRAVERSION=""
74
EXTRAVERSION=""

Return to bug 905934