configure.ac | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 2044aef13b163e8ba977013c152e919271ac4352
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Feb 20 11:18:56 2014 +0200
Don't bother mentioning the Tru64 'setld' package format
Change-Id: I2a9707c70637fe5bae5d16fd45e9603318d5d82f
diff --git a/configure.ac b/configure.ac
index f506ecf..1c4ba06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1402,7 +1402,7 @@ AC_ARG_WITH(package-format,
[Specify package format(s) for LibreOffice installation sets. The
implicit --without-package-format leads to no installation sets being
generated. Possible values: aix, archive, bsd, deb, dmg,
- installed, msi, native, osx, pkg, portable, rpm, and setld.
+ installed, msi, native, osx, pkg, portable, and rpm.
Example: --with-package-format='deb rpm']),
,)
@@ -4451,7 +4451,7 @@ AC_MSG_CHECKING([which package format to use])
if test -n "$with_package_format" -a "$with_package_format" != no; then
for i in $with_package_format; do
case "$i" in
- aix | bsd | deb | osx | pkg | rpm | setld | native | portable |
archive | dmg | installed | msi)
+ aix | bsd | deb | osx | pkg | rpm | native | portable | archive | dmg
| installed | msi)
;;
*)
AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
@@ -4461,7 +4461,6 @@ deb - Debian software distribution
osx - MacOS X software distribution
pkg - Solaris software distribution
rpm - RedHat software distribution
-setld - Tru64 (setld) software distribution
native - "Native" software distribution for the platform
portable - Portable software distribution
@@ -7256,7 +7255,7 @@ if test "$enable_epm" = "yes"; then
else
for i in $PKGFORMAT; do
case "$i" in
- aix | bsd | deb | osx | pkg | rpm | setld | native | portable)
+ aix | bsd | deb | osx | pkg | rpm | native | portable)
AC_MSG_ERROR(
[--with-package-format='$PKGFORMAT' requires --enable-epm])
;;
commit 26eb80ac7a1fa0ce56a0137e6243625c91b4c580
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Feb 20 11:18:04 2014 +0200
Don't bother mentioning the IRIX 'inst' and 'tardist' package formats
Change-Id: I11c2f7fa72a1bc8a2c621ed928dc33a8410f1eee
diff --git a/configure.ac b/configure.ac
index 4f71d15..f506ecf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1401,8 +1401,8 @@ AC_ARG_WITH(package-format,
AS_HELP_STRING([--with-package-format],
[Specify package format(s) for LibreOffice installation sets. The
implicit --without-package-format leads to no installation sets being
- generated. Possible values: aix, archive, bsd, deb, dmg, inst,
- installed, msi, native, osx, pkg, portable, rpm, setld, and tardist.
+ generated. Possible values: aix, archive, bsd, deb, dmg,
+ installed, msi, native, osx, pkg, portable, rpm, and setld.
Example: --with-package-format='deb rpm']),
,)
@@ -4451,14 +4451,13 @@ AC_MSG_CHECKING([which package format to use])
if test -n "$with_package_format" -a "$with_package_format" != no; then
for i in $with_package_format; do
case "$i" in
- aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native |
portable | archive | dmg | installed | msi)
+ aix | bsd | deb | osx | pkg | rpm | setld | native | portable |
archive | dmg | installed | msi)
;;
*)
AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
aix - AIX software distribution
bsd - FreeBSD, NetBSD, or OpenBSD software distribution
deb - Debian software distribution
-inst or tardist - IRIX software distribution
osx - MacOS X software distribution
pkg - Solaris software distribution
rpm - RedHat software distribution
@@ -7257,7 +7256,7 @@ if test "$enable_epm" = "yes"; then
else
for i in $PKGFORMAT; do
case "$i" in
- aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native |
portable)
+ aix | bsd | deb | osx | pkg | rpm | setld | native | portable)
AC_MSG_ERROR(
[--with-package-format='$PKGFORMAT' requires --enable-epm])
;;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
