Salome HOME
Merge from V6_main 13/12/2012
[plugins/hexoticplugin.git] / adm_local / unix / config_files / check_Hexotic.m4
index ec17b4766998a28fd6747758f70e0085444e9a61..43876ccc1853a3d8267454789cda6e1ed6e85c67 100755 (executable)
@@ -22,59 +22,40 @@ dnl  Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
 dnl
 AC_DEFUN([CHECK_HEXOTIC],[
 
-AC_REQUIRE([AC_PROG_CXX])dnl
-AC_REQUIRE([AC_PROG_CXXCPP])dnl
-
 AC_CHECKING(for Hexotic commercial product)
 
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-AC_ARG_WITH(,
-           [  --with-hexotic=DIR      root directory path of Hexotic installation])
+AC_ARG_WITH([hexotic],
+           [AC_HELP_STRING([--with-hexotic=EXEC],
+                           [hexotic executable])],
+            [],
+            [with_hexotic=auto])
 
 Hexotic_ok=no
 
 if test "$with_hexotic" == "no" ; then
     AC_MSG_WARN(You have choosen building plugin without Hexotic)
 else
+    echo
+    echo -------------------------------------------------
+    echo You are about to choose to use somehow the
+    echo Hexotic commercial product to generate 3D hexahedral mesh.
+    echo
+    
     if test "$with_hexotic" == "yes" || test "$with_hexotic" == "auto"; then
-        Hexotic_HOME=""
+       AC_PATH_PROG([Hexotic],[hexotic])
     else
-        Hexotic_HOME="$with_hexotic"
+       Hexotic="$with_hexotic"
+       AC_MSG_RESULT([Use $Hexotic as hexotic executable])
     fi
     
-    if test "$Hexotic_HOME" == "" ; then
-        if test "x$HexoticHOME" != "x" ; then
-            Hexotic_HOME=$HexoticHOME
-        else
-            AC_MSG_WARN(Build plugin without Hexotic)
-        fi
-    fi
-    
-    if test "x$Hexotic_HOME" != "x"; then
-    
-      echo
-      echo -------------------------------------------------
-      echo You are about to choose to use somehow the
-      echo Hexotic commercial product to generate 3D hexahedral mesh.
-      echo
-    
-      AC_CHECKING(for Hexotic executable)
-    
-      AC_CHECK_PROG(Hexotic,hexotic,found)
-    
-      if test "x$Hexotic" == x ; then
-        AC_MSG_WARN(hexotic program not found in PATH variable)
+    if test "x$Hexotic" == x ; then
+        AC_MSG_WARN(hexotic program is not found in PATH variable)
         AC_MSG_WARN(Build plugin without Hexotic)
-      else
+    else
         Hexotic_ok=yes
-      fi
-    
     fi
 fi
 
 AC_MSG_RESULT(for Hexotic: $Hexotic_ok)
-AC_LANG_RESTORE
 
 ])dnl