T1.3-8 (GHS3D): find ghs3d in PATH

diff --git a/adm_local/unix/config_files/check_GHS3D.m4 b/adm_local/unix/config_files/check_GHS3D.m4
index 661c407897798ebf7585110819990d96e1bb80f9..1e7101e39269ba0977aef0e4eede2b4a9844e62d 100644 (file)
--- a/adm_local/unix/config_files/check_GHS3D.m4
+++ b/adm_local/unix/config_files/check_GHS3D.m4
@@ -1,38 +1,16 @@
 AC_DEFUN([CHECK_GHS3D],[
 
-AC_REQUIRE([AC_PROG_CXX])dnl
-AC_REQUIRE([AC_PROG_CXXCPP])dnl
+GHS3D_ok=no
 
-AC_CHECKING(for GHS3D executable)
+AC_EXEEXT
+AC_CHECK_PROG(GHS3D, ghs3d$EXEEXT,found)
 
-AC_LANG_SAVE
+if test "x$GHS3D" == x ; then
+  AC_MSG_WARN(ghs3d program not found in PATH variable)
+else
+  GHS3D_ok=yes
+fi
 
-AC_ARG_WITH(ghs3d,
-           [  --with-ghs3d=DIR root directory path of GHS33D installation],
-           GHS3D_HOME=$withval,GHS3D_HOME="")
-
-GHS3D_ok=yes
-GHS3D_HOME="/dn05/salome/GHS3D/"
-GHS3D="/misc/dn05/salome/GHS3D/ghs3d3.1-1/bin/Linux/ghs3dV3.1-1"
-
-#if test "x$GHS3D_HOME" == "x" ; then
-#
-## no --with-ghs3d option used
-#   if test "x$GHS3DHOME" != "x" ; then
-#
-#    # GHS3DHOME environment variable defined
-#      GHS3D_HOME=$GHS3DHOME
-#
-#   fi
-#fi
-
-
-  if test "x$GHS3D_ok" == xno ; then
-    AC_MSG_RESULT(no)
-    AC_MSG_WARN(GHS3D libraries not found or not properly installed)
-  else
-    AC_MSG_RESULT(yes)
-  fi
-#fi
+AC_MSG_RESULT(for GHS3D: $GHS3D_ok)
 
 ])dnl