[Libreoffice-commits] core.git: configure.ac

Tor Lillqvist tml at collabora.com
Wed Jun 11 00:46:53 PDT 2014


 configure.ac |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 568dc479a62ac9cb50d59145aea8145967ced5bc
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jun 11 10:45:41 2014 +0300

    The Cygwin realpath command fails for dirs on a mounted volume so just warn
    
    Change-Id: Idff480084b22a5db6a0f00f90b7febc8488ba2af

diff --git a/configure.ac b/configure.ac
index 65dd75e..e965a1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,9 +48,11 @@ PathFormat()
         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"`
+                new_formatted_path=`realpath "$formatted_path"`
                 if test $? -ne 0;  then
-                    AC_MSG_ERROR([realpath failed for "$1".])
+                    AC_MSG_WARNING([realpath failed for "$1", not necessarily a problem.])
+                else
+                    formatted_path="$new_formatted_path"
                 fi
             fi
             formatted_path=`cygpath -m "$formatted_path"`


More information about the Libreoffice-commits mailing list