Author: pescetti Date: Sun Dec 29 18:20:41 2013 New Revision: 1554051 URL: http://svn.apache.org/r1554051 Log: #i123683# Override system dmake if --with-dmake-path or --with-dmake-url is used. Patch By: hajma <tropikha...@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=1554051&r1=1554050&r2=1554051&view=diff ============================================================================== --- openoffice/trunk/main/configure.in (original) +++ openoffice/trunk/main/configure.in Sun Dec 29 18:20:41 2013 @@ -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 ?