[Libreoffice-commits] core.git: Branch 'aoo/trunk' - configure.in

[Andrea Pescetti]

 configure.in |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 26223e11dbc00d97c32980ddca19a7b08bf3ce0c
Author: Andrea Pescetti <pescetti at apache.org>
Date:   Sun Dec 29 18:20:41 2013 +0000

    #i123683# Override system dmake if --with-dmake-path or --with-dmake-url is used.
    
    Patch By: hajma <tropikhajma at gmail.com>

diff --git a/configure.in b/configure.in
index a93c1cd..7f9ecef 100644
--- a/configure.in
+++ b/configure.in
@@ -1798,12 +1798,16 @@ dnl ===================================================================
 dnl Search for a pre-installed dmake
 dnl ===================================================================
 AC_MSG_CHECKING([for dmake])
-AC_PATH_PROG(DMAKE, dmake, no)
-IS_SYSTEM_DMAKE=NO
-if test "$DMAKE" != "no"; then
-   AC_MSG_RESULT([using system dmake])
-   DMAKE_PATH="$DMAKE"
-   IS_SYSTEM_DMAKE=YES
+DMAKE="no"
+# Override system dmake if --with-dmake-path or --with-dmake-url is used.
+if test -z "$with_dmake_path" && test -z "$with_dmake_url"; then
+   AC_PATH_PROG(DMAKE, dmake, no)
+   IS_SYSTEM_DMAKE=NO
+   if test "$DMAKE" != "no"; then
+      AC_MSG_RESULT([using system dmake])
+      DMAKE_PATH="$DMAKE"
+      IS_SYSTEM_DMAKE=YES
+   fi
 elif test -n "$with_dmake_path" ; then
    # Did not find pre-installed dmake.
    # Is it at a nonstandard location provided by --with-dmake-path ?