Commit ef9f418ec7f1a51ca9108e61aacca6b47e62a036
1 parent
b802d64f
Exists in
master
and in
5 other branches
Trying to fix libreoffice sdk detection.
Showing
2 changed files
with
9 additions
and
7 deletions
Show diff stats
configure.ac
| ... | ... | @@ -710,6 +710,8 @@ case "$host" in |
| 710 | 710 | if test "_$OO_SDK_URE_HOME" == "_" ; then |
| 711 | 711 | if test -d $OFFICE_HOME/ure; then |
| 712 | 712 | OO_SDK_URE_HOME="$OFFICE_HOME/ure" |
| 713 | + elif test -d $OFFICE_HOME/program/types.rdb; then | |
| 714 | + OO_SDK_URE_HOME="$OFFICE_HOME/program" | |
| 713 | 715 | else |
| 714 | 716 | if test "$host_cpu" = "x86_64"; then |
| 715 | 717 | OO_SDK_URE_HOME="/usr/lib64/ure" |
| ... | ... | @@ -753,9 +755,6 @@ else |
| 753 | 755 | AC_MSG_NOTICE([Can't find idl path]) |
| 754 | 756 | fi |
| 755 | 757 | |
| 756 | -OO_SDK_URE_BIN_DIR=$OO_SDK_URE_HOME/bin | |
| 757 | -OO_SDK_URE_LIB_DIR=$OO_SDK_URE_HOME/lib | |
| 758 | - | |
| 759 | 758 | AC_PATH_TOOL([IDLC], idlc, "no", path=$PATH:$OO_SDK_HOME/bin) |
| 760 | 759 | if test "$IDLC" == "no" ; then |
| 761 | 760 | app_cv_office="no" |
| ... | ... | @@ -766,7 +765,7 @@ if test "$UNOPKG" == "no" ; then |
| 766 | 765 | app_cv_office="no" |
| 767 | 766 | fi |
| 768 | 767 | |
| 769 | -AC_PATH_TOOL([REGMERGE], regmerge, "no", path=$PATH:$OO_SDK_URE_BIN_DIR) | |
| 768 | +AC_PATH_TOOL([REGMERGE], regmerge, "no", path=$PATH:$OO_SDK_URE_HOME/bin:$OFFICE_HOME/program) | |
| 770 | 769 | if test "$REGMERGE" == "no" ; then |
| 771 | 770 | app_cv_office="no" |
| 772 | 771 | fi |
| ... | ... | @@ -776,12 +775,11 @@ if test "$CPPUMAKER" == "no" ; then |
| 776 | 775 | app_cv_office="no" |
| 777 | 776 | fi |
| 778 | 777 | |
| 779 | -AC_PATH_TOOL([UNO], uno, "no", path=$PATH:$OO_SDK_URE_BIN_DIR) | |
| 778 | +AC_PATH_TOOL([UNO], uno, "no", path=$PATH:$OO_SDK_URE_HOME/bin:$OFFICE_HOME/program) | |
| 780 | 779 | if test "$UNO" == "no" ; then |
| 781 | 780 | app_cv_office="no" |
| 782 | 781 | fi |
| 783 | 782 | |
| 784 | - | |
| 785 | 783 | # Check for OO_SDK_HOME |
| 786 | 784 | if test "_$OO_SDK_HOME" == "_" ; then |
| 787 | 785 | app_cv_office="no" |
| ... | ... | @@ -792,6 +790,9 @@ if test "_$OFFICE_HOME" == "_" ; then |
| 792 | 790 | app_cv_office="no" |
| 793 | 791 | fi |
| 794 | 792 | |
| 793 | +# Find types.rdb | |
| 794 | +AC_CHECK_FILE($OO_SDK_URE_HOME/share/misc/types.rdb,OO_TYPES=$OO_SDK_URE_HOME/share/misc/types.rdb,app_cv_office="no") | |
| 795 | + | |
| 795 | 796 | # Set targets |
| 796 | 797 | if test "$app_cv_office" == "yes" ; then |
| 797 | 798 | |
| ... | ... | @@ -815,6 +816,7 @@ AC_SUBST(OO_SDK_URE_HOME) |
| 815 | 816 | AC_SUBST(IDLDIR) |
| 816 | 817 | AC_SUBST(OO_CXXFLAGS) |
| 817 | 818 | AC_SUBST(OO_LDFLAGS) |
| 819 | +AC_SUBST(OO_TYPES) | |
| 818 | 820 | |
| 819 | 821 | #--[ Pre-reqs ]----------------------------------------------------------------------------------------------------------------------------------------------- |
| 820 | 822 | AC_SUBST(LIB3270_REQUIRES) | ... | ... |
src/loffice/Makefile.in