configure.in | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
New commits: commit 30ac6d2c7baadf79574ff10e831fa8632319025a Author: Michael Stahl <mst...@redhat.com> Date: Mon May 14 13:07:58 2012 +0200 configure.in: report errors in PathFormat diff --git a/configure.in b/configure.in index 0fb5b2f..543f65e 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,23 @@ PathFormat() done if test "$pf_conv_to_dos" = "yes"; then formatted_path=`cygpath -d "$formatted_path"` + if test $? -ne 0; then + AC_MSG_ERROR([path conversion failed for "$1".]) + fi fi fp_count_colon=`echo "$formatted_path" | $GREP -c "[:]"` fp_count_slash=`echo "$formatted_path" | $GREP -c "[/]"` if test "$fp_count_slash$fp_count_colon" != "00"; then if test "$fp_count_colon" = "0"; then formatted_path=`realpath "$formatted_path"` + if test $? -ne 0; then + AC_MSG_ERROR([realpath failed for "$1".]) + fi fi formatted_path=`cygpath -m "$formatted_path"` + if test $? -ne 0; then + AC_MSG_ERROR([path conversion failed for "$1".]) + fi fi fi } commit 64338258917cdfa8723231655c536edaa94a2c23 Author: Michael Stahl <mst...@redhat.com> Date: Mon May 14 13:01:58 2012 +0200 configure.in: fix --with-solver-and-workdir-root: PathFormat fails if path does not exist diff --git a/configure.in b/configure.in index 5038c03..0fb5b2f 100644 --- a/configure.in +++ b/configure.in @@ -2189,9 +2189,8 @@ if test -n "${with_solver_and_workdir_root}"; then if ! test -d ${with_solver_and_workdir_root}; then AC_MSG_ERROR([directory does not exist: ${with_solver_and_workdir_root}]) fi - SOLARVER=${with_solver_and_workdir_root}/solver - PathFormat "$SOLARVER" - SOLARVER="$formatted_path" + PathFormat "${with_solver_and_workdir_root}" + SOLARVER=${formatted_path}/solver else SOLARVER=${SRC_ROOT}/solver fi @@ -3380,9 +3379,8 @@ fi INPATH="${OUTPATH}${PROEXT}" if test -n "${with_solver_and_workdir_root}"; then - WORKDIR=${with_solver_and_workdir_root}/workdir/${INPATH} - PathFormat "$WORKDIR" - WORKDIR="$formatted_path" + PathFormat "${with_solver_and_workdir_root}" + WORKDIR=${formatted_path}/workdir/${INPATH} else WORKDIR=${SRC_ROOT}/workdir/${INPATH} fi _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits