diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2011-11-23 18:41:20 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2011-11-23 18:41:20 +0000 |
| commit | 70010c2d7c6472ae40fb0a8fd97e9da159a220b8 (patch) | |
| tree | c49ea0214763bede2c2788ae774a254276d91b59 /configure.in | |
| parent | d2fc8958fc36b749f5833be4980ab47ccaf587c3 (diff) | |
i118604 - Fixed use of user supplied or system dmake executable
Original committer: Andre Fischer
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/configure.in b/configure.in index c6b8adc72d11..0063719976b8 100644 --- a/configure.in +++ b/configure.in @@ -1644,16 +1644,18 @@ 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]) -else + DMAKE_PATH="$DMAKE" + IS_SYSTEM_DMAKE=YES +elif test -n "$with_dmake_path" ; then # Did not find pre-installed dmake. # Is it at a nonstandard location provided by --with-dmake-path ? - if test -n "$with_dmake_path" ; then - AC_PATH_PROG(DMAKE, dmake, no, "$with_dmake_path") - if test "$DMAKE" != "no"; then - AC_MSG_RESULT([using user provided dmake]) - fi + AC_MSG_NOTICE([looking for dmake at $DMAKE_PATH]) + if test -x "$with_dmake_path" ; then + AC_MSG_RESULT([using user provided dmake]) + DMAKE=$with_dmake_path fi fi @@ -1668,9 +1670,8 @@ if test "$DMAKE" = "no"; then AC_MSG_RESULT([dmake will be downloaded and compiled in bootstrap]) DMAKE= else - AC_MSG_WARN([no URL for dmake source code specified, either.]) + AC_MSG_ERROR([no URL for dmake source code specified, either.]) BUILD_DMAKE=YES - AC_MSG_WARN([dmake will be built from internal sources but these will be removed in the future"]) fi else AC_MSG_CHECKING([whether the found dmake is the right dmake]) @@ -1703,7 +1704,8 @@ if test "$DMAKE" = "no"; then AC_MSG_ERROR([please use --with-dmake-path or --with-dmake-url to specify dmake executable or source]) fi AC_SUBST(DMAKE_URL) -AC_SUBST(DMAKE) +AC_SUBST(DMAKE_PATH) +AC_SUBST(IS_SYSTEM_DMAKE) dnl =================================================================== |