From 1d955ae09e7c778107ee364d28a3944092a63c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Sj=C3=B6lund?= <martin.sjolund@liu.se>
Date: Tue, 5 May 2015 14:56:04 +0200
Subject: [PATCH] Skip looking for omc build artifacts if we are compiling omc
 at the same time

---
 m4/ombuilddir.m4 |  2 +-
 m4/omhome.m4     | 48 +++++++++++++++++++++++++++---------------------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/m4/ombuilddir.m4 b/m4/ombuilddir.m4
index 8d712858d50..c1fd27627b4 100644
--- a/m4/ombuilddir.m4
+++ b/m4/ombuilddir.m4
@@ -1,5 +1,5 @@
 AC_SUBST(OMBUILDDIR)
-AC_ARG_WITH(ombuilddir,  [  --with-ombuilddir=[build]       (where build files are generated; OPENMODELICAHOME)],[OMBUILDDIR="$withval"],[OMBUILDDIR="no"])
+AC_ARG_WITH(ombuilddir,  [  --with-ombuilddir=[build]       (where build files are generated; OPENMODELICAHOME)],[OMBUILDDIR="$withval"; USINGPRESETBUILDDIR="yes"],[OMBUILDDIR="no"])
 if test "$OMBUILDDIR" = "no"; then
   OMBUILDDIR=$ac_pwd/build
   ac_configure_args="$ac_configure_args --with-ombuilddir=$OMBUILDDIR"
diff --git a/m4/omhome.m4 b/m4/omhome.m4
index 5545c7f8c93..01b891b1174 100644
--- a/m4/omhome.m4
+++ b/m4/omhome.m4
@@ -1,5 +1,5 @@
 AC_SUBST(OPENMODELICAHOME)
-AC_ARG_WITH(openmodelicahome,  [  --with-openmodelicahome=[$OPENMODELICAHOME|$PREFIX]    (Find OPENMODELICAHOME - the directory where all OpenModelica dependencies are installed.)],[OMHOME="$withval"],[OMHOME=no])
+AC_ARG_WITH(openmodelicahome,  [  --with-openmodelicahome=[OPENMODELICAHOME|PREFIX]    (Find OPENMODELICAHOME - the directory where all OpenModelica dependencies are installed.)],[OMHOME="$withval"],[OMHOME=no])
 
 if echo $host | grep -iq darwin; then
   APP=".app"
@@ -23,35 +23,40 @@ else
 fi
 
 define(FIND_OPENMODELICAHOME, [
-AC_MSG_CHECKING([for OPENMODELICAHOME])
-if test "$OMHOME" = "no"; then
-  if test -z "$OPENMODELICAHOME"; then
-    OPENMODELICAHOME="$PREFIX"
+if test ! -z "$USINGPRESETBUILDDIR"; then
+  OPENMODELICAHOME="$OMBUILDDIR"
+else
+  AC_MSG_CHECKING([for OPENMODELICAHOME])
+  if test "$OMHOME" = "no"; then
+    if test -z "$OPENMODELICAHOME"; then
+      OPENMODELICAHOME="$PREFIX"
+    else
+      OPENMODELICAHOME="$OPENMODELICAHOME"
+    fi
   else
-    OPENMODELICAHOME="$OPENMODELICAHOME"
+    OPENMODELICAHOME="$OMHOME"
   fi
-else
-  OPENMODELICAHOME="$OMHOME"
-fi
 
-AC_MSG_RESULT($OPENMODELICAHOME)
+  AC_MSG_RESULT($OPENMODELICAHOME)
 
-AC_MSG_CHECKING([for $OPENMODELICAHOME/lib/omc/ModelicaBuiltin.mo])
-if test -f "$OPENMODELICAHOME/lib/omc/ModelicaBuiltin.mo"; then
-  AC_MSG_RESULT(ok)
-else
-  AC_MSG_ERROR(failed)
-fi
+  AC_MSG_CHECKING([for $OPENMODELICAHOME/lib/omc/ModelicaBuiltin.mo])
+  if test -f "$OPENMODELICAHOME/lib/omc/ModelicaBuiltin.mo"; then
+    AC_MSG_RESULT(ok)
+  else
+    AC_MSG_ERROR(failed)
+  fi
 
-AC_MSG_CHECKING([for $OPENMODELICAHOME/share/omc/omc_communication.idl])
-if test -f "$OPENMODELICAHOME/share/omc/omc_communication.idl"; then
-  AC_MSG_RESULT(ok)
-else
-  AC_MSG_ERROR(failed)
+  AC_MSG_CHECKING([for $OPENMODELICAHOME/share/omc/omc_communication.idl])
+  if test -f "$OPENMODELICAHOME/share/omc/omc_communication.idl"; then
+    AC_MSG_RESULT(ok)
+  else
+    AC_MSG_ERROR(failed)
+  fi
 fi
 ])
 
 define(FIND_LIBOPENMODELICACOMPILER, [
+if test -z "$USINGPRESETBUILDDIR"; then
   AC_LANG_PUSH([C])
   AC_MSG_CHECKING([for libOpenModelicaCompiler])
   # Note: This does not do a full link. autoconf messes with some env
@@ -62,4 +67,5 @@ define(FIND_LIBOPENMODELICACOMPILER, [
   AC_TRY_LINK([], [], [AC_MSG_RESULT([ok])], [AC_MSG_ERROR([failed])])
   LDFLAGS="$LDFLAGS_SAVE"
   AC_LANG_POP([C])
+fi
 ])