summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--bin/bffvalidator.sh.in3
-rw-r--r--configure.ac11
3 files changed, 14 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 01e57e1b902a..cbdc3e98d45c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,7 @@
/config_build_lang.mk
/configure
/lo.xcent
+/bin/bffvalidator.sh
/Makefile
/NEWS
/TODO
diff --git a/bin/bffvalidator.sh.in b/bin/bffvalidator.sh.in
new file mode 100644
index 000000000000..e43522764938
--- /dev/null
+++ b/bin/bffvalidator.sh.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+wine @BFFVALIDATOR_EXE@ `winepath -w $1`
diff --git a/configure.ac b/configure.ac
index d99b4b4266a3..39bc17f059fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2796,7 +2796,14 @@ if test "$with_bffvalidator" != "no"; then
else
AC_MSG_ERROR([bffvalidator not found, but required by --with-bffvalidator])
fi
- elif test -n "$BFFVALIDATOR" -a -e "$BFFVALIDATOR"; then
+ elif test -n "$BFFVALIDATOR"; then
+ # We are not in CygWin but need to run Windows binary with wine
+ AC_PATH_PROGS(WINE, wine)
+
+ # so swap in a shell wrapper that converts paths transparently
+ BFFVALIDATOR_EXE="$BFFVALIDATOR"
+ BFFVALIDATOR="$SRC_ROOT/bin/bffvalidator.sh"
+ AC_SUBST(BFFVALIDATOR_EXE)
AC_MSG_RESULT($BFFVALIDATOR)
else
AC_MSG_ERROR([bffvalidator not found, but required by --with-bffvalidator])
@@ -4657,6 +4664,7 @@ if test "$cross_compiling" = "yes"; then
config_host_lang.mk.in \
Makefile.in \
lo.xcent.in \
+ bin/bffvalidator.sh.in \
instsetoo_native/util/openoffice.lst.in \
config_host/*.in \
sysui/desktop/macosx/Info.plist.in \
@@ -12991,6 +12999,7 @@ AC_CONFIG_FILES([config_host.mk
config_host_lang.mk
Makefile
lo.xcent
+ bin/bffvalidator.sh
instsetoo_native/util/openoffice.lst
sysui/desktop/macosx/Info.plist
ios/lo.xcconfig])