From 26113c0b9ca1822f7aa8d187679abdd290ccc272 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 29 Dec 2009 16:50:08 -0500 Subject: Added configure check for xls-dump script. --- autogen.sh | 4 +++- configure.ac | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index ff0a152..6d773d3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,3 +1,5 @@ #!/bin/sh autoconf || exit 1 -./configure --with-ooo=/usr/lib/ooo3 +./configure \ + --with-ooo=/usr/lib/ooo3 \ + --with-xls-dump=$HOME/ooo/ooo-build/scratch/mso-dumper/xls-dump.py diff --git a/configure.ac b/configure.ac index d20951d..76eaee0 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,13 @@ AC_ARG_WITH(ooo, Example: --with-ooo=/usr/lib/ooo3], ,) +AC_ARG_WITH(xls-dump, +[ + --with-xls-dump specify the path of xls-dump script needed to dump the contents of xls files. + + Example: --with-xls-dump=/path/to/xls-dump.py], +,) + # Mandatory system library requirements first. AC_LANG_SAVE @@ -34,10 +41,18 @@ else AC_MSG_RESULT([not found]) fi if test "z$HAVE_OOO_INSTALL" != "zyes"; then - AC_MSG_ERROR([No OOo installation found. Specify your OOo installation path with ---with-ooo=.]) + AC_MSG_ERROR([No OOo installation found. Please specify your OOo installation path with ---with-ooo=.]) fi AC_SUBST(OOO_INSTALL_PATH) +XLS_DUMP_PATH=$with_xls_dump +if test "z$XLS_DUMP_PATH" == "z"; then + AC_MSG_ERROR([Please specify the location of xls-dump with --with-xls-dump=.]) +fi + +AC_CHECK_FILE($XLS_DUMP_PATH, [], + [AC_MSG_ERROR($XLS_DUMP_PATH not found.)], []) + SOLVER_PATH=$OOO_INSTALL_PATH/solver UNOHEADER_PATH=$SOLVER_PATH/inc/offuh BINDIR=$SOLVER_PATH/bin -- cgit v1.2.3