This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO418 by this push:
new c114464 FAKEROOT test
c114464 is described below
commit c1144642e42577fe6359e88cb6492b7d61b25d2a
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Wed Oct 28 10:06:03 2020 -0400
FAKEROOT test
---
main/configure.ac | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/main/configure.ac b/main/configure.ac
index d305f62..950e20e 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -3518,8 +3518,11 @@ msi - Windows .msi
if test "$DPKG" = "no"; then
AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
fi
- fi
- if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
+ AC_PATH_PROG(FAKEROOT, fakeroot, no)
+ if test "$FAKEROOT" = "no"; then
+ AC_MSG_WARN([fakeroot recommended for deb creation. Will try with
getuid.so hack.])
+ fi
+ fi if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
if test "$EPM" != "no" && test "$EPM" != "internal"; then
if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
@@ -3550,10 +3553,6 @@ msi - Windows .msi
if test "$PKGMK" = "no"; then
AC_MSG_ERROR([pkgmk needed for Solaris pkg creation. Install it.])
fi
- AC_PATH_PROG(FAKEROOT, fakeroot, no)
- if test "$FAKEROOT" = "no"; then
- AC_MSG_WARN([fakeroot recommended for deb creation. Will try with
getuid.so hack.])
- fi
fi
AC_SUBST(RPM)
AC_SUBST(DPKG)
