openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pesce...@apache.org
Subject svn commit: r1561602 - /openoffice/trunk/main/configure.in
Date Mon, 27 Jan 2014 08:23:47 GMT
Author: pescetti
Date: Mon Jan 27 08:23:46 2014
New Revision: 1561602

URL: http://svn.apache.org/r1561602
Log:
#i123683# Override system dmake if --with-dmake-path or --with-dmake-url is used.
Patch By: hajma <tropikhajma@gmail.com>

Modified:
    openoffice/trunk/main/configure.in

Modified: openoffice/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1561602&r1=1561601&r2=1561602&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Mon Jan 27 08:23:46 2014
@@ -1797,12 +1797,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 ?



Mime
View raw message