# install script in $(bindir) :
install-bin: $(BIN_SCRIPT)
$(INSTALL) -d $(bindir)
- $(INSTALL_PROGRAM) $^ $(bindir)
+ for f in X $(BIN_SCRIPT); do \
+ if test $$f != X; then \
+ (cp -p ./bin/$$f $(bindir) || exit 1); \
+ fi; \
+ done
uninstall: uninstall-idl
echo
echo
+dnl Modification B. Secher portage sur osf
+AC_PATH_PROG(SHELL,sh,,)
+AC_SUBST(SHELL)
+
if test -z "$AR"; then
AC_CHECK_PROGS(AR,ar xar,:,$PATH)
fi
dnl full-path to the binary instead.
case "$INSTALL" in
*install-sh*)
- INSTALL='\${top_srcdir}'/salome_adm/unix/config_files/install-sh
+ INSTALL="${ROOT_SRCDIR}/salome_adm/unix/config_files/install-sh -c"
;;
esac
dnl inutil car libtool
dnl AC_PROG_CC
AC_PROG_CXX
+AC_CXX_WARNINGS
+AC_CXX_TEMPLATE_DEPTH
AC_DEPEND_FLAG
-# AC_CC_WARNINGS([ansi])
+#AC_CC_WARNINGS([ansi])
cc_ok=yes
dnl Library libdl :
dnl add library libm :
AC_CHECK_LIB(m,ceil)
+dnl
+dnl Check if we use std iostream by default or if we must add
+dnl a compiler directive for that
+dnl
+
+AC_CXX_USE_STD_IOSTREAM
+
dnl
dnl Well we use sstream which is not in gcc pre-2.95.3
dnl We must test if it exists. If not, add it in include !
AC_CXX_HAVE_SSTREAM
+dnl
+dnl ---------------------------------------------
+dnl testing linker
+dnl ---------------------------------------------
+dnl
+
+AC_LINKER_OPTIONS
+
dnl
dnl ---------------------------------------------
dnl testing MPICH
echo Configure
variables="cc_ok mpich_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok"
+
+AC_SUBST(pyqt_ok)
for var in $variables
do
echo "conftest.o: conftest.c" > conftest.verif
echo "int main() { return 0; }" > conftest.c
+dnl Evolution portage sur CCRT/osf system
+ case $host_os in
+ osf*)
+dnl sur CCRT/osf pas d'equivalent de l'option -MG de gcc avec compilo natif
+dnl on utilise donc gnu pour generer les dependances.
+ DEPCC=gcc
+ DEPCXX=g++
+ DEPCXXFLAGS="-Wno-deprecated -funsigned-char"
+ DIFFFLAGS="-w"
+ ;;
+ *)
+ DEPCC=${CC-cc}
+ DEPCXX=${CXX-c++}
+ DEPCXXFLAGS="\${CXXFLAGS}"
+ DIFFFLAGS="-b -B"
+ ;;
+ esac
C_DEPEND_FLAG=
for ac_C_DEPEND_FLAG in -xM -MM -M ; do
rm -f conftest.d conftest.err
- ${CC-cc} ${ac_C_DEPEND_FLAG} -c conftest.c 1> conftest.d 2> conftest.err
+ ${DEPCC} ${ac_C_DEPEND_FLAG} -c conftest.c 1> conftest.d 2> conftest.err
if test -f conftest.u ; then
mv conftest.u conftest.d
fi
rm -f conftest
- diff -b -B conftest.d conftest.verif > conftest
+ diff ${DIFFFLAGS} conftest.d conftest.verif > conftest
if test ! -s conftest ; then
C_DEPEND_FLAG=${ac_C_DEPEND_FLAG}
break
dnl use gcc option -MG : asume unknown file will be construct later
rm -f conftest.d conftest.err
- ${CC-cc} ${C_DEPEND_FLAG} -MG -c conftest.c 1> conftest.d 2> conftest.err
+ ${DEPCC} ${C_DEPEND_FLAG} -MG -c conftest.c 1> conftest.d 2> conftest.err
if test -f conftest.u ; then
mv conftest.u conftest.d
fi
rm -f conftest
- diff -b -B conftest.d conftest.verif > conftest
+ diff ${DIFFFLAGS} conftest.d conftest.verif > conftest
if test ! -s conftest ; then
C_DEPEND_FLAG=${C_DEPEND_FLAG}" -MG"
fi
exit
fi
- echo -n " C : " ${C_DEPEND_FLAG}
+ printf " C : ${DEPCC} ${C_DEPEND_FLAG}"
AC_LANG_CPLUSPLUS
echo "conftest.o: conftest.cxx" > conftest.verif
for ac_CXX_DEPEND_FLAG in -xM -MM -M ; do
rm -f conftest.d conftest.err
- ${CXX-c++} ${ac_CXX_DEPEND_FLAG} -c conftest.cxx 1> conftest.d 2> conftest.err
+ ${DEPCXX} ${ac_CXX_DEPEND_FLAG} -c conftest.cxx 1> conftest.d 2> conftest.err
if test -f conftest.u ; then
mv conftest.u conftest.d
fi
rm -f conftest
- diff -b -B conftest.d conftest.verif > conftest
+ diff ${DIFFFLAGS} conftest.d conftest.verif > conftest
if test ! -s conftest ; then
CXX_DEPEND_FLAG=${ac_CXX_DEPEND_FLAG}
break
dnl use g++ option -MG : asume unknown file will be construct later
rm -f conftest.d conftest.err
- ${CXX-c++} ${CXX_DEPEND_FLAG} -MG -c conftest.cxx 1> conftest.d 2> conftest.err
+ ${DEPCXX} ${CXX_DEPEND_FLAG} -MG -c conftest.cxx 1> conftest.d 2> conftest.err
if test -f conftest.u ; then
mv conftest.u conftest.d
fi
rm -f conftest
- diff -b -B conftest.d conftest.verif > conftest
+ diff ${DIFFFLAGS} conftest.d conftest.verif > conftest
if test ! -s conftest ; then
CXX_DEPEND_FLAG=${CXX_DEPEND_FLAG}" -MG"
fi
exit
fi
- echo -n " C++ : " ${CXX_DEPEND_FLAG}
+ printf " C++ : ${DEPCXX} ${CXX_DEPEND_FLAG}"
AC_LANG_RESTORE
+ AC_SUBST(DEPCC)
+ AC_SUBST(DEPCXX)
+ AC_SUBST(DEPCXXFLAGS)
AC_SUBST(C_DEPEND_FLAG)
AC_SUBST(CXX_DEPEND_FLAG)
])
--- /dev/null
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
+dnl @synopsis AC_CXX_WARNINGS
+dnl
+dnl Check warning flags for C++ compiler to control warning messages
+dnl
+dnl @author Bernard Secher (CEA) - 04/12/2003
+dnl
+AC_DEFUN([AC_CXX_TEMPLATE_DEPTH],[
+ AC_MSG_CHECKING(c++ compiler have template-depth flag)
+ cat > conftest.cxx <<EOF
+int main(int argc, char **argv) { return 0; }
+EOF
+ fTMPDPTH_FLAG=no
+ for ac_CXX_TMPDPTH_FLAG in -ftemplate-depth-42 "-pending_instantiations 42" ; do
+ if $CXX ${ac_CXX_TMPDPTH_FLAG} conftest.cxx > /dev/null 2>&1; then
+ CXXTMPDPTHFLAGS="${ac_CXX_TMPDPTH_FLAG}"
+ AC_MSG_RESULT(${ac_CXX_TMPDPTH_FLAG})
+ fTMPDPTH_FLAG=yes
+ break
+ fi
+ done
+ if test $fTMPDPTH_FLAG = no; then
+ AC_MSG_RESULT(no)
+ fi
+ AC_SUBST(CXXTMPDPTHFLAGS)
+])
--- /dev/null
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
+dnl @synopsis AC_CXX_USE_STD_IOSTREAM
+dnl
+dnl If the C++ library use std iostream
+dnl
+dnl @author Bernard Secher (CEA) - 05/12/2003
+dnl
+AC_DEFUN([AC_CXX_USE_STD_IOSTREAM],
+[
+
+AC_MSG_CHECKING(whether the compiler use std iostream)
+
+cat > conftest.cxx <<EOF
+#include <iostream>
+int main(int argc, char **argv) {std::cout << "Hello" << std::endl; return 0;}
+EOF
+
+fUSE_STD_IOSTREAM=no
+for ac_CXX_USE_STD_IOSTREAM in "" -D__USE_STD_IOSTREAM ; do
+ if $CXX ${ac_CXX_USE_STD_IOSTREAM} conftest.cxx > /dev/null 2>&1; then
+ CXXFLAGS="$CXXFLAGS ${ac_CXX_USE_STD_IOSTREAM}"
+ if test x${ac_CXX_USE_STD_IOSTREAM} = x; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(${ac_CXX_USE_STD_IOSTREAM})
+ fi
+ fUSE_STD_IOSTREAM=yes
+ break
+ fi
+done
+if test $fUSE_STD_IOSTREAM = no; then
+ AC_MSG_RESULT(no)
+fi
+
+])
--- /dev/null
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
+dnl @synopsis AC_CXX_WARNINGS
+dnl
+dnl Check warning flags for C++ compiler to control warning messages
+dnl
+dnl @author Bernard Secher (CEA) - 04/12/2003
+dnl
+AC_DEFUN([AC_CXX_WARNINGS],[
+ AC_MSG_CHECKING(c++ compiler have no-deprecated flag)
+ cat > conftest.cxx <<EOF
+int main(int argc, char **argv) { return 0; }
+EOF
+ fNODEP_FLAG=no
+ for ac_CXX_NODEP_FLAG in -Wno-deprecated; do
+ if $CXX ${ac_CXX_NODEP_FLAG} conftest.cxx > /dev/null 2>&1; then
+ CXXFLAGS="$CXXFLAGS ${ac_CXX_NODEP_FLAG}"
+ AC_MSG_RESULT(${ac_CXX_NODEP_FLAG})
+ fNODEP_FLAG=yes
+ break
+ fi
+ done
+ if test $fNODEP_FLAG = no; then
+ AC_MSG_RESULT(no)
+ fi
+dnl
+ AC_MSG_CHECKING(c++ compiler have repository flag)
+ fREP_FLAG=no
+ for ac_CXX_REP_FLAG in "-ptr ${ROOT_BUILDDIR}/cxx_repository"; do
+ if $CXX ${ac_CXX_REP_FLAG} conftest.cxx > /dev/null 2>&1; then
+ CXXFLAGS="$CXXFLAGS ${ac_CXX_REP_FLAG}"
+ AC_MSG_RESULT(${ac_CXX_REP_FLAG})
+ fREP_FLAG=yes
+ break
+ fi
+ done
+ if test $fREP_FLAG = no; then
+ AC_MSG_RESULT(no)
+ fi
+])
--- /dev/null
+dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
+dnl @synopsis AC_LINKER_OPTIONS
+dnl
+dnl Check warning flags for C++ compiler to control warning messages
+dnl
+dnl @author Bernard Secher (CEA) - 04/12/2003
+dnl
+AC_DEFUN([AC_LINKER_OPTIONS],[
+ AC_MSG_CHECKING(loader have export dynamic option)
+ cat > conftest.cxx <<EOF
+int main(int argc, char **argv) { return 0; }
+EOF
+ fEXPDYN_FLAG=no
+ for ac_LD_EXPDYN_FLAG in "-Xlinker -export-dynamic" -transitive_link; do
+ if $CXX ${ac_LD_EXPDYN_FLAG} conftest.cxx > /dev/null 2>&1; then
+ LDEXPDYNFLAGS="${ac_LD_EXPDYN_FLAG}"
+ AC_MSG_RESULT(${ac_LD_EXPDYN_FLAG})
+ fEXPDYN_FLAG=yes
+ break
+ fi
+ done
+ if test $fEXPDYN_FLAG = no; then
+ AC_MSG_RESULT(no)
+ fi
+ AC_SUBST(LDEXPDYNFLAGS)
+dnl
+ case $host_os in
+ osf*)
+ STDLIB="-lcxxstd"
+ ;;
+ *)
+ STDLIB="-lstdc++"
+ ;;
+ esac
+ AC_SUBST(STDLIB)
+])
AC_SUBST(CAS_OCAF)
AC_SUBST(CAS_DATAEXCHANGE)
AC_SUBST(CAS_LDFLAGS)
+AC_SUBST(CAS_LDPATH)
CAS_CPPFLAGS=""
CAS_CXXFLAGS=""
irix6.*)
casdir=Linux
;;
- osf4.*)
+ osf*)
casdir=Linux
;;
solaris2.*)
;;
esac
+AC_MSG_CHECKING(for OpenCascade directories)
+if test -d ${CASROOT}/${casdir}/lib; then
+ CAS_LDPATH="-L$CASROOT/$casdir/lib "
+ AC_MSG_RESULT(yes)
+else
+ if test -d ${CASROOT}/lib; then
+ CAS_LDPATH="-L$CASROOT/lib "
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+fi
+
+
dnl were is OCC ?
if test -z $CASROOT; then
AC_MSG_WARN(You must provide CASROOT variable : see OCC installation manual)
else
occ_ok=yes
+ OCC_VERSION_MAJOR=0
+ ff=$CASROOT/inc/Standard_Version.hxx
+ if test -f $ff ; then
+ grep "define OCC_VERSION_MAJOR" $ff > /dev/null
+ if test $? = 0 ; then
+ OCC_VERSION_MAJOR=`grep "define OCC_VERSION_MAJOR" $ff | awk '{i=3 ; print $i}'`
+ fi
+ fi
fi
if test "x$occ_ok" = "xyes"; then
+dnl test c++ compiler flag for unsigned character
+ AC_MSG_CHECKING(c++ compiler have unsigned character flag)
+ cat > conftest.cxx <<EOF
+int main(int argc, char **argv) { return 0; }
+EOF
+ fUCHAR_FLAG=no
+ for ac_CXX_UCHAR_FLAG in -funsigned-char -unsigned ; do
+ if $CXX ${ac_CXX_UCHAR_FLAG} conftest.cxx > /dev/null 2>&1; then
+ CXXFLAGS="$CXXFLAGS ${ac_CXX_UCHAR_FLAG}"
+ AC_MSG_RESULT(${ac_CXX_UCHAR_FLAG})
+ fUCHAR_FLAG=yes
+ break
+ fi
+ done
+ if test $fUCHAR_FLAG = no; then
+ AC_MSG_RESULT(no)
+ fi
+
dnl cascade headers
CPPFLAGS_old="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -I$CASROOT/inc -Wno-deprecated"
- CXXFLAGS_old="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -funsigned-char"
+ CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -I$CASROOT/inc"
+ CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS"
AC_CHECK_HEADER(Standard_Type.hxx,occ_ok=yes ,occ_ok=no)
- CPPFLAGS="$CPPFLAGS_old"
- CXXFLAGS="$CXXFLAGS_old"
fi
if test "x$occ_ok" = xyes ; then
- CAS_CPPFLAGS="-DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -I$CASROOT/inc"
- CAS_CXXFLAGS="-funsigned-char"
-
AC_MSG_CHECKING(for OpenCascade libraries)
- CPPFLAGS_old="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS -Wno-deprecated"
- CXXFLAGS_old="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $CAS_CXXFLAGS"
LIBS_old="$LIBS"
- LIBS="$LIBS -L$CASROOT/$casdir/lib -lTKernel"
+ LIBS="$LIBS $CAS_LDPATH -lTKernel"
AC_CACHE_VAL(salome_cv_lib_occ,[
AC_TRY_LINK(
])
occ_ok="$salome_cv_lib_occ"
- CPPFLAGS="$CPPFLAGS_old"
- CXXFLAGS="$CXXFLAGS_old"
- LIBS="$LIBS_old"
fi
+CPPFLAGS="$CPPFLAGS_old"
+LIBS="$LIBS_old"
if test "x$occ_ok" = xno ; then
AC_MSG_RESULT(no)
AC_MSG_WARN(Opencascade libraries not found)
else
AC_MSG_RESULT(yes)
- CAS_KERNEL="-L$CASROOT/$casdir/lib -lTKernel -lTKMath"
- CAS_OCAF="-L$CASROOT/$casdir/lib -lPTKernel -lTKCAF -lFWOSPlugin -lTKPShape -lTKPCAF -lTKStdSchema -lTKShapeSchema -lPAppStdPlugin -lTKPAppStd -lTKCDF"
-dnl CAS_VIEWER="-L$CASROOT/$casdir/lib -lTKOpenGl -lTKV3d -lTKV2d -lTKService"
- CAS_VIEWER="-L$CASROOT/$casdir/lib -lTKOpenGl -lTKV3d -lTKService"
-# CAS_MODELER="-L$CASROOT/$casdir/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBool -lTKHLR -lTKFillet -lTKFeat -lTKOffset"
- CAS_MODELER="-L$CASROOT/$casdir/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBool -lTKHLR -lTKFillet -lTKOffset"
-dnl CAS_DATAEXCHANGE="-L$CASROOT/$casdir/lib -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing -lTKShHealingStd -lTKSTL -lTKVRML "
- CAS_DATAEXCHANGE="-L$CASROOT/$casdir/lib -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing -lTKShHealingStd"
- CAS_LDFLAGS="$CAS_KERNEL $CAS_OCAF $CAS_VIEWER $CAS_MODELER $CAS_DATAEXCHANGE"
+ CAS_KERNEL="$CAS_LDPATH -lTKernel -lTKMath"
+
+ # E.A. compatibility version 4 and 5.x
+ CAS_OCAF="$CAS_LDPATH -lPTKernel -lTKCAF -lFWOSPlugin -lTKPShape -lTKPCAF -lTKStdSchema -lTKShapeSchema -lPAppStdPlugin"
+ if test $OCC_VERSION_MAJOR < 5 ; then
+ CAS_OCAF="$CAS_OCAF -lTKPAppStd"
+ fi
+ CAS_OCAF="$CAS_OCAF -lTKCDF"
+
+ CAS_VIEWER="$CAS_LDPATH -lTKOpenGl -lTKV3d -lTKService"
+ CAS_MODELER="$CAS_LDPATH -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBool -lTKHLR -lTKFillet -lTKOffset"
+
+ # E.A. compatibility version 4 and 5.x
+ CAS_DATAEXCHANGE="$CAS_LDPATH -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing"
+ if test $OCC_VERSION_MAJOR < 5 ; then
+ CAS_DATAEXCHANGE="$CAS_DATAEXCHANGE -lTKShHealingStd"
+ fi
+
+
+ CAS_LDFLAGS="$CAS_KERNEL $CAS_OCAF $CAS_VIEWER $CAS_MODELER $CAS_DATAEXCHANGE"
fi
if test "x$DOXYGEN" = "x"
then
doxygen_ok=no
- AC_MSG_RESULT(no)
AC_MSG_WARN(doxygen not found)
-else
- dnl AC_SUBST(DOXYGEN)
- AC_MSG_RESULT(yes)
fi
AC_CHECKING(for graphviz)
if test "x$DOT" = "x" ; then
graphviz_ok=no
- AC_MSG_RESULT(no)
AC_MSG_WARN(graphviz not found)
-else
- AC_MSG_RESULT(yes)
fi
])dnl
dnl ----------------------------------------------------------------
dnl CHECK_PTHREADS
AC_DEFUN(CHECK_PTHREADS,[
-AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
-AC_CHECK_HEADER(pthread.h,AC_DEFINE(HAVE_PTHREAD_H))
-AC_CHECK_LIB(posix4,nanosleep, LIBS_PTHREADS="-lposix4",LIBS_PTHREADS="")
-AC_CHECK_LIB(pthread,pthread_mutex_lock,
- LIBS_PTHREADS="-lpthread $LIBS_PTHREADS")
-AC_MSG_CHECKING([parameters for using pthreads])
-case $build_os in
- freebsd*)
- CFLAGS_PTHREADS="-pthread"
- CXXFLAGS_PTHREADS="-pthread"
- ;;
- *)
- ;;
-esac
-AC_MSG_RESULT(["flags: $CFLAGS_PTHREADS\;libs: $LIBS_PTHREADS"])
-threads_ok=yes
+AC_MSG_CHECKING(flags for using pthreads)
+cat > conftest.cxx <<EOF
+int main(int argc, char **argv) { return 0; }
+EOF
+fPTH_FLAG=no
+for ac_CXX_PTH_FLAG in -pthread ; do
+ if $CXX ${ac_CXX_PTH_FLAG} conftest.cxx > /dev/null 2>&1; then
+ CPPFLAGS="$CPPFLAGS ${ac_CXX_PTH_FLAG}"
+ fPTH_FLAG=yes
+ AC_MSG_RESULT($ac_CXX_PTH_FLAG)
+ break
+ fi
+done
+
+if test $fPTH_FLAG = no; then
+ AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
+ AC_CHECK_HEADER(pthread.h,AC_DEFINE(HAVE_PTHREAD_H))
+ AC_CHECK_LIB(posix4,nanosleep, LIBS_PTHREADS="-lposix4",LIBS_PTHREADS="")
+ AC_CHECK_LIB(pthread,pthread_mutex_lock,
+ LIBS_PTHREADS="-lpthread $LIBS_PTHREADS",LIBS_PTHREADS="")
+fi
+
+if test $fPTH_FLAG = no && x$LIBS_PTHREADS = x; then
+ threads_ok=no
+else
+ threads_ok=yes
+fi
])dnl
dnl
dnl
AC_SUBST(PYQT_INCLUDES)
AC_SUBST(PYQT_LIBS)
AC_SUBST(PYQT_SIPS)
- AC_MSG_RESULT(yes)
else
pyqt_ok=yes
AC_CHECK_FILES("$PYQTDIR/qt.py","$PYQTDIR/qt/qt.py",pyqt_ok=yes,pyqt_ok=no)
if test "x$pyqt_ok" = xno ; then
- AC_MSG_RESULT(no)
AC_MSG_WARN(pyqt not found)
else
AC_CHECK_FILE("$PYQTDIR/libqtcmodule.so",pyqt_ok=yes,pyqt_ok=no)
if test "x$pyqt_ok" = xno ; then
- AC_MSG_RESULT(no)
AC_MSG_WARN(pyqt not found)
else
PYQT_ROOT=$PYQTDIR
fi
AC_CHECK_FILE("$PYQT_SIPS/copying.sip",pyqt_ok=yes,pyqt_ok=no)
if test "x$pyqt_ok" = xno ; then
- AC_MSG_RESULT(no)
AC_MSG_WARN(pyqt not found)
else
PYQT_INCLUDES="-I$PYQT_SIPS"
AC_SUBST(PYQT_INCLUDES)
AC_SUBST(PYQT_LIBS)
- AC_MSG_RESULT(yes)
fi
PYQT_ROOT=$PYQTDIR
AC_SUBST(PYQT_SIPS)
AC_SUBST(PYQT_LIBS)
-
-
-AC_MSG_RESULT(for pyqt: $pyqt_ok)
-
fi
])dnl
dnl
if test "x$qt_ok" = "xyes"
then
- AC_MSG_CHECKING(include of qt headers)
CPPFLAGS_old=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
if test "x$qt_ok" = "xno"
then
- AC_MSG_RESULT(qt headers not found, or too old qt version, in $QTDIR/include)
- AC_MSG_RESULT(QTDIR environment variable may be wrong)
+ AC_MSG_WARN(qt headers not found, or too old qt version, in $QTDIR/include)
+ AC_MSG_WARN(QTDIR environment variable may be wrong)
else
- AC_MSG_RESULT(yes)
- QT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT"
+ QT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT"
QT_MT_INCLUDES="-I${QT_ROOT}/include -DQT_THREAD_SUPPORT"
fi
fi
AC_MSG_WARN(vtk needs OpenGL correct configuration, check configure output)
fi
+if test "x$x_libraries" != "x"
+then
+ LXLIB="-L$x_libraries"
+else
+ LXLIB=""
+fi
LOCAL_INCLUDES="$OGL_INCLUDES"
-LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid $OGL_LIBS -L$x_libraries -lX11 -lXt"
-TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS -L$x_libraries -lX11 -lXt"
+LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid $OGL_LIBS $LXLIB -lX11 -lXt"
+TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS $LXLIB -lX11 -lXt"
if test -z $VTKHOME
then
dnl vtk headers
CPPFLAGS_old="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES -Wno-deprecated"
+CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES"
AC_CHECK_HEADER(vtkPlane.h,vtk_ok="yes",vtk_ok="no")
# LIBS="$LIBS $TRY_LINK_LIBS"
LIBS="$LIBS $LOCAL_LIBS"
CPPFLAGS_old="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $VTK_INCLUDES -Wno-deprecated"
+ CPPFLAGS="$CPPFLAGS $VTK_INCLUDES"
dnl VTKPY_MODULES="$VTKHOME/python"
if test "X$enable_production" = "Xyes"; then
CFLAGS="$CFLAGS -O"
- CXXFLAGS="$CXXFLAGS -O -Wno-deprecated "
+ CXXFLAGS="$CXXFLAGS -O "
fi
])
if test "X$enable_debug" = "Xyes"; then
CFLAGS="$CFLAGS -g -D_DEBUG_ "
- CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ -Wno-deprecated "
+ CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ "
fi
])
AC_MSG_CHECKING([if we need libdb])
PY_NEEDOPENDB=`nm $PYTHON_LIBA | grep dbopen | grep U`
if test "x$PY_NEEDOPENDB" != "x"; then
- PYTHON_LIBS="$PYTHON_LIBS -ldb"
AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(db,dbopen,PYTHON_LIBS="$PYTHON_LIBS -ldb",db_ok=no)
else
AC_MSG_RESULT(no)
fi
AC_MSG_CHECKING([if we need libdl])
PY_NEEDOPENDL=`nm $PYTHON_LIBA | grep dlopen | grep U`
if test "x$PY_NEEDOPENDL" != "x"; then
- PYTHON_LIBS="$PYTHON_LIBS -ldl"
AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(dl,dlopen,PYTHON_LIBS="$PYTHON_LIBS -ldl",dl_ok=no)
else
AC_MSG_RESULT(no)
fi
AC_MSG_CHECKING([if we need libutil])
PY_NEEDOPENPTY=`nm $PYTHON_LIBA | grep openpty | grep U`
if test "x$PY_NEEDOPENPTY" != "x"; then
- PYTHON_LIBS="$PYTHON_LIBS -lutil"
AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(util,openpty,PYTHON_LIBS="$PYTHON_LIBS -lutil",openpty_ok=no)
else
AC_MSG_RESULT(no)
fi
AC_MSG_CHECKING([if we need tcltk])
PY_NEEDTCLTK=`nm $PYTHON_LIBA | grep Tcl_Init | grep U`
if test "x$PY_NEEDTCLTK" != "x"; then
- PYTHON_LIBS="$PYTHON_LIBS -ltcl -ltk"
AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(tcl,Tcl_Init,PYTHON_LIBS="$PYTHON_LIBS -ltcl -ltk",tclinit_ok=no)
else
AC_MSG_RESULT(no)
fi
echo Building dependencies for $$dep; \
obj=`basename $$dep .c`.lo; \
sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \
- $(CC) $(C_DEPEND_FLAG) $(CPPFLAGS) $$dep 2>/dev/null | \
+ $(DEPCC) $(C_DEPEND_FLAG) $(CPPFLAGS) $$dep 2>/dev/null | \
sed 's% $(srcdir)/% $$(srcdir)/%g' | \
sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' | \
sed 's% $(top_builddir)/% $$(top_builddir)/%g' | \
echo Building dependencies for $$dep; \
obj=`basename $$dep .cc`.lo; \
sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \
- $(CXX) $(CXX_DEPEND_FLAG) $(CXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \
+ $(DEPCXX) $(CXX_DEPEND_FLAG) $(DEPCXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \
sed 's% $(srcdir)/% $$(srcdir)/%g' | \
sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' | \
sed 's% $(top_builddir)/% $$(top_builddir)/%g' | \
echo Building dependencies for $$dep; \
obj=`basename $$dep .cxx`.lo; \
sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \
- $(CXX) $(CXX_DEPEND_FLAG) $(CXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \
+ $(DEPCXX) $(CXX_DEPEND_FLAG) $(DEPCXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \
sed 's% $(srcdir)/% $$(srcdir)/%g' | \
sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' | \
sed 's% $(top_builddir)/% $$(top_builddir)/%g' | \
inc_builddir=$(top_builddir)/include/salome
@SET_MAKE@
-SHELL=/bin/sh
+# Modifcation B. Secher portage sur osf
+SHELL=@SHELL@
# header missing
LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
+# LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
+LDFLAGS= @LDFLAGS@ -L$(top_builddir)/lib/salome
# add libstdc++ to link c++ library with libtool !
-LDFLAGS+= -lstdc++
+LDFLAGS+= @STDLIB@
CP=@CP@
CC = @CC@
CFLAGS = @CFLAGS@
+DEPCC = @DEPCC@
C_DEPEND_FLAG = @C_DEPEND_FLAG@
# C++
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
+DEPCXX = @DEPCXX@
+DEPCXXFLAGS = @DEPCXXFLAGS@
CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
# JAVA
ln -sf $(CURDIR)/$< $@
$(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ)
- $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS)
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGS) $(LIBS)
# copy python scripts in $(top_builddir)/bin/salome
#
// Module : SALOME
// $Header$
-using namespace std;
#include "SALOME_Component_i.hxx"
#include "RegistryConnexion.hxx"
#include "OpUtil.hxx"
#include <stdio.h>
#include <dlfcn.h>
#include "utilities.h"
+using namespace std;
extern bool _Sleeping ;
return CORBA::string_dup( _nodeName.c_str() ) ;
}
-bool Killer( int ThreadId , int signum ) {
+bool Killer( pthread_t ThreadId , int signum ) {
if ( ThreadId ) {
if ( signum == 0 ) {
if ( pthread_cancel( ThreadId ) ) {
#include <sys/resource.h>
#include <unistd.h>
-long Engines_Component_i::CpuUsed_impl() {
+CORBA::Long Engines_Component_i::CpuUsed_impl() {
struct rusage usage ;
long cpu ;
if ( getrusage( RUSAGE_SELF , &usage ) == -1 ) {
// Module : SALOME
// $Header$
-using namespace std;
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SALOME_Component)
#include "SALOME_Container_i.hxx"
#include <unistd.h>
#include "utilities.h"
+using namespace std;
bool _Sleeping = false ;
LDFLAGS+= -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification -lSalomeLoggerServer
-LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)
+LIBS += @LDEXPDYNFLAGS@ $(PYTHON_LIBS)
@CONCLUDE@
bool Stop_impl();
bool Suspend_impl();
bool Resume_impl();
- long CpuUsed_impl() ;
+ CORBA::Long CpuUsed_impl() ;
protected:
string _instanceName ;
// Module : SALOME
// $Header$
-using namespace std;
-using namespace std;
#include <stdio.h>
# include "Utils_ORB_INIT.hxx"
#include <iostream>
#include <string>
#include "utilities.h"
+using namespace std;
//#define CHECKTIME
#ifdef CHECKTIME
protected:
SALOME_NamingService *_NS ;
- string _library_path;
- string _containerName;
+ std::string _library_path;
+ std::string _containerName;
CORBA::ORB_var _orb;
PortableServer::POA_var _poa;
PortableServer::ObjectId * _id ;
int _numInstance ;
- map<string, void *> handle_map ;
- map<string, void *> remove_map ;
+ std::map<std::string, void *> handle_map ;
+ std::map<std::string, void *> remove_map ;
omni_mutex _numInstanceMutex ; // if several threads on the same object
//private:
// File : SALOME_DataTypeCatalog_Client.cxx
// Module : SALOME
-using namespace std;
/* $Header$ */
-#include <iostream.h>
+#include <iostream>
#include "SALOME_NamingService.hxx"
#include "SALOME_DataTypeCatalog.hh"
#include <string>
#include "utilities.h"
+using namespace std;
int main(int argc,char **argv)
{
// Module : SALOME
// $Header$
-using namespace std;
#define WRITE_CATA_DATA_TYPE
#include "SALOME_DataTypeCatalog_Handler.hxx"
+using namespace std;
//----------------------------------------------------------------------
// Function : SALOME_DataTypeCatalog_Handler
// Module : SALOME
// $Header$
-using namespace std;
-#include <iostream.h>
+#include <iostream>
#include "SALOME_NamingService.hxx"
#include "SALOME_DataTypeCatalog_impl.hxx"
#include "utilities.h"
+using namespace std;
int main(int argc,char **argv)
{
// Module : SALOME
// $Header$
-using namespace std;
#include "SALOME_DataTypeCatalog_impl.hxx"
#include <fstream>
+using namespace std;
//----------------------------------------------------------------------
// Function : SALOME_DataTypeCatalogImpl
-using namespace std;
// File : SALOMEDS_Tool.cxx
// Created : Mon Oct 21 16:24:34 2002
// Author : Sergey RUIN
#include <string.h>
#include <fcntl.h>
#include <stdio.h>
+using namespace std;
bool CreateAttributeFromASCII(HDFinternalObject *father, FILE* fp);
bool CreateDatasetFromASCII(HDFcontainerObject *father, FILE *fp);
// File : HDFattribute.cc
// Module : SALOME
-using namespace std;
extern "C"
{
#include "hdfi.h"
#include "HDFexception.hxx"
#include "HDFattribute.hxx"
#include "HDFinternalObject.hxx"
+using namespace std;
HDFattribute::HDFattribute(char *name,HDFinternalObject *father,hdf_type type, size_t size)
: HDFobject(name)
size_t HDFattribute::GetSize()
{
+ int size;
if(_size == 0) {
- if((_size = HDFattrGetSize(_id)) < 0)
+ if((size = HDFattrGetSize(_id)) < 0)
throw HDFexception("Can't determine the size of data in the attribute");
+ else
+ _size = size;
}
return _size;
}
// File : HDFcontainerObject.cc
// Module : SALOME
-using namespace std;
extern "C"
{
#include "hdfi.h"
#include "HDFcontainerObject.hxx"
#include "HDFexception.hxx"
#include "utilities.h"
+using namespace std;
HDFcontainerObject::HDFcontainerObject(char *name)
: HDFinternalObject(name)
// File : HDFconvert.cc
// Module : SALOME
-using namespace std;
#include "HDFconvert.hxx"
+using namespace std;
int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_container, const string& nomdataset)
{
#endif
// Creation du Dataset utilisateur
- hdf_dataset = new HDFdataset::HDFdataset( (char *) nomdataset.c_str(), /*discard const */
- (HDFcontainerObject*) &hdf_container, /*discard const, pas de constructeur par référence */
- HDF_STRING,
- &length_long,1);
+ hdf_dataset = new HDFdataset( (char *) nomdataset.c_str(), /*discard const */
+ (HDFcontainerObject*) &hdf_container, /*discard const, pas de constructeur par référence */
+ HDF_STRING,
+ &length_long,1);
// Cree le Dataset sur le disk
hdf_dataset->CreateOnDisk();
perror("HDFConvert::FromAscii");
return -1;
};
+
+ return 0;
};
public:
-static int FromAscii(const string& file, const HDFcontainerObject& hdf_container, const string& nomdataset);
+static int FromAscii(const std::string& file, const HDFcontainerObject& hdf_container, const std::string& nomdataset);
};
// File : HDFdataset.cc
// Module : SALOME
-using namespace std;
extern "C"
{
#include "hdfi.h"
-#include <string.h>
}
+#include <string>
#include "HDFdataset.hxx"
#include "HDFcontainerObject.hxx"
#include "HDFexception.hxx"
-#include <iostream.h>
+#include <iostream>
+using namespace std;
herr_t dataset_attr(hid_t loc_id, const char *attr_name, void *operator_data)
{
else
ndim = _ndim;
_dim = new hdf_size[ndim];
- if ((ret == HDFdatasetGetDim(_id,_dim)) < 0)
+ if ((ret = HDFdatasetGetDim(_id,_dim)) < 0)
throw HDFexception("Can't determine the size dimensions of the dataset ");
}
{
public :
HDFexception(const char *message) {
- cerr << message << endl;
+ std::cerr << message << std::endl;
}
};
// File : HDFexplorer.cc
// Module : SALOME
-using namespace std;
#include "HDFcontainerObject.hxx"
#include "HDFexception.hxx"
#include "HDFinternalObject.hxx"
#include "HDFexplorer.hxx"
+using namespace std;
HDFexplorer::HDFexplorer(HDFcontainerObject *container)
{
// File : HDFfile.cc
// Module : SALOME
-using namespace std;
extern "C"
{
#include "hdfi.h"
#include <unistd.h>
-#include <string.h>
}
-#include <iostream.h>
+#include <string>
+#include <iostream>
#include "HDFfile.hxx"
#include "HDFexception.hxx"
+using namespace std;
herr_t file_attr(hid_t loc_id, const char *attr_name, void *operator_data)
{
// File : HDFgroup.cc
// Module : SALOME
-using namespace std;
extern "C"
{
#include "hdfi.h"
-#include <string.h>
}
+#include <string>
#include "HDFgroup.hxx"
#include "HDFexception.hxx"
+using namespace std;
herr_t group_attr(hid_t loc_id, const char *attr_name, void *operator_data)
{
// File : HDFinternalObject.cc
// Module : SALOME
-using namespace std;
extern "C"
{
#include "hdfi.h"
}
#include "HDFinternalObject.hxx"
+using namespace std;
HDFinternalObject::HDFinternalObject(char *name)
: HDFobject(name)
// File : HDFobject.cc
// Module : SALOME
-using namespace std;
#include "HDFobject.hxx"
extern "C"
{
#include "hdfi.h"
-#include <string.h>
}
+#include <string>
#include "utilities.h"
+using namespace std;
HDFobject::HDFobject(char *name)
{
// Module : SALOME
// $Header$
-using namespace std;
#include <iostream>
#include <fstream>
#include <sstream>
#include <iomanip>
+using namespace std;
#include "OpUtil.hxx"
#include "utilities.h"
// Module : SALOME
// $Header$
-using namespace std;
#include "utilities.h"
#include <iostream>
#include <unistd.h>
#include "SALOME_NamingService.hxx"
#include "SALOME_LifeCycleCORBA.hxx"
#include <OpUtil.hxx>
+using namespace std;
int main (int argc, char * argv[])
{
// Module : SALOME
// $Header$
-using namespace std;
#include "InquireServersQThread.h"
#include <qlabel.h>
#include "SALOME_NamingService.hxx"
#include "utilities.h"
#include "OpUtil.hxx"
+using namespace std;
#include CORBA_CLIENT_HEADER(SALOME_Session)
#include CORBA_CLIENT_HEADER(SALOME_Registry)
int InquireServersGUI::getExitStatus()
{
myThread->getExitStatus();
+ return 0;
}
InquireServersQThread::InquireServersQThread( InquireServersGUI* r )
// Module : SALOME
// $Header$
-using namespace std;
/*! \file SALOME_Session_loader.cxx
*/
#include "Utils_SINGLETON.hxx"
#include "SALOME_NamingService.hxx"
#include "utilities.h"
+using namespace std;
//! CORBA client for SALOME Session server : launch GUI
/*!
// Author : Vasily Rusyaev
// Module : SALOME
-using namespace std;
#include <iostream>
+using namespace std;
+
#include "SALOME_Logger_Server.hxx"
omni_mutex Logger::myLock;
// Author : Vasily Rusyaev
// Module : SALOME
-using namespace std;
-#include "SALOME_Trace.hxx"
#include <memory.h>
#include <string>
-//#include <stdio.h>
#include <stdlib.h>
#include <iostream>
+#include "SALOME_Trace.hxx"
+
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
# endif /* WNT */
+#include <strstream.h>
using namespace std;
-#include <strstream.h>
#include "Logger.hh"
class SALOME_Trace : public ostrstream
// File : msg2qm.cxx
// Module : SALOME
-using namespace std;
/****************************************************************************
** $Id$
**
#include <stdio.h>
#include <stdlib.h>
+using namespace std;
static QString* defaultScope = 0;
RessourcesCatalog Notification NOTIFICATION_SWIG Container TestContainer LifeCycleCORBA \
HDFPersist OBJECT TOOLSDS SALOMEDS SALOMEGUI Plot2d VTKViewer OCCViewer SUPERVGraph Session \
SALOME_SWIG TOOLSGUI SALOME_PY RegistryDisplay ModuleGenerator \
- SALOME_PYQT Loader
+ Loader
+ifeq (@pyqt_ok@,yes)
+ SUBDIRS+= SALOME_PYQT
+endif
ifeq (@WITHMPICH@,yes)
SUBDIRS+= MPIContainer MPILifeCycleCORBA TestMPIContainer
endif
BIN_SERVER_IDL = SALOME_ModuleCatalog.idl
CPPFLAGS+= $(QT_MT_INCLUDES)
-CXXFLAGS+= -ftemplate-depth-42
+CXXFLAGS+= @CXXTMPDPTHFLAGS@
LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lOpUtil -lSalomeLoggerServer
@CONCLUDE@
// Module : SALOME
// $Header$
-using namespace std;
#include "SALOME_ModuleCatalog_Acomponent_impl.hxx"
+using namespace std;
//----------------------------------------------------------------------
// Function : SALOME_ModuleCatalog_AcomponentImpl
// File : SALOME_ModuleCatalog_Client.cxx
// Module : SALOME
-using namespace std;
/* $Header$ */
#include <iostream.h>
#include "SALOME_ModuleCatalog.hh"
#include <string>
#include "utilities.h"
+using namespace std;
int main(int argc,char **argv)
{
// Module : SALOME
// $Header$
-using namespace std;
#define WRITE_CATA_COMPONENT
#include "SALOME_ModuleCatalog_Handler.hxx"
+using namespace std;
//----------------------------------------------------------------------
// Function : SALOME_ModuleCatalog_Handler
// File : SALOME_ModuleCatalog_Server.cxx
// Module : SALOME
-using namespace std;
/* $Header$ */
-#include <iostream.h>
+#include <iostream>
#include "SALOME_NamingService.hxx"
#include "SALOME_ModuleCatalog_impl.hxx"
#include "utilities.h"
+using namespace std;
//#define CHECKTIME
#ifdef CHECKTIME
// Module : SALOME
// $Header$
-using namespace std;
#include "SALOME_ModuleCatalog_impl.hxx"
#include "SALOME_ModuleCatalog_Acomponent_impl.hxx"
#include <fstream>
#include <qstringlist.h>
#include <qfileinfo.h>
+using namespace std;
static const char* SEPARATOR = ":";
// Author : Francis KLOSS
// Module : SALOME
-using namespace std;
#include "NOTIFICATION_Swig.hxx"
+using namespace std;
// Swig notification supplier
// --------------------------
// Author : Francis KLOSS
// Module : SALOME
-using namespace std;
#include "NOTIFICATION.hxx"
+using namespace std;
class NOTIFICATION_Supplier_Swig {
public:
// Module : SALOME
// $Header$
-using namespace std;
#include "SALOME_NamingService.hxx"
#include "ServiceUnreachable.hxx"
#include <iostream>
#include <cstring>
+using namespace std;
//----------------------------------------------------------------------
/*! Function : SALOME_NamingService
// File : ServiceUnreachable.cxx
// Module : SALOME
-using namespace std;
#include "ServiceUnreachable.hxx"
ServiceUnreachable::ServiceUnreachable( void ): SALOME_Exception( "ServiceUnreachable" )
