From b121c692a237336224ce89a755eee588f4570bd3 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 10 Mar 2006 15:04:08 +0000 Subject: [PATCH] This commit was generated by cvs2git to create branch 'OCC_development_for_3_2_0a2'. Sprout from master 2006-02-08 09:48:01 UTC jfa 'Update version to 3.2.0a1' Cherrypick from master 2006-03-10 15:04:07 UTC nds 'Changes in configure scripts': adm_local/Makefile.in adm_local/unix/config_files/check_GHS3DPLUGIN.m4 --- adm_local/Makefile.in | 41 +++++++++++++++ .../unix/config_files/check_GHS3DPLUGIN.m4 | 52 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 adm_local/Makefile.in create mode 100755 adm_local/unix/config_files/check_GHS3DPLUGIN.m4 diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in new file mode 100644 index 0000000..9b5e810 --- /dev/null +++ b/adm_local/Makefile.in @@ -0,0 +1,41 @@ +# source path +top_srcdir=@top_srcdir@ +top_builddir=.. +srcdir=@srcdir@ +VPATH=.:$(srcdir)/adm_local + + +all: resources + +install: + cp -rf @top_srcdir@/adm_local @prefix@ + +bin: + +resources : + cp -rf @top_srcdir@/adm_local $(top_builddir) + +inc: + +lib: + +depend: + +depend_idl: + +install-end: + +install-include: + +install-bin: + +uninstall: + +uninstall-idl: + +distclean: + +clean: + +distclean-other: + diff --git a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 new file mode 100755 index 0000000..1d36f9c --- /dev/null +++ b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 @@ -0,0 +1,52 @@ +# Check availability of GHS3DPLUGIN binary distribution +# +# Author : Marc Tajchman (CEA, 2002) +#------------------------------------------------------------ + +AC_DEFUN([CHECK_GHS3DPLUGIN],[ + +AC_CHECKING(for GHS3dPlugin) + +GHS3dPlugin_ok=no + +AC_ARG_WITH(ghs, + --with-ghs3dPlugin=DIR root directory path of GHS3DPLUGIN build or installation, + GHS3DPLUGIN_DIR="$withval",GHS3DPLUGIN_DIR="") + +if test "x$GHS3DPLUGIN_DIR" = "x" ; then + +# no --with-gui-dir option used + + if test "x$GHS3DPLUGIN_ROOT_DIR" != "x" ; then + + # SALOME_ROOT_DIR environment variable defined + GHS3DPLUGIN_DIR=$GHS3DPLUGIN_ROOT_DIR + + else + + # search Salome binaries in PATH variable + AC_PATH_PROG(TEMP, libGHS3DEngine.so) + if test "x$TEMP" != "x" ; then + GHS3DPLUGIN_DIR=`dirname $TEMP` + fi + + fi + +fi + +if test -f ${GHS3DPLUGIN_DIR}/lib/salome/libGHS3DEngine.so ; then + GHS3dPlugin_ok=yes + AC_MSG_RESULT(Using GHS3DPLUGIN module distribution in ${GHS3DPLUGIN_DIR}) + + if test "x$GHS3DPLUGIN_ROOT_DIR" == "x" ; then + GHS3DPLUGIN_ROOT_DIR=${GHS3DPLUGIN_DIR} + fi + AC_SUBST(GHS3DPLUGIN_ROOT_DIR) +else + AC_MSG_WARN("Cannot find compiled GHS3DPLUGIN module distribution") +fi + +AC_MSG_RESULT(for GHS3DPLUGIN: $GHS3dPlugin_ok) + +])dnl + -- 2.39.2