Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1205544 - in /incubator/ooo/trunk/main: bootstrap.1
 configure.in set_soenv.in
Date: Wed, 23 Nov 2011 19:41:21 -0000
To: ooo-commits@incubator.apache.org
From: arielch@apache.org
Message-Id: <20111123194121.87C70238897F@eris.apache.org>

Author: arielch
Date: Wed Nov 23 19:41:20 2011
New Revision: 1205544

URL: http://svn.apache.org/viewvc?rev=1205544&view=rev
Log:
i118604 - Fixed use of user supplied or system dmake executable

Original committer: Andre Fischer

Modified:
    incubator/ooo/trunk/main/bootstrap.1
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/set_soenv.in

Modified: incubator/ooo/trunk/main/bootstrap.1
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/bootstrap.1?rev=1205544&r1=1205543&r2=1205544&view=diff
==============================================================================
--- incubator/ooo/trunk/main/bootstrap.1 (original)
+++ incubator/ooo/trunk/main/bootstrap.1 Wed Nov 23 19:41:20 2011
@@ -116,6 +116,20 @@ if test -n "$DMAKE_URL" -a  ! -x "$SOLAR
     # Clean up.  Note that this is skipped when one of the exits is executed above.
     rm -rf "$tmp_build_dir"
 
+elif test "$IS_SYSTEM_DMAKE" = "YES"; then
+
+    echo ""
+    echo "dmake is located in search path"
+    echo ""
+
+elif test -n "$DMAKE_PATH" -a -x "$DMAKE_PATH" -a  ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then
+
+    cp -f "$DMAKE_PATH" "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT" || exit
+
+    echo ""
+    echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT"
+    echo ""
+
 else
 
     if test -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1205544&r1=1205543&r2=1205544&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Wed Nov 23 19:41:20 2011
@@ -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 ===================================================================

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1205544&r1=1205543&r2=1205544&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Wed Nov 23 19:41:20 2011
@@ -1974,6 +1974,8 @@ ToFile( "ENABLE_AGG",        "@ENABLE_AG
 ToFile( "SYSTEM_AGG",	     "@SYSTEM_AGG@",       "e" );
 ToFile( "AGG_VERSION",	     "@AGG_VERSION@",      "e" );
 ToFile( "DMAKE_URL",         "@DMAKE_URL@",        "e" );
+ToFile( "DMAKE_PATH",        "@DMAKE_PATH@",       "e" );
+ToFile( "IS_SYSTEM_DMAKE",   "@IS_SYSTEM_DMAKE@",  "e" );
 ToFile( "BUILD_STAX",        "@BUILD_STAX@",       "e" );
 ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
 ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );