| configure.ac (b1c00883) | configure.ac (0e02109a) |
|---|---|
| 1dnl * ************************************************************* 2dnl * 3dnl * Licensed to the Apache Software Foundation (ASF) under one 4dnl * or more contributor license agreements. See the NOTICE file 5dnl * distributed with this work for additional information 6dnl * regarding copyright ownership. The ASF licenses this file 7dnl * to you under the Apache License, Version 2.0 (the 8dnl * "License"); you may not use this file except in compliance --- 3568 unchanged lines hidden (view full) --- 3577 fi 3578 else 3579 AC_MSG_ERROR([PackageMaker needed to build OSX packages and you are not on OSX...]) 3580 fi 3581 fi 3582 if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \ 3583 echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then 3584 if test "$EPM" != "no" && test "$EPM" != "internal"; then | 1dnl * ************************************************************* 2dnl * 3dnl * Licensed to the Apache Software Foundation (ASF) under one 4dnl * or more contributor license agreements. See the NOTICE file 5dnl * distributed with this work for additional information 6dnl * regarding copyright ownership. The ASF licenses this file 7dnl * to you under the Apache License, Version 2.0 (the 8dnl * "License"); you may not use this file except in compliance --- 3568 unchanged lines hidden (view full) --- 3577 fi 3578 else 3579 AC_MSG_ERROR([PackageMaker needed to build OSX packages and you are not on OSX...]) 3580 fi 3581 fi 3582 if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \ 3583 echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then 3584 if test "$EPM" != "no" && test "$EPM" != "internal"; then |
| 3585 if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then | |
| 3586 AC_MSG_CHECKING([whether epm is patched for AOOs needs]) | 3585 AC_MSG_CHECKING([whether epm is patched for AOOs needs]) |
| 3587 if $GREP "Patched for Apache OpenOffice" $EPM >/dev/null 2>/dev/null; then | 3586 if $GREP "Patched for .*OpenOffice" $EPM >/dev/null 2>/dev/null; then |
| 3588 AC_MSG_RESULT([yes]) 3589 else 3590 AC_MSG_RESULT([no]) 3591 if echo "$PKGFORMAT" | $GREP -q rpm; then 3592 _pt="rpm" 3593 AC_MSG_WARN([the rpms will need to be installed with --nodeps]) 3594 echo "the rpms will need to be installed with --nodeps" >> warn 3595 else 3596 _pt="pkg" 3597 fi 3598 AC_MSG_WARN([the ${_pt}s will not be relocateable]) 3599 echo "the ${_pt}s will not be relocateable" >> warn 3600 AC_MSG_WARN([if you want to make sure installation without --nodeps and 3601 relocation will work, you need to patch your epm with the 3602 patch in epm/epm-3.7.patch or build with 3603 --with-epm=internal which will build a suitable epm]) 3604 fi | 3587 AC_MSG_RESULT([yes]) 3588 else 3589 AC_MSG_RESULT([no]) 3590 if echo "$PKGFORMAT" | $GREP -q rpm; then 3591 _pt="rpm" 3592 AC_MSG_WARN([the rpms will need to be installed with --nodeps]) 3593 echo "the rpms will need to be installed with --nodeps" >> warn 3594 else 3595 _pt="pkg" 3596 fi 3597 AC_MSG_WARN([the ${_pt}s will not be relocateable]) 3598 echo "the ${_pt}s will not be relocateable" >> warn 3599 AC_MSG_WARN([if you want to make sure installation without --nodeps and 3600 relocation will work, you need to patch your epm with the 3601 patch in epm/epm-3.7.patch or build with 3602 --with-epm=internal which will build a suitable epm]) 3603 fi |
| 3605 fi | |
| 3606 fi 3607 fi 3608 if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then 3609 AC_PATH_PROG(PKGMK, pkgmk, no) 3610 if test "$PKGMK" = "no"; then 3611 AC_MSG_ERROR([pkgmk needed for Solaris pkg creation. Install it.]) 3612 fi 3613 fi --- 3906 unchanged lines hidden --- | 3604 fi 3605 fi 3606 if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then 3607 AC_PATH_PROG(PKGMK, pkgmk, no) 3608 if test "$PKGMK" = "no"; then 3609 AC_MSG_ERROR([pkgmk needed for Solaris pkg creation. Install it.]) 3610 fi 3611 fi --- 3906 unchanged lines hidden --- |