Skip to content

C
core
Kaydet (Commit) 5de5a048 authored tarafından Rüdiger Timm's avatar Rüdiger Timm
Dosyalara gözat
Seçenekler

INTEGRATION: CWS configure12 (1.132.4); FILE MERGED 

2005/08/26 20:17:39 rene 1.132.4.4: missing -
2005/08/26 19:54:00 rene 1.132.4.3: remove bogus RPM=, thanks Pavel
actually add DPKG and PKGMK to set_soenv.in
2005/08/26 18:54:55 rene 1.132.4.2: #i53840# add help for --with-package-format
2005/08/25 10:42:16 rene 1.132.4.1: #i53640# support > 1 values in --with-package-format
üst 785f9589
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 55 deletions
config_office/configure.in
Dosyayı görüntüle @ 5de5a048
......@@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et:
dnl *
dnl * Name: configure.in
dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
dnl * Date: $Date: 2005-08-25 16:11:15 $
dnl * Date: $Date: 2005-08-30 09:12:36 $
dnl *
dnl * Desc: This file serves as input for the GNU autoconf package
dnl * in order to create a configure script.
......@@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org
dnl *
dnl *
dnl ******************************************************************/
AC_REVISION( $Revision: 1.133 $ )
AC_REVISION( $Revision: 1.134 $ )
AC_PREREQ(2.50)
AC_INIT()
echo "$@" >config.parms
......@@ -57,6 +57,12 @@ AC_ARG_ENABLE(epm,
epm, however epm is useless for large scale
package building.
],,enable_epm="yes")
AC_ARG_WITH(package-format,
[ --with-package-format specify package format(s) for OOo installsets.
Default is "normal" one of the OS/Distribution.
Usage: --with-package-format="foo bar"
],,)
AC_ARG_ENABLE(odk,
[ --disable-odk OO.o includes an ODK, office development kit
which some packagers may with to build without
......@@ -2246,13 +2252,12 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \)
AC_MSG_ERROR([unknown system])
esac
if test -n "$with_package_format"; then
case "$with_package_format" in
aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable)
PKGFORMAT="$with_package_format"
AC_MSG_RESULT([$PKGFORMAT])
for i in $with_package_format; do
case "$i" in
aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable)
;;
*)
AC_MSG_ERROR([unsupported format $with_package_format. Supported by EPM are:
AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
aix - AIX software distribution
bsd - FreeBSD, NetBSD, or OpenBSD software distribution
depot or swinstall - HP-UX software distribution
......@@ -2266,32 +2271,47 @@ native - "Native" software distribution for the platform
portable - Portable software distribution
])
;;
esac
else
AC_MSG_RESULT([$PKGFORMAT])
esac
done
PKGFORMAT="$with_package_format"
fi
case "$PKGFORMAT" in
deb)
AC_PATH_PROG(DPKG, dpkg, no)
if test "$DPKG" = "no"; then
AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
AC_MSG_RESULT([$PKGFORMAT])
if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then
AC_MSG_CHECKING([for rpm])
for a in "$RPM" rpmbuild rpm; do
$a --usage >/dev/null 2> /dev/null
if test $? -eq 0; then
RPM=$a
break
fi
RPM=
;;
osx)
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
done
if test -z "$RPM" ; then
AC_MSG_ERROR([not found])
else
RPM_PATH=`which $RPM`
AC_MSG_RESULT([$RPM_PATH])
fi
fi
if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
AC_PATH_PROG(DPKG, dpkg, no)
if test "$DPKG" = "no"; 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_ERROR([PackageMaker needed to build OSX packages and you are not on OSX...])
fi
RPM=
;;
rpm | pkg)
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 "$EPM" != "no" && test "$EPM" != "internal"; then
if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
AC_MSG_CHECKING([whether epm is patched for OOos needs])
......@@ -2299,7 +2319,7 @@ portable - Portable software distribution
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
if test "$PKGTYPE" = "rpm"; then
if echo "$PKGFORMAT" | grep -q rpm; then
_pt="rpm"
AC_MSG_WARN([the rpms will need to be installed with --nodeps])
echo "the rpms will need to be installed with --nodeps" >> warn
......@@ -2315,33 +2335,18 @@ portable - Portable software distribution
fi
fi
fi
if test "$PKGFORMAT" = "rpm"; then
AC_MSG_CHECKING([for rpm])
for a in "$RPM" rpmbuild rpm; do
$a --usage >/dev/null 2> /dev/null
if test $? -eq 0; then
RPM=$a
break
fi
done
if test -z "$RPM" ; then
AC_MSG_ERROR([not found])
else
AC_MSG_RESULT([$RPM])
fi
fi
if test "$PKGFORMAT" = "pkg"; then
AC_PATH_PROG(PKGMK, pkgmk, no)
if test "$PKGMK" = "no"; then
AC_MSG_ERROR([pkgmk needed for Solaris pkg creation. Install it.])
fi
RPM=
fi
;;
esac
fi
if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
AC_PATH_PROG(PKGMK, pkgmk, no)
if test "$PKGMK" = "no"; then
AC_MSG_ERROR([pkgmk needed for Solaris pkg creation. Install it.])
fi
fi
AC_SUBST(BUILD_EPM)
AC_SUBST(PKGFORMAT)
AC_SUBST(RPM)
AC_SUBST(DPKG)
AC_SUBST(PKGMK)
else
AC_MSG_RESULT([no])
EPM=NO
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment