configure.ac | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 1a65a1b4fb54583a1fb1e5b6e7325bfc8a210c34
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Thu Dec 6 02:33:46 2012 +0200
Set OOO_VENDOR to the login name as fallback
If OOO_VENDOR is empty you get annoying warnings from the Windows
Resource Compiler at line 55 in solenv/inc/shlinfo.rc.
diff --git a/configure.ac b/configure.ac
index 7a96485..55ca717 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11866,7 +11866,17 @@ AC_SUBST(EXTRA_BUILDID)
OOO_VENDOR=
AC_MSG_CHECKING([for vendor])
if test -z "$with_vendor" -o "$with_vendor" = "no"; then
- AC_MSG_RESULT([not set])
+ OOO_VENDOR="$USERNAME"
+
+ if test -z "$OOO_VENDOR"; then
+ OOO_VENDOR="$USER"
+ fi
+
+ if test -z "$OOO_VENDOR"; then
+ OOO_VENDOR="`id -u -n`"
+ fi
+
+ AC_MSG_RESULT([not set, using $OOO_VENDOR])
else
OOO_VENDOR="$with_vendor"
AC_MSG_RESULT([$OOO_VENDOR])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
