configure.ac | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
New commits:
commit d65532e92e209d486cffe260adc849ae96683e6a
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Jun 6 17:39:04 2014 +0300
PackageMaker does not exist any more
Change-Id: Iefd1980fc87daa709e8e5c833407c2595e71b401
diff --git a/configure.ac b/configure.ac
index 899dc91..e1b1ea6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1419,7 +1419,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, and rpm.
+ installed, msi, native, pkg, portable, and rpm.
Example: --with-package-format='deb rpm']),
,)
@@ -4402,14 +4402,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 | osx | pkg | rpm | native | portable | archive | dmg
| installed | msi)
+ aix | bsd | deb | pkg | rpm | 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
-osx - MacOS X software distribution
pkg - Solaris software distribution
rpm - RedHat software distribution
native - "Native" software distribution for the platform
@@ -7376,18 +7375,6 @@ if test "$enable_epm" = "yes"; then
AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
fi
fi
- if echo "$PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
- if test "$_os" = "Darwin"; then
- AC_MSG_CHECKING([for PackageMaker availability])
- if ! test -x
/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker;
then
- AC_MSG_ERROR([not installed. Please install Apples Dev Tools])
- else
- AC_MSG_RESULT([ok])
- fi
- else
- AC_MSG_ERROR([PackageMaker needed to build OSX packages and you
are not on OSX...])
- fi
- fi
if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
if test "$with_epm" = "no" -a "$_os" != "Darwin"; then
@@ -7426,7 +7413,7 @@ if test "$enable_epm" = "yes"; then
else
for i in $PKGFORMAT; do
case "$i" in
- aix | bsd | deb | osx | pkg | rpm | native | portable)
+ aix | bsd | deb | pkg | rpm | native | portable)
AC_MSG_ERROR(
[--with-package-format='$PKGFORMAT' requires --enable-epm])
;;
commit 7bafca39603f7af4c364b7ec780b7b513ae9caf9
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 d5f2ff0..899dc91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1419,7 +1419,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']),
,)
@@ -4402,7 +4402,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:
@@ -4412,7 +4412,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
@@ -7427,7 +7426,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 371355406ad14145dbea3b0670db3706e9977b02
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 736c7aa..d5f2ff0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1418,8 +1418,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']),
,)
@@ -4402,14 +4402,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
@@ -7428,7 +7427,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
