From: nds <nds@opencascade.com>
Date: Fri, 10 Mar 2006 15:04:07 +0000 (+0000)
Subject: Changes in configure scripts
X-Git-Tag: OCC_3_2_0a2_TC~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f120c9f6b5e4a80457e229b07418b436798881e2;p=plugins%2Fghs3dplugin.git

Changes in configure scripts
---

diff --git a/Makefile.in b/Makefile.in
index b04c927..9071576 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 
 @COMMENCE@
 
-SUBDIRS = idl src
+SUBDIRS = idl src adm_local
 
 RESOURCES_FILES = GHS3DPlugin.xml
 
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
+ 
diff --git a/adm_local/unix/config_files/check_Geom.m4 b/adm_local/unix/config_files/check_Geom.m4
deleted file mode 100644
index 803ca75..0000000
--- a/adm_local/unix/config_files/check_Geom.m4
+++ /dev/null
@@ -1,54 +0,0 @@
-# Check availability of Geom binary distribution
-#
-# Author : Nicolas REJNERI (OPEN CASCADE, 2003)
-#
-
-AC_DEFUN([CHECK_GEOM],[
-
-AC_CHECKING(for Geom)
-
-Geom_ok=no
-
-AC_ARG_WITH(geom,
-	    [  --with-geom=DIR root directory path of GEOM installation ],
-	    GEOM_DIR="$withval",GEOM_DIR="")
-
-if test "x$GEOM_DIR" == "x" ; then
-
-# no --with-geom-dir option used
-
-   if test "x$GEOM_ROOT_DIR" != "x" ; then
-
-    # GEOM_ROOT_DIR environment variable defined
-      GEOM_DIR=$GEOM_ROOT_DIR
-
-   else
-
-    # search Geom binaries in PATH variable
-      AC_PATH_PROG(TEMP, libGEOM_Swig.py)
-      if test "x$TEMP" != "x" ; then
-         GEOM_BIN_DIR=`dirname $TEMP`
-         GEOM_DIR=`dirname $GEOM_BIN_DIR`
-      fi
-      
-   fi
-# 
-fi
-
-if test -f ${GEOM_DIR}/bin/salome/libGEOM_Swig.py ; then
-   Geom_ok=yes
-   AC_MSG_RESULT(Using Geom module distribution in ${GEOM_DIR})
-
-   if test "x$GEOM_ROOT_DIR" == "x" ; then
-      GEOM_ROOT_DIR=${GEOM_DIR}
-   fi
-   AC_SUBST(GEOM_ROOT_DIR)
-
-else
-   AC_MSG_WARN("Cannot find compiled Geom module distribution")
-fi
-
-AC_MSG_RESULT(for Geom: $Geom_ok)
- 
-])dnl
- 
diff --git a/adm_local/unix/config_files/check_SMESH.m4 b/adm_local/unix/config_files/check_SMESH.m4
deleted file mode 100644
index 86a8264..0000000
--- a/adm_local/unix/config_files/check_SMESH.m4
+++ /dev/null
@@ -1,54 +0,0 @@
-# Check availability of SMesh binary distribution
-#
-# Author : Nicolas REJNERI (OPEN CASCADE, 2003)
-#
-
-AC_DEFUN([CHECK_SMESH],[
-
-AC_CHECKING(for SMesh)
-
-SMesh_ok=no
-
-AC_ARG_WITH(smesh,
-	    [  --with-smesh=DIR root directory path of SMESH installation ],
-	    SMESH_DIR="$withval",SMESH_DIR="")
-
-if test "x$SMESH_DIR" == "x" ; then
-
-# no --with-smesh option used
-
-   if test "x$SMESH_ROOT_DIR" != "x" ; then
-
-    # SMESH_ROOT_DIR environment variable defined
-      SMESH_DIR=$SMESH_ROOT_DIR
-
-   else
-
-    # search SMESH binaries in PATH variable
-      AC_PATH_PROG(TEMP, libSMESH_Swig.py)
-      if test "x$TEMP" != "x" ; then
-         SMESH_BIN_DIR=`dirname $TEMP`
-         SMESH_DIR=`dirname $SMESH_BIN_DIR`
-      fi
-      
-   fi
-# 
-fi
-
-if test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then
-   SMesh_ok=yes
-   AC_MSG_RESULT(Using SMesh module distribution in ${SMESH_DIR})
-
-   if test "x$SMESH_ROOT_DIR" == "x" ; then
-      SMESH_ROOT_DIR=${SMESH_DIR}
-   fi
-   AC_SUBST(SMESH_ROOT_DIR)
-
-else
-   AC_MSG_WARN("Cannot find compiled SMesh module distribution")
-fi
-
-AC_MSG_RESULT(for SMesh: $SMesh_ok)
- 
-])dnl
- 
diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 2d39b96..57049e0 100644
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -250,18 +250,31 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
 
 
 ACLOCAL_SRC = \
-ac_cxx_bool.m4                    check_corba.m4     check_vtk.m4	\
+ac_cxx_bool.m4                    check_corba.m4     			\
 ac_cxx_depend_flag.m4             check_hdf5.m4      enable_pthreads.m4	\
 ac_cxx_mutable.m4                 check_mico.m4      libtool.m4		\
 ac_cxx_namespaces.m4              check_omniorb.m4   pyembed.m4		\
-ac_cxx_partial_specialization.m4  check_opengl.m4    python.m4		\
+ac_cxx_partial_specialization.m4  python.m4				\
 ac_cxx_typename.m4                check_pthreads.m4  check_cas.m4	\
-ac_cc_warnings.m4                 check_qt.m4        check_swig.m4      \
-check_boost.m4 
+ac_cc_warnings.m4                 check_swig.m4      check_boost.m4 
+
+ACLOCAL_GUI = \
+check_vtk.m4                      check_opengl.m4    check_qt.m4	\
+check_GUI.m4                      check_corba_in_GUI.m4
+
+ACLOCAL_GEOM =                    check_GEOM.m4
+
+ACLOCAL_SMESH =                   check_SMESH.m4
 
 #ifeq (@WITHNETGEN@,yes)
 #  ACLOCAL_SRC += check_Netgen.m4
 #endif
 
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%)
-	cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+			$(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \
+			$(ACLOCAL_GEOM:%=@GEOM_ROOT_DIR@/adm_local/unix/config_files/%) \
+			$(ACLOCAL_SMESH:%=@SMESH_ROOT_DIR@/adm_local/unix/config_files/%)
+	cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
+									-I @GUI_ROOT_DIR@/adm_local/unix/config_files \
+									-I @GEOM_ROOT_DIR@/adm_local/unix/config_files \
+									-I @SMESH_ROOT_DIR@/adm_local/unix/config_files
diff --git a/build_configure b/build_configure
index 7a78b87..23f757e 100755
--- a/build_configure
+++ b/build_configure
@@ -26,6 +26,31 @@ fi
 #    echo "failed : KERNEL_SRC variable is not correct !"
 #    exit
 #fi
+
+########################################################################
+# Test if the GUI_ROOT_DIR is set correctly
+
+if test ! -d "${GUI_ROOT_DIR}"; then
+    echo "failed : GUI_ROOT_DIR variable is not correct !"
+    exit
+fi
+
+########################################################################
+# Test if the GEOM_ROOT_DIR is set correctly
+
+if test ! -d "${GEOM_ROOT_DIR}"; then
+    echo "failed : GEOM_ROOT_DIR variable is not correct !"
+    exit
+fi
+
+########################################################################
+# Test if the SMESH_ROOT_DIR is set correctly
+
+if test ! -d "${SMESH_ROOT_DIR}"; then
+    echo "failed : SMESH_ROOT_DIR variable is not correct !"
+    exit
+fi
+
 ########################################################################
 # find_in - utility function
 #
@@ -203,7 +228,10 @@ else
 	echo -n "Creating 'configure' script ...  "
 fi
 
-aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+					     -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
+					     -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \
+					     -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
 if autoconf
 then
 	echo "done"
diff --git a/configure.in.base b/configure.in.base
index fc5e427..3a29cbd 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -249,6 +249,26 @@ echo
 
 CHECK_HTML_GENERATORS
 
+echo
+echo ---------------------------------------------
+echo Testing GUI
+echo ---------------------------------------------
+echo
+
+CHECK_SALOME_GUI
+
+echo
+echo ---------------------------------------------
+echo Testing full GUI
+echo ---------------------------------------------
+echo
+
+CHECK_CORBA_IN_GUI
+if test "x${CORBA_IN_GUI}" != "xyes"; then
+  echo "failed : For configure CALCULATOR module necessary full GUI !"
+  exit
+fi
+
 echo
 echo ---------------------------------------------
 echo Testing Kernel