Commit a70a9b950f81a6a2fd5aece0f2207deba560c3bc
Exists in
master
and in
5 other branches
Merge branch 'master' of http://softwarepublico.gov.br/gitlab/pw3270/principal
Showing
1 changed file
with
8 additions
and
1 deletions
Show diff stats
configure.ac
| ... | ... | @@ -793,7 +793,14 @@ if test "_$OFFICE_HOME" == "_" ; then |
| 793 | 793 | fi |
| 794 | 794 | |
| 795 | 795 | # Find types.rdb |
| 796 | -OO_TYPES=$OO_SDK_URE_HOME/share/misc/types.rdb | |
| 796 | +if test -e "$OO_SDK_URE_HOME/share/misc/types.rdb"; then | |
| 797 | + OO_TYPES=$OO_SDK_URE_HOME/share/misc/types.rdb | |
| 798 | +elif test -e "$OFFICE_HOME/program/types.rdb"; then | |
| 799 | + OO_TYPES=$OFFICE_HOME/program/types.rdb | |
| 800 | +else | |
| 801 | + app_cv_office="no" | |
| 802 | + AC_MSG_NOTICE([Can't find types.rd]) | |
| 803 | +fi | |
| 797 | 804 | |
| 798 | 805 | # Set targets |
| 799 | 806 | if test "$app_cv_office" == "yes" ; then | ... | ... |