diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-01-20 12:28:25 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-01-20 12:28:25 +0000 |
| commit | 4943f76bab034168d2d6cf680375f2c93aa6eefa (patch) | |
| tree | 74c02a60a53c0f7102069fb54cab6cea39b61a5f | |
| parent | 7bc07363c8d36ad701b2962efbf661bba115d642 (diff) | |
INTEGRATION: CWS macosx20xfixes01 (1.139.2); FILE MERGED
2006/01/09 20:21:47 tra 1.139.2.3: RESYNC: (1.140-1.146); FILE MERGED
2005/12/16 16:17:40 tra 1.139.2.2: RESYNC: (1.139-1.140); FILE MERGED
2005/10/27 08:48:21 ericb 1.139.2.1: #i55093# fix typo external epm is used in Mac OSX build
| -rw-r--r-- | config_office/configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 11f4d37bb33b..ea4430dbcc87 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -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: 2006-01-20 10:52:29 $ +dnl * Date: $Date: 2006-01-20 13:28:25 $ 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.149 $ ) +AC_REVISION( $Revision: 1.150 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -2228,7 +2228,7 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \) _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1` if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)]) - elif test "$_pm" = "Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then + elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then AC_MSG_RESULT([$_pm, ok]) else # we never should get here, but go safe AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)]) |