From 7478f0878fcdf80f0a72d0ed7427ece0a6434329 Mon Sep 17 00:00:00 2001 From: Renaud Barate Date: Fri, 13 Sep 2013 11:14:12 +0200 Subject: [PATCH] Reuse KERNEL macros for prerequisites detection Fix compilation on Ubuntu 13.04 with system Python --- Makefile.am | 3 +- adm_local/ac_cxx_option.m4 | 44 ----- adm_local/ac_linker_options.m4 | 55 ------ adm_local/acx_pthread.m4 | 226 ---------------------- adm_local/check_Kernel.m4 | 86 --------- adm_local/check_aster.m4 | 50 ----- adm_local/check_boost.m4 | 175 ----------------- adm_local/check_f77.m4 | 28 --- adm_local/check_lam.m4 | 130 ------------- adm_local/check_mpi.m4 | 130 ------------- adm_local/check_mpich.m4 | 75 -------- adm_local/check_omniorb.m4 | 336 --------------------------------- adm_local/check_openmpi.m4 | 67 ------- adm_local/check_paco++.m4 | 63 ------- adm_local/check_sphinx.m4 | 55 ------ adm_local/enable_pthreads.m4 | 42 ----- adm_local/production.m4 | 101 ---------- adm_local/python.m4 | 171 ----------------- autogen.sh | 13 +- 19 files changed, 13 insertions(+), 1837 deletions(-) delete mode 100644 adm_local/ac_cxx_option.m4 delete mode 100644 adm_local/ac_linker_options.m4 delete mode 100644 adm_local/acx_pthread.m4 delete mode 100644 adm_local/check_Kernel.m4 delete mode 100644 adm_local/check_aster.m4 delete mode 100644 adm_local/check_boost.m4 delete mode 100644 adm_local/check_f77.m4 delete mode 100644 adm_local/check_lam.m4 delete mode 100644 adm_local/check_mpi.m4 delete mode 100644 adm_local/check_mpich.m4 delete mode 100644 adm_local/check_omniorb.m4 delete mode 100644 adm_local/check_openmpi.m4 delete mode 100644 adm_local/check_paco++.m4 delete mode 100644 adm_local/check_sphinx.m4 delete mode 100644 adm_local/enable_pthreads.m4 delete mode 100644 adm_local/production.m4 delete mode 100644 adm_local/python.m4 diff --git a/Makefile.am b/Makefile.am index e974086..a334318 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,6 +36,7 @@ if SPHINX_IS_OK SUBDIRS += doc endif -ACLOCAL_AMFLAGS = -I adm_local +ACLOCAL_AMFLAGS = -I adm_local \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files EXTRA_DIST = autogen.sh diff --git a/adm_local/ac_cxx_option.m4 b/adm_local/ac_cxx_option.m4 deleted file mode 100644 index 77b7ffd..0000000 --- a/adm_local/ac_cxx_option.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -dnl @synopsis AC_CXX_OPTION(-option,variable where we add option if ok,action if ok; action if not ok) -dnl Check options for C++ compiler -dnl @author Bernard Secher - 15/01/2004 -dnl -AC_DEFUN([AC_CXX_OPTION], [ - AC_MSG_CHECKING(wether $CXX accepts $1) - cat > conftest.cxx < conftest.log 2>&1 - var=`echo $1 | sed -e "s, .*$,," | sed -e "s,^-,,"` -#CCRT if ! grep -e $var conftest.log > /dev/null 2>&1 ; then - if grep -e $var conftest.log > /dev/null 2>&1 ; then - AC_MSG_RESULT(no) - eval $4 - else - AC_MSG_RESULT(yes) - $2="${$2} $1" - eval $3 - fi -]) - - diff --git a/adm_local/ac_linker_options.m4 b/adm_local/ac_linker_options.m4 deleted file mode 100644 index 580b38b..0000000 --- a/adm_local/ac_linker_options.m4 +++ /dev/null @@ -1,55 +0,0 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -dnl @synopsis AC_LINKER_OPTIONS -dnl Check warning flags for C++ compiler to control warning messages -dnl -AC_DEFUN([AC_LINKER_OPTIONS],[ - - AC_CHECKING(for LIB_LOCATION_SUFFIX) - LIB_LOCATION_SUFFIX="" - AC_SUBST(LIB_LOCATION_SUFFIX) - AC_MSG_RESULT(LIB_LOCATION_SUFFIX is $LIB_LOCATION_SUFFIX) - - for opt in "-Xlinker -export-dynamic" -transitive_link; do - AC_CXX_OPTION($opt,LDEXPDYNFLAGS,flag=yes,flag=no) - if test "$flag" = "yes"; then - break - fi - done - AC_SUBST(LDEXPDYNFLAGS) - - for opt in "-Xlinker -enable-new-dtags" ; do - AC_CXX_OPTION($opt,LDFLAGS) - done - AC_SUBST(LDFLAGS) - -dnl - case $host_os in - osf*) - STDLIB="-lcxxstd" - ;; - *) - STDLIB="-lstdc++" - ;; - esac - AC_SUBST(STDLIB) -]) diff --git a/adm_local/acx_pthread.m4 b/adm_local/acx_pthread.m4 deleted file mode 100644 index 3bc53f7..0000000 --- a/adm_local/acx_pthread.m4 +++ /dev/null @@ -1,226 +0,0 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -dnl Paul RASCLE: modification for Linux: -pthread required by boost... -dnl Available from the GNU Autoconf Macro Archive at: -dnl -AC_DEFUN([ACX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_SAVE -AC_LANG_C -acx_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) - AC_MSG_RESULT($acx_pthread_ok) - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case "${host_cpu}-${host_os}" in - *linux*) - - # On linux "none" works, but boost requires -pthread, so, try first "-pthread" -acx_pthread_flags="-pthread pthreads none -Kthread -kthread lthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - ;; - - *solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthread or - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags" - ;; -esac - -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [acx_pthread_ok=yes]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT($acx_pthread_ok) - if test "x$acx_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$acx_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: threads are created detached by default - # and the JOINABLE attribute has a nonstandard name (UNDETACHED). - AC_MSG_CHECKING([for joinable pthread attribute]) - AC_TRY_LINK([#include ], - [int attr=PTHREAD_CREATE_JOINABLE;], - ok=PTHREAD_CREATE_JOINABLE, ok=unknown) - if test x"$ok" = xunknown; then - AC_TRY_LINK([#include ], - [int attr=PTHREAD_CREATE_UNDETACHED;], - ok=PTHREAD_CREATE_UNDETACHED, ok=unknown) - fi - if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then - AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok, - [Define to the necessary symbol if this constant - uses a non-standard name on your system.]) - fi - AC_MSG_RESULT(${ok}) - if test x"$ok" = xunknown; then - AC_MSG_WARN([we do not know how to create joinable pthreads]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - AC_MSG_RESULT(${flag}) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: must compile with cc_r - AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC}) -else - PTHREAD_CC="$CC" -fi - -AC_SUBST(PTHREAD_LIBS) -AC_SUBST(PTHREAD_CFLAGS) -AC_SUBST(PTHREAD_CC) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then - ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) - : -else - acx_pthread_ok=no - $2 -fi -AC_LANG_RESTORE -])dnl ACX_PTHREAD diff --git a/adm_local/check_Kernel.m4 b/adm_local/check_Kernel.m4 deleted file mode 100644 index 9390d16..0000000 --- a/adm_local/check_Kernel.m4 +++ /dev/null @@ -1,86 +0,0 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -# Check availability of Salome's KERNEL binary distribution -# -# Author : Jerome Roy (CEA, 2003) -# - -AC_DEFUN([CHECK_KERNEL],[ -AC_REQUIRE([AC_LINKER_OPTIONS])dnl - -AC_CHECKING(for Kernel) - -Kernel_ok=no - -KERNEL_LDFLAGS="" -KERNEL_CXXFLAGS="" - -AC_ARG_WITH(kernel, - [--with-kernel=DIR root directory path of KERNEL build or installation], - [KERNEL_DIR="$withval"], - [KERNEL_DIR=""]) - -if test "x${KERNEL_DIR}" = "x" ; then - AC_MSG_RESULT(for \${KERNEL_ROOT_DIR}: ${KERNEL_ROOT_DIR}) - # no --with-kernel-dir option used - if test "x${KERNEL_ROOT_DIR}" != "x" ; then - # KERNEL_ROOT_DIR environment variable defined - KERNEL_DIR=${KERNEL_ROOT_DIR} - else - # search Kernel binaries in PATH variable - AC_PATH_PROG(TEMP,runSalome) - if test "x${TEMP}" != "x" ; then - AC_MSG_RESULT(runSalome was found at : ${TEMP}) - KERNEL_BIN_DIR=`dirname ${TEMP}` - KERNEL_DIR=`cd ${KERNEL_BIN_DIR}/../..; pwd` - fi - fi -fi - -if test -f ${KERNEL_DIR}/bin/salome/runSalome ; then - AC_MSG_RESULT(Using Kernel module distribution in ${KERNEL_DIR}) - Kernel_ok=yes - - if test "x${KERNEL_ROOT_DIR}" = "x" ; then - KERNEL_ROOT_DIR=${KERNEL_DIR} - fi - - if test "x${KERNEL_SITE_DIR}" = "x" ; then - KERNEL_SITE_DIR=${KERNEL_ROOT_DIR} - fi - - AC_SUBST(KERNEL_ROOT_DIR) - AC_SUBST(KERNEL_SITE_DIR) - - KERNEL_LDFLAGS=-L${KERNEL_DIR}/lib${LIB_LOCATION_SUFFIX}/salome - KERNEL_CXXFLAGS=-I${KERNEL_DIR}/include/salome - - AC_SUBST(KERNEL_LDFLAGS) - AC_SUBST(KERNEL_CXXFLAGS) -else - AC_MSG_WARN("Cannot find compiled Kernel module distribution") -fi - -AC_MSG_RESULT(for Kernel: $Kernel_ok) - -])dnl - diff --git a/adm_local/check_aster.m4 b/adm_local/check_aster.m4 deleted file mode 100644 index 32d10b3..0000000 --- a/adm_local/check_aster.m4 +++ /dev/null @@ -1,50 +0,0 @@ -dnl Copyright (C) 2010-2011 EDF R&D -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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -dnl Author: André Ribes, andre.ribes@edf.fr, EDF R&D - -# -# Check availability of Aster binary distribution -# - -AC_DEFUN([AC_CHECK_ASTER],[ - -AC_CHECKING(for Aster) - -Aster_ok=no - -AC_ARG_WITH(aster, - [AC_HELP_STRING([--with-aster=DIR],[root directory path of Aster installation])], - [ASTER_DIR="$withval"],[ASTER_DIR=""]) - -if test -f ${ASTER_DIR}/asteru ; then - Aster_ok=yes - AC_MSG_RESULT(Using Aster distribution in ${ASTER_DIR}) - - ASTER_INCLUDES=-I$ASTER_DIR/bibc/include - - AC_SUBST(ASTER_DIR) - AC_SUBST(ASTER_INCLUDES) - -else - AC_MSG_WARN("Cannot find Aster distribution") -fi - -AC_MSG_RESULT(for Aster: $Aster_ok) - -])dnl diff --git a/adm_local/check_boost.m4 b/adm_local/check_boost.m4 deleted file mode 100644 index 4b71add..0000000 --- a/adm_local/check_boost.m4 +++ /dev/null @@ -1,175 +0,0 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -AC_DEFUN([CHECK_BOOST],[ - -AC_CHECKING(for BOOST Library) - -AC_REQUIRE([ENABLE_PTHREADS])dnl - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - -BOOST_CPPFLAGS="" -BOOST_LIBSUFFIX="-mt" -BOOST_LIBS="" - -AC_CHECKING(for BOOST location) -AC_ARG_WITH(boost, - [AC_HELP_STRING([--with-boost=DIR],[root directory path to BOOST library installation])], - [BOOSTDIR="$withval" - AC_MSG_RESULT("select $withval as path to BOOST library") - ]) - -if test "x${BOOSTDIR}" = "x" ; then - BOOSTDIR="/usr" -fi - -AC_MSG_RESULT(\$BOOSTDIR = ${BOOSTDIR}) - -CPPFLAGS_old="${CPPFLAGS}" -LIBS_old=$LIBS - -if test "x${BOOSTDIR}" != "x" ; then - BOOST_CPPFLAGS="-I${BOOSTDIR}/include" - BOOST_LIBS="-L${BOOSTDIR}/lib${LIB_LOCATION_SUFFIX}" -fi - -if test "x${BOOSTDIR}" = "x/usr" ; then - BOOST_CPPFLAGS="" - BOOST_LIBS="" -fi - -boost_ok=no -boost_headers_ok=no -boost_binaries_ok=no - -dnl BOOST headers -AC_CHECKING(for BOOST headers) -CPPFLAGS="${CPPFLAGS_old} ${BOOST_CPPFLAGS}" - -boost_include_dir_ok=yes -if test "x${BOOSTDIR}" != "x" ; then - AC_CHECK_FILE(${BOOSTDIR}/include/boost/shared_ptr.hpp, - boost_include_dir_ok=yes, - boost_include_dir_ok=no) -fi - -BOOST_PROGRAM_OPTIONS_LIB=no -if test "x${boost_include_dir_ok}" = "xyes" ; then - AC_CHECK_FILE(${BOOSTDIR}/include/boost/program_options.hpp, - BOOST_PROGRAM_OPTIONS_LIB=yes, - BOOST_PROGRAM_OPTIONS_LIB=no) -fi -AC_MSG_RESULT(for boost program_options tool: $BOOST_PROGRAM_OPTIONS_LIB) - -if test "x${boost_include_dir_ok}" = "xyes" ; then - AC_TRY_COMPILE([#include ], - [boost::shared_ptr(new int)], - boost_headers_ok=yes, - boost_headers_ok=no) -fi - -if test "x${boost_headers_ok}" = "xno" ; then - BOOST_CPPFLAGS="BOOST_CPPFLAGS_NOT_DEFINED" -else - AC_MSG_RESULT(\$BOOST_CPPFLAGS = ${BOOST_CPPFLAGS}) -fi -AC_MSG_RESULT(for boost headers: $boost_headers_ok) - -if test "x${boost_headers_ok}" = "xyes" ; then - dnl BOOST binaries - AC_CHECKING(for BOOST binaries) - boost_lib_dir_ok=yes - if test "x${BOOSTDIR}" != "x" ; then - AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_LOCATION_SUFFIX}/libboost_thread${BOOST_LIBSUFFIX}.so, - boost_lib_dir_ok=yes, - boost_lib_dir_ok=no) - if test "x${boost_lib_dir_ok}" = "xno" ; then - BOOST_LIBSUFFIX="" - AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_LOCATION_SUFFIX}/libboost_thread${BOOST_LIBSUFFIX}.so, - boost_lib_dir_ok=yes, - boost_lib_dir_ok=no) - fi - fi - if test "x${boost_lib_dir_ok}" = "xyes" ; then - LIBS="${LIBS_old} ${BOOST_LIBS} -lboost_thread${BOOST_LIBSUFFIX}" - AC_TRY_LINK([#include ], - [struct TBody{ void operator()(){} }; boost::thread(TBody())], - boost_binaries_ok=yes, - boost_binaries_ok=no) - if test "x${boost_binaries_ok}" = "xno" ; then - BOOST_LIBSUFFIX="" - LIBS="${LIBS_old} ${BOOST_LIBS} -lboost_thread${BOOST_LIBSUFFIX}" - AC_TRY_LINK([#include ], - [struct TBody{ void operator()(){} }; boost::thread(TBody())], - boost_binaries_ok=yes, - boost_binaries_ok=no) - fi - fi -fi - -if test "x${boost_binaries_ok}" = "xno" ; then - BOOST_LIBS="BOOST_LIBS_NOT_FOUND" - BOOST_LIBSUFFIX="-not-defined" -else - AC_MSG_RESULT(\$BOOST_LIBSUFFIX = ${BOOST_LIBSUFFIX}) - AC_MSG_RESULT(\$BOOST_LIBS = ${BOOST_LIBS}) - AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_LOCATION_SUFFIX}/libboost_thread${BOOST_LIBSUFFIX}.so, - BOOST_LIB_THREAD="${BOOST_LIBS} -lboost_thread${BOOST_LIBSUFFIX}", - BOOST_LIB_THREAD="") - AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_LOCATION_SUFFIX}/libboost_signals${BOOST_LIBSUFFIX}.so, - BOOST_LIB_SIGNALS="${BOOST_LIBS} -lboost_signals${BOOST_LIBSUFFIX}", - BOOST_LIB_SIGNALS="") - AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_LOCATION_SUFFIX}/libboost_system${BOOST_LIBSUFFIX}.so, - BOOST_LIB_SYSTEM="${BOOST_LIBS} -lboost_system${BOOST_LIBSUFFIX}", - BOOST_LIB_SYSTEM="") - AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_LOCATION_SUFFIX}/libboost_regex${BOOST_LIBSUFFIX}.so, - BOOST_LIB_REGEX="${BOOST_LIBS} -lboost_regex${BOOST_LIBSUFFIX}", - BOOST_LIB_REGEX="") -fi -AC_MSG_RESULT(for boost binaries: $boost_binaries_ok) - -CPPFLAGS="${CPPFLAGS_old}" -LIBS="${LIBS_old}" - -if test "x${boost_headers_ok}" = "xyes" ; then - if test "x${boost_binaries_ok}" = "xyes" ; then - boost_ok=yes - fi -fi - -AC_MSG_RESULT(for boost: $boost_ok) - -AC_SUBST(BOOST_CPPFLAGS) -AC_SUBST(BOOST_LIBSUFFIX) -AC_SUBST(BOOST_LIBS) -AC_SUBST(BOOST_LIB_THREAD) -AC_SUBST(BOOST_LIB_SIGNALS) -AC_SUBST(BOOST_LIB_SYSTEM) -AC_SUBST(BOOST_LIB_REGEX) -AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) - -AC_LANG_RESTORE - -])dnl - - diff --git a/adm_local/check_f77.m4 b/adm_local/check_f77.m4 deleted file mode 100644 index d41ecbb..0000000 --- a/adm_local/check_f77.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -AC_DEFUN([CHECK_F77],[ - -AC_PROG_F77 -AC_F77_LIBRARY_LDFLAGS -AC_F77_WRAPPERS - -])dnl diff --git a/adm_local/check_lam.m4 b/adm_local/check_lam.m4 deleted file mode 100644 index 010d0cc..0000000 --- a/adm_local/check_lam.m4 +++ /dev/null @@ -1,130 +0,0 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -AC_DEFUN([CHECK_LAM],[ - -AC_REQUIRE([AC_PROG_CC])dnl - -AC_ARG_WITH(lam, - [AC_HELP_STRING([--with-lam=DIR],[root directory path of LAM installation])], - WITHLAM="yes",WITHLAM="no") - -MPI_INCLUDES="" -MPI_LIBS="" -if test "$WITHLAM" = yes; then - - MPIREQUESTED="yes" - echo - echo --------------------------------------------- - echo testing lam - echo --------------------------------------------- - echo - LAM_HOME=$withval - - if test "$LAM_HOME"; then - MPI_INCLUDES="-I$LAM_HOME/include" - if test "x$LAM_HOME" = "x/usr" - then - MPI_LIBS="" - else - MPI_LIBS="-L$LAM_HOME/lib" - fi - fi - - CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$MPI_INCLUDES $CPPFLAGS" - AC_CHECK_HEADER(mpi.h,WITHLAM="yes",WITHLAM="no") - - if test "$WITHLAM" = "yes";then - AC_CHECK_LIB(util,openpty,,WITHLAM="no") - LIBS_old="$LIBS" - LDFLAGS_old="$LDFLAGS" - LDFLAGS="$MPI_LIBS $LDFLAGS" - fi - - if test "$WITHLAM" = "yes";then - - LIBS="$LIBS -lmpi++" - AC_MSG_CHECKING(for MPI_Init in -lmpi++) - AC_TRY_LINK([ - #include - ], [int argc=0; char **argv=0; MPI_Init(&argc,&argv);], - WITHLAM="yes",WITHLAM="no") - - if test "$WITHLAM" = "yes";then - - AC_MSG_RESULT(yes) - MPI_LIBS="$MPI_LIBS -lmpi++" - AC_CHECK_LIB(mpi++,MPI_Publish_name,WITHMPI2="yes",WITHMPI2="no") - - else - AC_MSG_RESULT(no) - - LIBS="$LIBS_old" - AC_CHECK_LIB(lam,lam_mp_init,WITHLAM="yes",WITHLAM="no") - if test "$WITHLAM" = "yes";then - MPI_LIBS="$MPI_LIBS -llam" - LIBS="$LIBS -llam" - fi - - AC_CHECK_LIB(mpi,MPI_Init,WITHLAM="yes",WITHLAM="no") - if test "$WITHLAM" = "yes";then - MPI_LIBS="-lmpi $MPI_LIBS" - LIBS="-lmpi $LIBS" - fi - - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - LIBS="-llammpi++ $LIBS" - AC_MSG_CHECKING(for MPI_Init in -llammpi++) - AC_TRY_LINK([ - #include - ], [MPI::Init();], - WITHLAM="yes",WITHLAM="no") - if test "$WITHLAM" = "yes";then - AC_MSG_RESULT(yes) - MPI_LIBS="-llammpi++ $MPI_LIBS" - else - AC_MSG_RESULT(no) - fi - AC_LANG_RESTORE - - AC_CHECK_LIB(mpi,MPI_Publish_name,WITHMPI2="yes",WITHMPI2="no") - - fi - fi - - CPPFLAGS="$CPPFLAGS_old" - LDFLAGS="$LDFLAGS_old" - LIBS="$LIBS_old" - - if test "$WITHLAM" = "yes";then - WITHMPI="yes" - mpi_ok=yes - CPPFLAGS="-DWITHLAM $CPPFLAGS" - else - mpi_ok=no - fi - -fi - - -])dnl diff --git a/adm_local/check_mpi.m4 b/adm_local/check_mpi.m4 deleted file mode 100644 index af80ef0..0000000 --- a/adm_local/check_mpi.m4 +++ /dev/null @@ -1,130 +0,0 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -AC_DEFUN([CHECK_MPI],[ - -AC_REQUIRE([AC_PROG_CC])dnl - -AC_ARG_WITH(mpi_lib, - [AC_HELP_STRING([--with-mpi_lib=DIR],[directory path of MPICH lib installation])], - MPILIBREQUESTED="$withval") - -AC_ARG_WITH(mpi, - [AC_HELP_STRING([--with-mpi=DIR],[root directory path of MPICH installation])], - MPIREQUESTED="yes",MPIREQUESTED="no") - -MPI_INCLUDES="" -MPI_LIBS="" -WITHMPI=no -mpi_ok=no -if test x"$MPIREQUESTED" = xyes; then - - echo - echo --------------------------------------------- - echo testing mpi - echo --------------------------------------------- - echo - - if test "x$withval" != "xyes"; then - MPI_HOME=$withval - MPI_INCLUDES="-I$MPI_HOME/include" - if test "x$MPI_HOME" = "x/usr" - then - MPI_LIBS="" - else - MPI_LIBS="-L$MPI_HOME/lib" - fi - fi - - if test x"$MPILIBREQUESTED" != x; then - MPI_LIBS="-L$MPILIBREQUESTED" - fi - - CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$MPI_INCLUDES $CPPFLAGS" - AC_CHECK_HEADER(mpi.h,WITHMPI="yes",WITHMPI="no") - CPPFLAGS="$CPPFLAGS_old" - - if test "$WITHMPI" = "yes";then - LIBS_old="$LIBS" - LDFLAGS_old="$LDFLAGS" - LDFLAGS="$MPI_LIBS $LDFLAGS" - AC_CHECK_LIB(elan,elan_init,MPI_LIBS="$MPI_LIBS -lelan") - AC_CHECK_LIB(mpi,MPI_Init,WITHMPI="yes",WITHMPI="no") - AC_CHECK_LIB(mpi,MPI_Publish_name,WITHMPI2="yes",WITHMPI2="no") - LDFLAGS="$LDFLAGS_old" - LIBS="$LIBS_old" - fi - - if test "$WITHMPI" = "yes";then - mpi_ok=yes - MPI_LIBS="$MPI_LIBS -lmpi -lmpio -lmpiCC" - else - mpi_ok=no - fi - -fi - -if test "$WITHMPI" = no; then -dnl -dnl --------------------------------------------- -dnl testing MPICH -dnl --------------------------------------------- -dnl - - CHECK_MPICH - - if test "$WITHMPICH" = no; then -dnl -dnl --------------------------------------------- -dnl testing LAM -dnl --------------------------------------------- -dnl - - CHECK_LAM - - fi - - if test "$WITHLAM" = no; then -dnl -dnl --------------------------------------------- -dnl testing OPENMPI -dnl --------------------------------------------- -dnl - - CHECK_OPENMPI - - fi - -fi - -if test x$WITHMPI2 = xyes; then - CPPFLAGS="-DHAVE_MPI2 $CPPFLAGS" - CORBA_IDLCXXFLAGS="-DHAVE_MPI2 $CORBA_IDLCXXFLAGS" - CORBA_IDLPYFLAGS="-DHAVE_MPI2 $CORBA_IDLPYFLAGS" -fi - -AC_SUBST(WITHMPI) -AC_SUBST(MPI_INCLUDES) -AC_SUBST(MPI_LIBS) -AC_SUBST(mpi_ok) -AM_CONDITIONAL(MPI_IS_OK, [test x"$mpi_ok" = xyes]) -])dnl diff --git a/adm_local/check_mpich.m4 b/adm_local/check_mpich.m4 deleted file mode 100644 index bd7adfb..0000000 --- a/adm_local/check_mpich.m4 +++ /dev/null @@ -1,75 +0,0 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -AC_DEFUN([CHECK_MPICH],[ - -AC_REQUIRE([AC_PROG_CC])dnl - -AC_ARG_WITH(mpich, - [AC_HELP_STRING([--with-mpich=DIR],[root directory path of MPICH installation])], - WITHMPICH="yes",WITHMPICH="no") - -MPI_INCLUDES="" -MPI_LIBS="" -if test "$WITHMPICH" = yes; then - - MPIREQUESTED="yes" - echo - echo --------------------------------------------- - echo testing mpich - echo --------------------------------------------- - echo - MPICH_HOME=$withval - - if test "$MPICH_HOME"; then - MPI_INCLUDES="-I$MPICH_HOME/include" - if test "x$MPICH_HOME" = "x/usr" - then - MPI_LIBS="" - else - MPI_LIBS="-L$MPICH_HOME/lib" - fi - fi - - CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$MPI_INCLUDES $CPPFLAGS" - AC_CHECK_HEADER(mpi.h,WITHMPICH="yes",WITHMPICH="no") - CPPFLAGS="$CPPFLAGS_old" - - if test "$WITHMPICH" = "yes";then - LDFLAGS_old="$LDFLAGS" - LDFLAGS="$MPI_LIBS $LDFLAGS" - AC_CHECK_LIB(mpich,MPI_Init,WITHMPICH="yes",WITHMPICH="no") - AC_CHECK_LIB(mpich,MPI_Publish_name,WITHMPI2="yes",WITHMPI2="no") - LDFLAGS="$LDFLAGS_old" - fi - - if test "$WITHMPICH" = "yes";then - WITHMPI="yes" - mpi_ok=yes - MPI_LIBS="$MPI_LIBS -lmpich" - else - mpi_ok=no - fi - -fi - -])dnl diff --git a/adm_local/check_omniorb.m4 b/adm_local/check_omniorb.m4 deleted file mode 100644 index a1ae605..0000000 --- a/adm_local/check_omniorb.m4 +++ /dev/null @@ -1,336 +0,0 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -AC_DEFUN([CHECK_OMNIORB],[ -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_CXX])dnl -AC_REQUIRE([AC_PROG_CPP])dnl -AC_REQUIRE([AC_PROG_CXXCPP])dnl - -AC_CHECKING(for omniORB) -omniORB_ok=yes - -if test "x$PYTHON" = "x" -then - CHECK_PYTHON -fi - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - -AC_PATH_PROG(OMNIORB_IDL, omniidl) -if test "x$OMNIORB_IDL" = "x" -then - omniORB_ok=no - AC_MSG_RESULT(omniORB binaries not in PATH variable) -else - omniORB_ok=yes -fi - -if test "x$omniORB_ok" = "xyes" -then - AC_SUBST(OMNIORB_IDL) - - OMNIORB_BIN=`echo ${OMNIORB_IDL} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` - OMNIORB_ROOT=${OMNIORB_BIN} - # one-level up - OMNIORB_ROOT=`echo ${OMNIORB_ROOT} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` - # - # - if test -d $OMNIORB_ROOT/include ; then - # if $OMNIORB_ROOT/include exists, there are a lot of chance that - # this is omniORB4.x installed via configure && make && make install - OMNIORB_LIB=`echo ${OMNIORB_BIN} | sed -e "s,bin\$,lib,"` - OMNIORB_VERSION=4 - else - # omniORB has been installed old way - OMNIORB_LIB=`echo ${OMNIORB_BIN} | sed -e "s,bin/,lib/,"` - # one-level up again - OMNIORB_ROOT=`echo ${OMNIORB_ROOT} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` - if test -d $OMNIORB_ROOT/include/omniORB4 ; then - OMNIORB_VERSION=4 - else - OMNIORB_VERSION=3 - fi - fi - AC_SUBST(OMNIORB_ROOT) - - OMNIORB_INCLUDES="-I$OMNIORB_ROOT/include -I$OMNIORB_ROOT/include/omniORB${OMNIORB_VERSION} -I$OMNIORB_ROOT/include/COS" - AC_SUBST(OMNIORB_INCLUDES) - - ENABLE_PTHREADS - - OMNIORB_CXXFLAGS="-DOMNIORB_VERSION=$OMNIORB_VERSION" - case $build_cpu in - sparc*) - # AC_DEFINE(__sparc__) - OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__sparc__" - ;; - *86*) - # AC_DEFINE(__x86__) - OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__x86__" - ;; - esac - case $build_os in - osf*) - # AC_DEFINE(__osf1__) - __OSVERSION__=5 - AC_DEFINE([__OSVERSION__], [5], [Description]) - OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__osf1__" - ;; - solaris*) - # AC_DEFINE(__sunos__) - __OSVERSION__=5 - AC_DEFINE([__OSVERSION__], [5], [Description]) - OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__sunos__" - ;; - linux*) - # AC_DEFINE(__linux__) - __OSVERSION__=2 - AC_DEFINE([__OSVERSION__], [2], [Description]) - OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__linux__" - ;; - esac - AC_SUBST(OMNIORB_CXXFLAGS) - - CPPFLAGS_old=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $OMNIORB_CXXFLAGS $OMNIORB_INCLUDES" - - AC_LANG_CPLUSPLUS - AC_CHECK_HEADER(CORBA.h,omniORB_ok="yes",omniORB_ok="no") - - CPPFLAGS=$CPPFLAGS_old - -fi - -if test "x$omniORB_ok" = "xyes" -then - if test "x$OMNIORB_LIB" = "x/usr/lib" - then - OMNIORB_LDFLAGS="" - OMNIORB_RFLAGS="" - else - OMNIORB_LDFLAGS="-L$OMNIORB_LIB" - OMNIORB_RFLAGS="-R$OMNIORB_LIB" - fi - - LIBS_old=$LIBS - LIBS="$LIBS $OMNIORB_LDFLAGS -lomnithread" - - CXXFLAGS_old=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $OMNIORB_CXXFLAGS $OMNIORB_INCLUDES" - - AC_MSG_CHECKING(whether we can link with omnithreads) - AC_CACHE_VAL(salome_cv_lib_omnithreads,[ - AC_TRY_LINK( -#include -, omni_mutex my_mutex, - eval "salome_cv_lib_omnithreads=yes",eval "salome_cv_lib_omnithreads=no") - ]) - - omniORB_ok="$salome_cv_lib_omnithreads" - if test "x$omniORB_ok" = "xno" - then - AC_MSG_RESULT(omnithreads not found) - else - AC_MSG_RESULT(yes) - fi - - LIBS=$LIBS_old - CXXFLAGS=$CXXFLAGS_old -fi - - -dnl omniORB_ok=yes -if test "x$omniORB_ok" = "xyes" -then - - AC_CHECK_LIB(socket,socket, LIBS="-lsocket $LIBS",,) - AC_CHECK_LIB(nsl,gethostbyname, LIBS="-lnsl $LIBS",,) - - LIBS_old=$LIBS - OMNIORB_LIBS="$OMNIORB_LDFLAGS" - OMNIORB_LIBS="$OMNIORB_LIBS -lomniORB${OMNIORB_VERSION}" - OMNIORB_LIBS="$OMNIORB_LIBS -lomniDynamic${OMNIORB_VERSION}" - OMNIORB_LIBS="$OMNIORB_LIBS -lCOS${OMNIORB_VERSION}" - OMNIORB_LIBS="$OMNIORB_LIBS -lCOSDynamic${OMNIORB_VERSION}" - OMNIORB_LIBS="$OMNIORB_LIBS -lomnithread" - OMNIORB_LIBS="$OMNIORB_LIBS ${OMNIORB_RFLAGS}" - if test $OMNIORB_VERSION = 3 ; then - OMNIORB_LIBS="$OMNIORB_LIBS -ltcpwrapGK" - fi - AC_SUBST(OMNIORB_LIBS) - - LIBS="$OMNIORB_LIBS $LIBS" - CXXFLAGS_old=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $OMNIORB_CXXFLAGS $OMNIORB_INCLUDES" - - AC_MSG_CHECKING(whether we can link with omniORB) - AC_CACHE_VAL(salome_cv_lib_omniorb,[ - AC_TRY_LINK( -#include -, CORBA::ORB_var orb, - eval "salome_cv_lib_omniorb3=yes",eval "salome_cv_lib_omniorb3=no") - ]) - omniORB_ok="$salome_cv_lib_omniorb3" - - omniORB_ok=yes - if test "x$omniORB_ok" = "xno" - then - AC_MSG_RESULT(omniORB library linking failed) - omniORB_ok=no - else - AC_MSG_RESULT(yes) - fi - LIBS="$LIBS_old" - CXXFLAGS=$CXXFLAGS_old -fi - - -if test "x$omniORB_ok" = "xyes" -then - - OMNIORB_IDLCXXFLAGS="-Wba -nf -I${OMNIORB_ROOT}/idl" - OMNIORB_IDLPYFLAGS_1='-bpython' - OMNIORB_IDLPYFLAGS_2=" -I${OMNIORB_ROOT}/idl" - OMNIORB_IDLPYFLAGS=${OMNIORB_IDLPYFLAGS_1}${OMNIORB_IDLPYFLAGS_2} - - AC_SUBST(OMNIORB_IDLCXXFLAGS) - AC_SUBST(OMNIORB_IDLPYFLAGS) - - OMNIORB_IDL_CLN_H=.hh - OMNIORB_IDL_CLN_CXX=SK.cc - OMNIORB_IDL_CLN_OBJ=SK.o - AC_SUBST(OMNIORB_IDL_CLN_H) - AC_SUBST(OMNIORB_IDL_CLN_CXX) - AC_SUBST(OMNIORB_IDL_CLN_OBJ) - - OMNIORB_IDL_SRV_H=.hh - OMNIORB_IDL_SRV_CXX=SK.cc - OMNIORB_IDL_SRV_OBJ=SK.o - AC_SUBST(OMNIORB_IDL_SRV_H) - AC_SUBST(OMNIORB_IDL_SRV_CXX) - AC_SUBST(OMNIORB_IDL_SRV_OBJ) - - OMNIORB_IDL_TIE_H= - OMNIORB_IDL_TIE_CXX= - AC_SUBST(OMNIORB_IDL_TIE_H) - AC_SUBST(OMNIORB_IDL_TIE_CXX) - - AC_DEFINE([OMNIORB], [], [Description]) - - CORBA_HAVE_POA=1 - AC_DEFINE([CORBA_HAVE_POA], [], [Description]) - - CORBA_ORB_INIT_HAVE_3_ARGS=1 - AC_DEFINE([CORBA_ORB_INIT_HAVE_3_ARGS], [], [Description]) - CORBA_ORB_INIT_THIRD_ARG='"omniORB"' - AC_DEFINE([CORBA_ORB_INIT_THIRD_ARG], [], [omniORB]) - -fi - -omniORBpy_ok=no -if test "x$omniORB_ok" = "xyes" -then - AC_MSG_CHECKING(omniORBpy) - $PYTHON -c "import omniORB" &> /dev/null - if test $? = 0 ; then - AC_MSG_RESULT(yes) - omniORBpy_ok=yes - else - AC_MSG_RESULT(no, check your installation of omniORBpy) - omniORBpy_ok=no - fi -fi - -dnl AC_LANG_RESTORE - -AC_MSG_RESULT(for omniORBpy: $omniORBpy_ok) -AC_MSG_RESULT(for omniORB: $omniORB_ok) - -# Save cache -AC_CACHE_SAVE - -dnl AC_LANG_CPLUSPLUS - -CXXFLAGS_old=$CXXFLAGS -CXXFLAGS="$CXXFLAGS $OMNIORB_CXXFLAGS $OMNIORB_INCLUDES" -LIBS_old=$LIBS -LIBS="$LIBS $OMNIORB_LDFLAGS $OMNIORB_LIBS" -AC_MSG_CHECKING(whether we have double and CORBA::Double compatibility) -AC_TRY_RUN( -#include -#include -int main () -{ - CORBA::Double *a=new CORBA::Double(2.5); - double c=2.5; - double *b; - b=(double *)a; - - if( (c==*b) && (sizeof(double)==sizeof(CORBA::Double)) ){ - delete a; - exit(0); - } - else{ - delete a; - exit(1); - } -} -,DOUBLECOMP="yes",DOUBLECOMP="no") -if test "$DOUBLECOMP" = yes; then - OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -DCOMP_CORBA_DOUBLE" - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -AC_MSG_CHECKING(whether we have int and CORBA::Long compatibility) -AC_TRY_RUN( -#include -#include -int main () -{ - CORBA::Long *a=new CORBA::Long(2); - int c=2; - int *b; - b=(int *)a; - - if( (c==*b) && (sizeof(int)==sizeof(CORBA::Long)) ) - exit(0); - else - exit(1); -} -,LONGCOMP="yes",LONGCOMP="no") -if test "$LONGCOMP" = yes; then - OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -DCOMP_CORBA_LONG" - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -CXXFLAGS=$CXXFLAGS_old -LIBS=$LIBS_old - -AC_LANG_RESTORE - -AC_SUBST(OMNIORB_CXXFLAGS) - -])dnl -dnl diff --git a/adm_local/check_openmpi.m4 b/adm_local/check_openmpi.m4 deleted file mode 100644 index fdc9dc4..0000000 --- a/adm_local/check_openmpi.m4 +++ /dev/null @@ -1,67 +0,0 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -AC_DEFUN([CHECK_OPENMPI],[ -AC_ARG_WITH(openmpi, - AC_HELP_STRING([--with-openmpi=DIR],[root directory path of openmpi installation]), - WITHOPENMPI="yes",WITHOPENMPI="no") - -MPI_INCLUDES="" -MPI_LIBS="" -mpi_ok=no - -if test "$WITHOPENMPI" = yes; then - - OPENMPI_HOME=$withval - - if test "$OPENMPI_HOME"; then - if test -f "${OPENMPI_HOME}/include/mpi.h"; then - MPI_INCLUDES="-I${OPENMPI_HOME}/include" - else - MPI_INCLUDES=`$OPENMPI_HOME/bin/mpicxx --showme:compile` - fi - MPI_LIBS=`$OPENMPI_HOME/bin/mpicxx --showme:link` - fi - - CPPFLAGS_old="$CPPFLAGS" - CPPFLAGS="$MPI_INCLUDES $CPPFLAGS" - AC_CHECK_HEADER(mpi.h,WITHOPENMPI="yes",WITHOPENMPI="no") - CPPFLAGS="$CPPFLAGS_old" - - LIBS_old="$LIBS" - LIBS="-L${OPENMPI_HOME}/lib $LIBS" - AC_CHECK_LIB(mpi,MPI_Publish_name,WITHMPI2="yes",WITHMPI2="no") - LIBS="$LIBS_old" - - AC_MSG_CHECKING(for openmpi) - if test "$WITHOPENMPI" = "yes";then - mpi_ok=yes - WITHMPI=yes - CPPFLAGS="-DOMPI_IGNORE_CXX_SEEK -DWITHOPENMPI $CPPFLAGS" - AC_MSG_RESULT(yes) - else - mpi_ok=no - WITHMPI=no - AC_MSG_RESULT(no) - fi -fi -])dnl - diff --git a/adm_local/check_paco++.m4 b/adm_local/check_paco++.m4 deleted file mode 100644 index 8490d83..0000000 --- a/adm_local/check_paco++.m4 +++ /dev/null @@ -1,63 +0,0 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -dnl File : check_paco++.m4 -dnl Author : André RIBES (EDF) -dnl Module : KERNEL -dnl -AC_DEFUN([CHECK_PACO],[ -PaCO_ok=yes - -AC_ARG_WITH(paco, - [AC_HELP_STRING([--with-paco=DIR],[root directory path of PaCO++ installation])], - WITHPACO="yes",WITHPACO="no") - -if test "x$WITHPACO" = "xyes"; -then - PACOPATH=$withval - PACO_INCLUDES="-I${PACOPATH}/include" - PACO_LIBS="-L${PACOPATH}/lib -lPaCO -lGaBro -lBasicBC" - dnl a basic test to be sure that PaCO++ - dnl is correctly installed. - AC_CHECK_PROG(PACO_IDL, PaCOIdlTool.sh, yes, no, ${PACOPATH}/bin) - if test "x$PACO_IDL" = "xno"; - then - PaCO_ok=no - AC_MSG_RESULT(PaCO++ binary not in ${PACOPATH}/bin) - fi -else - PaCO_ok=no -fi - -AC_MSG_CHECKING(for PaCO++) -if test "x$PaCO_ok" = "xyes" -then - AC_MSG_RESULT([yes]) - PACO_IDL=${PACOPATH}/bin/PaCOIdlTool.sh - AC_SUBST(PACO_IDL) - AC_SUBST(PACOPATH) - AC_SUBST(PACO_INCLUDES) - AC_SUBST(PACO_LIBS) -else - AC_MSG_RESULT([no]) -fi -])dnl -dnl diff --git a/adm_local/check_sphinx.m4 b/adm_local/check_sphinx.m4 deleted file mode 100644 index 208eb3b..0000000 --- a/adm_local/check_sphinx.m4 +++ /dev/null @@ -1,55 +0,0 @@ -dnl Copyright (C) 2006-2011 CEA/DEN, EDF R&D -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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl - -AC_DEFUN([CHECK_SPHINX],[ - -AC_CHECKING(for sphinx doc generator) - -sphinx_ok=yes -dnl where is sphinx ? -AC_PATH_PROG(SPHINX,sphinx-build) -if test "x$SPHINX" = "x" -then - AC_MSG_WARN(sphinx not found) - sphinx_ok=no -fi - -dnl Can I load ths sphinx module ? -dnl This code comes from the ax_python_module macro. -if test -z $PYTHON; -then - PYTHON="python" -fi -PYTHON_NAME=`basename $PYTHON` -AC_MSG_CHECKING($PYTHON_NAME module: sphinx) - $PYTHON -c "import sphinx" 2>/dev/null - if test $? -eq 0; - then - AC_MSG_RESULT(yes) - eval AS_TR_CPP(HAVE_PYMOD_sphinx)=yes - else - AC_MSG_RESULT(no) - eval AS_TR_CPP(HAVE_PYMOD_sphinx)=no - sphinx_ok=no - fi - -AM_CONDITIONAL(SPHINX_IS_OK, [test x"$sphinx_ok" = xyes]) - -])dnl -dnl diff --git a/adm_local/enable_pthreads.m4 b/adm_local/enable_pthreads.m4 deleted file mode 100644 index a0a9a04..0000000 --- a/adm_local/enable_pthreads.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -dnl modify CFLAGS, CXXFLAGS and LIBS for compiling pthread-based programs. -dnl@author (C) Ruslan Shevchenko , 1998, 2000 -dnl@id $Id$ -dnl Modified to use acx_pthread.m4 from GNU Autoconf Macro Archive -dnl -AC_DEFUN([ENABLE_PTHREADS],[ -AC_REQUIRE([ACX_PTHREAD]) - -if test x"$enable_pthreads_done" != xyes; then - if test x"$acx_pthread_ok" = xyes; then - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" - LIBS="$LIBS $PTHREAD_LIBS" - threads_ok=yes - else - threads_ok=no - fi - enable_pthreads_done=yes -fi -])dnl -dnl diff --git a/adm_local/production.m4 b/adm_local/production.m4 deleted file mode 100644 index f279dca..0000000 --- a/adm_local/production.m4 +++ /dev/null @@ -1,101 +0,0 @@ -dnl Copyright (C) 2006-2011 CEA/DEN, EDF R&D -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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -dnl define macros : -dnl AC_ENABLE_PRODUCTION AC_DISABLE_PRODUCTION -dnl AC_ENABLE_DEBUG AC_DISABLE_DEBUG -dnl version $Id: production.m4,v 1.2.20.1 2008-12-05 14:11:38 abd Exp $ -dnl author Patrick GOLDBRONN -dnl -# AC_ENABLE_PRODUCTION -AC_DEFUN(AC_ENABLE_PRODUCTION, [dnl -define([AC_ENABLE_PRODUCTION_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(production, -changequote(<<, >>)dnl -<< --enable-production[=PKGS] build without debug information [default=>>AC_ENABLE_PRODUCTION_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_production=yes ;; -no) enable_production=no ;; -*) - enable_production=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_production=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_production=AC_ENABLE_PRODUCTION_DEFAULT)dnl -if test "X$enable_production" = "Xyes"; then - FFLAGS="$FFLAGS -O3 " - CFLAGS="$CFLAGS -O3 " - CXXFLAGS="$CXXFLAGS -O3 " -else - FFLAGS="$FFLAGS" - CFLAGS="$CFLAGS" - CXXFLAGS="$CXXFLAGS" -fi -]) - -# AC_DISABLE_PRODUCTION - set the default flag to --disable-production -AC_DEFUN(AC_DISABLE_PRODUCTION, [AC_ENABLE_PRODUCTION(no)]) - -# AC_ENABLE_DEBUG -AC_DEFUN(AC_ENABLE_DEBUG, [dnl -define([AC_ENABLE_DEBUG_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(debug, -changequote(<<, >>)dnl -<< --enable-debug[=PKGS] build without debug information [default=>>AC_ENABLE_DEBUG_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_debug=yes ;; -no) enable_debug=no ;; -*) - enable_debug=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_debug=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_debug=AC_ENABLE_DEBUG_DEFAULT)dnl - -if test "X$enable_debug" = "Xyes"; then - FFLAGS="$FFLAGS -g " - CFLAGS="$CFLAGS -g " - CXXFLAGS="$CXXFLAGS -g -D_DEBUG_ " -else - FFLAGS="$FFLAGS" - CFLAGS="$CFLAGS" - CXXFLAGS="$CXXFLAGS" -fi -]) - -# AC_DISABLE_DEBUG - set the default flag to --disable-debug -AC_DEFUN(AC_DISABLE_DEBUG, [AC_ENABLE_DEBUG(no)]) - diff --git a/adm_local/python.m4 b/adm_local/python.m4 deleted file mode 100644 index 16c0683..0000000 --- a/adm_local/python.m4 +++ /dev/null @@ -1,171 +0,0 @@ -dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE -dnl -dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl -## ------------------------ -## Python file handling -## From Andrew Dalke -## Modified by Marc Tajchman (06/2001) -## ------------------------ - -dnl CHECK_PYTHON([module, classes]) -dnl -dnl Adds support for distributing Python modules or classes. -dnl Python library files distributed as a `module' are installed -dnl under PYTHON_SITE_PACKAGE (eg, ./python1.5/site-package/package-name) -dnl while those distributed as `classes' are installed under PYTHON_SITE -dnl (eg, ./python1.5/site-packages). The default is to install as -dnl a `module'. - -AC_DEFUN([CHECK_PYTHON], - [ - python_ok=yes - - AC_ARG_WITH(python, - [AC_HELP_STRING([--with-python=DIR],[root directory path of python installation])], - [PYTHON="$withval/bin/python" - AC_MSG_RESULT("select python distribution in $withval") - ], [ - AC_PATH_PROG(PYTHON, python) - ]) - - AC_CHECKING([local Python configuration]) - - AC_REQUIRE([AC_LINKER_OPTIONS])dnl - - PYTHON_PREFIX=`echo $PYTHON | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` - PYTHON_PREFIX=`echo $PYTHON_PREFIX | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` - PYTHONHOME=$PYTHON_PREFIX - - AC_SUBST(PYTHON_PREFIX) - AC_SUBST(PYTHONHOME) - - changequote(<<, >>)dnl - PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"` - changequote([, ])dnl - AC_SUBST(PYTHON_VERSION) - - PY_MAKEFILE=${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python$PYTHON_VERSION/config/Makefile - if test ! -f "$PY_MAKEFILE"; then - AC_MSG_WARN([*** Couldn't find ${PY_MAKEFILE}. Maybe you are -*** missing the development portion of the python installation]) - python_ok=no - fi - - AC_SUBST(PYTHON_INCLUDES) - AC_SUBST(PYTHON_LIBS) - - PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION - PYTHON_LIBS="-L${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/config -lpython${PYTHON_VERSION}" - PYTHON_LIB=$PYTHON_LIBS - PYTHON_LIBA=${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python$PYTHON_VERSION/config/libpython$PYTHON_VERSION.a - - dnl At times (like when building shared libraries) you may want - dnl to know which OS Python thinks this is. - - AC_SUBST(PYTHON_PLATFORM) - PYTHON_PLATFORM=`$PYTHON -c "import sys; print sys.platform"` - - AC_SUBST(PYTHON_SITE) - AC_ARG_WITH(python-site, - [AC_HELP_STRING([--with-python-site=DIR], - [Use DIR for installing platform independent Python site-packages])], - -dnl modification : by default, we install python script in salome root tree - -dnl [PYTHON_SITE="$withval" -dnl python_site_given=yes], -dnl [PYTHON_SITE=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages -dnl python_site_given=no] - - [PYTHON_SITE="$withval" - python_site_given=yes], - [PYTHON_SITE=${prefix}"/lib${LIB_LOCATION_SUFFIX}/python"${PYTHON_VERSION}/site-packages - python_site_given=no]) - - AC_SUBST(PYTHON_SITE_PACKAGE) - PYTHON_SITE_PACKAGE=$PYTHON_SITE/$PACKAGE - - - dnl Get PYTHON_SITE from --with-python-site-exec or from - dnl --with-python-site or from running Python - - AC_SUBST(PYTHON_SITE_EXEC) - AC_ARG_WITH(python-site-exec, - [AC_HELP_STRING([--with-python-site-exec=DIR], - [Use DIR for installing platform dependent Python site-packages])], - [PYTHON_SITE_EXEC="$withval"], - [if test "$python_site_given" = yes; then - PYTHON_SITE_EXEC=$PYTHON_SITE - else - PYTHON_SITE_EXEC=${PYTHON_EXEC_PREFIX}"/lib${LIB_LOCATION_SUFFIX}/python"${PYTHON_VERSION}/site-packages - fi]) - - dnl Set up the install directory - ifelse($1, classes, -[PYTHON_SITE_INSTALL=$PYTHON_SITE], -[PYTHON_SITE_INSTALL=$PYTHON_SITE_PACKAGE]) - AC_SUBST(PYTHON_SITE_INSTALL) - - dnl Also lets automake think PYTHON means something. - - pythondir=${PYTHON_PREFIX}"/lib${LIB_LOCATION_SUFFIX}/python"${PYTHON_VERSION}/ - AC_SUBST(pythondir) - - AC_MSG_CHECKING([if we need libdb]) - PY_NEEDOPENDB=`nm $PYTHON_LIBA | grep dbopen | grep U` - if test "x$PY_NEEDOPENDB" != "x"; then - 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 - 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 - 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 - 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 - - if test "$python_ok" == "yes"; then - AC_MSG_RESULT(looks good) - fi -]) diff --git a/autogen.sh b/autogen.sh index b0b2835..160acd0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -22,9 +22,18 @@ rm -rf autom4te.cache rm -f aclocal.m4 adm_local/ltmain.sh +######################################################################## +# Test if the KERNEL_ROOT_DIR is set correctly + +if test ! -d "${KERNEL_ROOT_DIR}"; then + echo "failed : KERNEL_ROOT_DIR variable is not correct !" + exit 1 +fi + echo "Running aclocal..." ; -aclocal --force -I adm_local || exit 1 -echo "Running autoheader..." ; autoheader --force -I adm_local || exit 1 +aclocal --force -I adm_local \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1 +echo "Running autoheader..." ; autoheader --force || exit 1 echo "Running autoconf..." ; autoconf --force || exit 1 echo "Running libtoolize..." ; libtoolize --copy --force || exit 1 echo "Running automake..." ; automake --add-missing --copy || exit 1 -- 2.39.2