diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-02 18:12:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-03 15:19:55 +0100 |
| commit | 827430c8c0417396b3c1d2a049ccddb818c89646 (patch) | |
| tree | 2b249c14dcbfb725469b4dd70c125d00486d2a84 /configure.ac | |
| parent | 1924d05e706e6308b4de3b6103ebb73976866d66 (diff) | |
Fold URE: Windows
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is
no longer necessary and loading of cppuhelper from the program dir cannot fail
regardless in whatever scenario the cli_cppuhelper library itself is loaded.
Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 7740f0aa29e9..e2b7e4bbec07 100644 --- a/configure.ac +++ b/configure.ac @@ -3039,11 +3039,11 @@ elif test $_os = WINNT; then LIBO_SHARE_PRESETS_FOLDER=presets LIBO_SHARE_RESOURCE_FOLDER=program/resource LIBO_SHARE_SHELL_FOLDER=program/shell - LIBO_URE_BIN_FOLDER=URE/bin - LIBO_URE_ETC_FOLDER=URE/bin - LIBO_URE_LIB_FOLDER=URE/bin - LIBO_URE_MISC_FOLDER=URE/misc - LIBO_URE_SHARE_JAVA_FOLDER=URE/java + LIBO_URE_BIN_FOLDER=program + LIBO_URE_ETC_FOLDER=program + LIBO_URE_LIB_FOLDER=program + LIBO_URE_MISC_FOLDER=program + LIBO_URE_SHARE_JAVA_FOLDER=program/classes else LIBO_BIN_FOLDER=program LIBO_ETC_FOLDER=program |