- Some paradiseo autoconf

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12299 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

configure.in

@@ -9,7 +9,8 @@ AC_SUBST(rmlinc)
 AC_SUBST(omc_antlr_jar)
 AC_SUBST(antlrinc)
 AC_SUBST(antlrlib)
-AC_SUBST(with_paradiseo)
+AC_SUBST(with_paradiseo_include)
+AC_SUBST(with_paradiseo_lib)
 AC_SUBST(with_qwt)
 AC_SUBST(with_qwt_suffix)
 AC_SUBST(LIBSOCKET)
@@ -466,20 +467,29 @@ if test -n "$QMAKE"; then
   AC_MSG_CHECKING([for paradisEO])
   AC_ARG_WITH(paradiseo, [  --with-paradiseo        Required for OMOptim. Default searches {PREFIX,/usr,/opt} for {include,lib}/paradiseo], [], [with_paradiseo=yes])
 
-  if test x"$with_paradiseo" = "xyes"; then
-    with_paradiseo_checked=""
-    for f in /{usr,opt,$PREFIX}; do
-      test -d "$f/include/paradiseo/" -a -d "$f/lib/paradiseo/" && with_paradiseo="$f" || with_paradiseo_checked="$with_paradiseo_checked $f"
-    done
-  fi
-
-  if test x"$with_paradiseo" = "xno"; then
-    with_paradiseo=""
-    AC_MSG_RESULT([disabled])
-  elif test x"$with_paradiseo" = "xyes"; then
-    AC_MSG_ERROR([not found (searched $with_paradiseo_checked)])
+  if test -f "$with_paradiseo/paradiseo-eo/src/eo"; then
+    # User used a local paradiseo installation
+    with_paradiseo_include="$with_paradiseo/paradiseo-eo/src $with_paradiseo/paradiseo-mo/src $with_paradiseo/paradiseo-moeo/src"
+    with_paradiseo_lib="$with_paradiseo/paradiseo-eo/lib $with_paradiseo/paradiseo-mo/lib $with_paradiseo/paradiseo-moeo/lib"
+    AC_MSG_RESULT(stock version in: $with_paradiseo)
   else
-    AC_MSG_RESULT($with_paradiseo)
+
+    if test x"$with_paradiseo" = "xyes"; then
+      with_paradiseo_checked=""
+      for f in /{usr,opt,$PREFIX}; do
+        test -d "$f/include/paradiseo/" -a -d "$f/lib/paradiseo/" && with_paradiseo_include="$f/include/paradiseo/" && with_paradiseo_lib="$f/lib/paradiseo/" && with_paradiseo="$f" || with_paradiseo_checked="$with_paradiseo_checked $f"
+      done
+    fi
+
+    if test x"$with_paradiseo" = "xno"; then
+      with_paradiseo=""
+      AC_MSG_RESULT([disabled])
+    elif test x"$with_paradiseo" = "xyes"; then
+      AC_MSG_ERROR([not found (searched $with_paradiseo_checked)])
+    else
+      AC_MSG_RESULT($with_paradiseo)
+    fi
+
   fi
 fi