From 35220efee22afef1a96d0c707762bf9b3404eed1 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 14 Feb 2019 17:58:18 +0300 Subject: [PATCH] Remove deprecated stuff --- m4/ac_cxx_option.m4 | 43 ---- m4/ac_linker_options.m4 | 48 ----- m4/acx_pthread.m4 | 224 -------------------- m4/check_boost.m4 | 176 ---------------- m4/check_omniorb.m4 | 259 ----------------------- m4/check_salome.m4 | 164 --------------- m4/check_sphinx.m4 | 35 ---- m4/enable_pthreads.m4 | 21 -- m4/i2_check_qt4.m4 | 446 ---------------------------------------- m4/production.m4 | 102 --------- src/bases/make_begin.am | 39 ---- 11 files changed, 1557 deletions(-) delete mode 100644 m4/ac_cxx_option.m4 delete mode 100644 m4/ac_linker_options.m4 delete mode 100644 m4/acx_pthread.m4 delete mode 100644 m4/check_boost.m4 delete mode 100644 m4/check_omniorb.m4 delete mode 100644 m4/check_salome.m4 delete mode 100644 m4/check_sphinx.m4 delete mode 100644 m4/enable_pthreads.m4 delete mode 100644 m4/i2_check_qt4.m4 delete mode 100644 m4/production.m4 delete mode 100644 src/bases/make_begin.am diff --git a/m4/ac_cxx_option.m4 b/m4/ac_cxx_option.m4 deleted file mode 100644 index a58bf97..0000000 --- a/m4/ac_cxx_option.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl Copyright (C) 2009-2019 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, or (at your option) any later version. -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 - rm -f a.out - 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/m4/ac_linker_options.m4 b/m4/ac_linker_options.m4 deleted file mode 100644 index 51512e1..0000000 --- a/m4/ac_linker_options.m4 +++ /dev/null @@ -1,48 +0,0 @@ -dnl Copyright (C) 2009-2019 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, or (at your option) any later version. -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) - -dnl - case $host_os in - osf*) - STDLIB="-lcxxstd" - ;; - *) - STDLIB="-lstdc++" - ;; - esac - AC_SUBST(STDLIB) -]) diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 deleted file mode 100644 index 819a6ed..0000000 --- a/m4/acx_pthread.m4 +++ /dev/null @@ -1,224 +0,0 @@ -dnl Copyright (C) 2009-2019 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, or (at your option) any later version. -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/m4/check_boost.m4 b/m4/check_boost.m4 deleted file mode 100644 index 922dd29..0000000 --- a/m4/check_boost.m4 +++ /dev/null @@ -1,176 +0,0 @@ -dnl Copyright (C) 2009-2019 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, or (at your option) any later version. -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 - -gccver=`$CC -dumpversion | sed 's/^\([[0-9]]\+\)\.\([[0-9]]\+\).*/\1\2/g'` -SUFFIXES="empty -mt -gcc -gcc-mt -gcc${gccver} -gcc${gccver}-mt" - -BOOST_CPPFLAGS="" -BOOST_LIBSUFFIX="" -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 - -LIB_SUFFIX="${LIB_LOCATION_SUFFIX}" - -if test "x${BOOSTDIR}" != "x" ; then - BOOST_CPPFLAGS="-I${BOOSTDIR}/include" - BOOST_LIBS="-L${BOOSTDIR}/lib${LIB_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 - for BOOST_LIBSUFFIX in ${SUFFIXES} ; do - test "${BOOST_LIBSUFFIX}" == "empty" && BOOST_LIBSUFFIX="" - AC_CHECK_FILE([${BOOSTDIR}/lib${LIB_SUFFIX}/libboost_thread${BOOST_LIBSUFFIX}.so], - [boost_lib_dir_ok=yes], - [AC_CHECK_FILE([${BOOSTDIR}/lib64/libboost_thread${BOOST_LIBSUFFIX}.so], - [boost_lib_dir_ok=yes; LIB_SUFFIX=64], - [boost_lib_dir_ok=no]) - ]) - if test "x${boost_lib_dir_ok}" = "xyes" ; then - break - fi - done - 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}" = "xyes" ; then - break - 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_SUFFIX}/libboost_thread${BOOST_LIBSUFFIX}.so, - BOOST_LIB_THREAD="${BOOST_LIBS} -lboost_thread${BOOST_LIBSUFFIX}", - BOOST_LIB_THREAD="") - AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_SUFFIX}/libboost_signals${BOOST_LIBSUFFIX}.so, - BOOST_LIB_SIGNALS="${BOOST_LIBS} -lboost_signals${BOOST_LIBSUFFIX}", - BOOST_LIB_SIGNALS="") - AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_SUFFIX}/libboost_system${BOOST_LIBSUFFIX}.so, - BOOST_LIB_SYSTEM="${BOOST_LIBS} -lboost_system${BOOST_LIBSUFFIX}", - BOOST_LIB_SYSTEM="") - AC_CHECK_FILE(${BOOSTDIR}/lib${LIB_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/m4/check_omniorb.m4 b/m4/check_omniorb.m4 deleted file mode 100644 index a9f7c87..0000000 --- a/m4/check_omniorb.m4 +++ /dev/null @@ -1,259 +0,0 @@ -dnl Copyright (C) 2009-2019 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, or (at your option) any later version. -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([AC_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 - -#VSR: Python is not currently required. -#Commented to avoid warning message on configure. -#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*) - OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__sparc__" - ;; - *86*) - OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__x86__" - ;; - esac - case $build_os in - solaris*) - __OSVERSION__=5 - OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__sunos__" - ;; - linux*) - __OSVERSION__=2 - OMNIORB_CXXFLAGS="$OMNIORB_CXXFLAGS -D__linux__ -D_REENTRANT" - ;; - 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="-nf -I$OMNIORB_ROOT/idl" - OMNIORB_IDLPYFLAGS="-bpython -I$OMNIORB_ROOT/idl" - 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,,[Presence de omniORB]) - - CORBA_HAVE_POA=1 - AC_DEFINE(CORBA_HAVE_POA,,[POA presence]) - - CORBA_ORB_INIT_HAVE_3_ARGS=1 - AC_DEFINE(CORBA_ORB_INIT_HAVE_3_ARGS,,[?]) - 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) - -IDL=${OMNIORB_IDL} -IDLGENFLAGS="-bcxx " -AC_SUBST(IDL) -AC_SUBST(IDLGENFLAGS) - -])dnl -dnl diff --git a/m4/check_salome.m4 b/m4/check_salome.m4 deleted file mode 100644 index de0b214..0000000 --- a/m4/check_salome.m4 +++ /dev/null @@ -1,164 +0,0 @@ -dnl Copyright (C) 2009-2019 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, or (at your option) any later version. -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([AC_CHECK_KERNEL],[ - -AC_CHECKING(for Kernel) - -Kernel_ok=no -dsc_ok=no - -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 - -# 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.py) - if test "x$TEMP" != "x" ; then - KERNEL_BIN_DIR=`dirname $TEMP` - KERNEL_DIR=`dirname $KERNEL_BIN_DIR` - fi - - fi -# -fi - - -if test -f ${KERNEL_DIR}/bin/salome/runSalome.py ; then - Kernel_ok=yes - AC_MSG_RESULT(Using Kernel module distribution in ${KERNEL_DIR}) - AC_DEFINE(SALOME_KERNEL,,[With Salome KERNEL]) - - 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 - SALOME_ROOT_DIR=`AS_DIRNAME(["$KERNEL_ROOT_DIR"])` - SALOME_VERSION="`echo $KERNEL_ROOT_DIR | sed s@$SALOME_ROOT_DIR/KERNEL@@`" - - if test -f ${KERNEL_DIR}/idl/salome/DSC_Engines.idl ; then - # DSC extension available - dsc_ok=yes - AC_MSG_RESULT(Using DSC Ports module distribution in ${KERNEL_DIR}) - AC_DEFINE(DSC_PORTS,,[With DSC ports]) - else - AC_MSG_WARN("Cannot find DSC Ports module distribution") - fi - - KERNEL_LDFLAGS=-L${KERNEL_ROOT_DIR}/lib/salome - KERNEL_CXXFLAGS=-I${KERNEL_ROOT_DIR}/include/salome - - AC_SUBST(KERNEL_ROOT_DIR) - AC_SUBST(KERNEL_SITE_DIR) - AC_SUBST(SALOME_ROOT_DIR) - AC_SUBST(SALOME_VERSION) - 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 - -# ----------------------------------------------------------------------------- -# --- from GUI_SRC 3.2.3 -# Check availability of Salome binary distribution -# -# Author : Marc Tajchman (CEA, 2002) -#------------------------------------------------------------ - -AC_DEFUN([CHECK_GUI],[ -AC_REQUIRE([AC_LINKER_OPTIONS])dnl - -AC_CHECKING(for $2 $1 ) - -SalomeGUI_ok=no - -GUI_LDFLAGS="" -GUI_CXXFLAGS="" - -AC_ARG_WITH(gui, - [ --with-gui=DIR root directory path of SALOME GUI installation], - [SALOME_GUI_DIR="$withval"],[SALOME_GUI_DIR=""]) - -if test "x${SALOME_GUI_DIR}" = "x" ; then - # no --with-gui-dir option used - AC_MSG_RESULT(try \${GUI_ROOT_DIR}: ${GUI_ROOT_DIR}) - if test "x${GUI_ROOT_DIR}" != "x" ; then - # SALOME_ROOT_DIR environment variable defined - SALOME_GUI_DIR=${GUI_ROOT_DIR} - else - # search Salome binaries in PATH variable - AC_PATH_PROG(TEMP, $1) - if test "x${TEMP}" != "x" ; then - AC_MSG_RESULT($1 was found at : ${TEMP}) - SALOME_BIN_DIR=`dirname ${TEMP}` - SALOME_GUI_DIR=`cd ${SALOME_BIN_DIR}/../..; pwd` - fi - fi -fi - -if test -f ${SALOME_GUI_DIR}/bin/salome/$1 ; then - SalomeGUI_ok=yes - AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR}) - - if test "x${GUI_ROOT_DIR}" == "x" ; then - GUI_ROOT_DIR=${SALOME_GUI_DIR} - fi - - AC_SUBST(GUI_ROOT_DIR) - - GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib/salome - GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome - - AC_SUBST(GUI_LDFLAGS) - AC_SUBST(GUI_CXXFLAGS) -else - AC_MSG_WARN("Cannot find compiled SALOME GUI distribution") -fi - -AC_MSG_RESULT(for $2: ${SalomeGUI_ok}) - -])dnl - -AC_DEFUN([CHECK_SALOME_GUI],[ - CHECK_GUI([SUITApp], - [SALOME GUI]) -])dnl - diff --git a/m4/check_sphinx.m4 b/m4/check_sphinx.m4 deleted file mode 100644 index 53ef660..0000000 --- a/m4/check_sphinx.m4 +++ /dev/null @@ -1,35 +0,0 @@ -dnl Copyright (C) 2009-2019 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, or (at your option) any later version. -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 - -AM_CONDITIONAL(SPHINX_IS_OK, [test x"$sphinx_ok" = xyes]) - -])dnl -dnl diff --git a/m4/enable_pthreads.m4 b/m4/enable_pthreads.m4 deleted file mode 100644 index c7325cc..0000000 --- a/m4/enable_pthreads.m4 +++ /dev/null @@ -1,21 +0,0 @@ -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/m4/i2_check_qt4.m4 b/m4/i2_check_qt4.m4 deleted file mode 100644 index 6d0a747..0000000 --- a/m4/i2_check_qt4.m4 +++ /dev/null @@ -1,446 +0,0 @@ -dnl Copyright (C) 2009-2019 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, or (at your option) any later version. -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 the following variables are exported: -dnl QT_MOC -dnl QT_UIC -dnl QT_DIR -dnl qt4_cppflags -dnl qt4_ldflags -dnl qt4_libs -dnl WITH_QT4 -dnl qt4 is searched in the following order -dnl path given with --with-qt4 options -dnl presence of QTDIR variable -dnl /usr -dnl when HAS_GUI is false (no salome gui) and nothing is said for qt4, qt4 is not checked -dnl usages -dnl ./configure --prefix=/home/prascle/partage/maquettes/install -dnl ./configure --prefix=/home/prascle/partage/maquettes/install --with-qt4 -dnl ./configure --prefix=/home/prascle/partage/maquettes/install --with-qt4=/opt/qt443 -dnl ./configure --prefix=/home/prascle/partage/maquettes/install --with-qt4-includes=/usr/include/qt4 -dnl ./configure --prefix=/home/prascle/partage/maquettes/install --with-qt4-includes=/usr/include/qt4 --with-qt4-libraries=/usr/lib -with-qt4-tools=/usr/bin -dnl ./configure --prefix=/home/prascle/partage/maquettes/install --without-qt4 -dnl -AC_DEFUN([I2_CHECK_QT4], -[ - AC_REQUIRE([AC_PROG_CXX]) - AC_REQUIRE([AC_PROG_CPP]) - - qt_ok=no - qt4_wanted=yes - WITH_QT4=0 - - # --- check if qt4 standard install directory is defined (with subdirectories bin lib include) - qt4_install_path="" - AC_ARG_WITH([qt4], - AC_HELP_STRING([--with-qt4@<:@=DIR@:>@], [where the Qt4 package with a standard install is: default @<:@$QTDIR@:>@ or @<:@/usr@:>@]), - [qt4_install_path=$withval], [withval=notset]) - - # --- if qt4 standard install directory is defined but with no path: QTDIR value if defined, or /usr - if test x${withval} = xyes - then - if test -z $QTDIR - then - qt4_install_path="/usr" - else - qt4_install_path=$QTDIR - fi - fi - - # --- if qt4 standard install directory is not defined - # if HAS_GUI= 0: Qt4 not wanted - # else: QTDIR value if defined, or /usr - if test x${withval} = xnotset - then - if test x${HAS_GUI} = x0 - then - qt4_wanted=no - AC_MSG_NOTICE([SALOME GUI not present, Qt4 not specified, skip detection]) - else - if test -z $QTDIR - then - qt4_install_path="/usr" - else - if test $QTDIR = /usr/lib/qt3 ; then - if test -d /usr/lib/qt4 ; then - AC_MSG_RESULT(it is strange for a qt4 installation !) - AC_MSG_RESULT(/usr/lib/qt4 is present) - AC_MSG_RESULT(replacing QTDIR by /usr/lib/qt4) - QTDIR=/usr/lib/qt4 - fi - fi - qt4_install_path=$QTDIR - fi - fi - fi - - # --- if qt4 standard install directory is not wanted: --without-qt4 or --with-qt4=no - if test x${withval} = xno - then - qt4_wanted=no - AC_MSG_NOTICE([Qt4 is not wanted, skip detection]) - fi - - QT_DIR=${qt4_install_path} - AC_SUBST(QT_DIR) - - # ---------------------------------------------------------------------- - # --- only when qt4 wanted (no explicit --without-qt4 nor --with-qt4=no) - - if test x${qt4_wanted} = xyes - then - - # --- check if qt4 includes directory is defined - qt4_include_path="" - AC_ARG_WITH([qt4-includes], - AC_HELP_STRING([--with-qt4-includes@<:@=DIR@:>@], [where the Qt4 includes are: default @<:@$QTDIR/include@:>@ or @<:@/usr/include@:>@]), - [qt4_include_path=$withval], [withval=no]) - if test x${withval} != xno - then - # --- qt4 includes directory is defined - if test x${qt4_include_path} = xyes - then - qt4_include_path="/usr/include" - fi - else - if test x${qt4_install_path} != x - then - qt4_include_path="${qt4_install_path}/include" - fi - fi - - - # --- check if qt4 libraries directory is defined - qt4_library_path="" - AC_ARG_WITH([qt4-libraries], - AC_HELP_STRING([--with-qt4-libraries@<:@=DIR@:>@], [where the Qt4 libraries are: default @<:@$QTDIR/lib@:>@ or @<:@/usr/lib@:>@]), - [qt4_library_path=$withval], [withval=no]) - if test x${withval} != xno - then - # --- qt4 libraries directory is defined - if test x${qt4_library_path} = xyes - then - qt4_library_path="/usr/lib" - fi - else - if test x${qt4_install_path} != x - then - qt4_library_path="${qt4_install_path}/lib" - fi - fi - - # --- check if qt4 tools directory is defined - qt4_tools_path="" - AC_ARG_WITH([qt4-tools], - AC_HELP_STRING([--with-qt4-tools@<:@=DIR@:>@], [where the Qt4 executable tools are: default @<:@$QTDIR/bin@:>@ or @<:@/usr/bin@:>@]), - [qt4_tools_path=$withval], [withval=no]) - if test x${withval} != xno - then - # --- qt4 tools directory is defined - if test x${qt4_tools_path} = xyes - then - qt4_tools_path="/usr/bin" - fi - else - if test x${qt4_install_path} != x - then - qt4_tools_path="${qt4_install_path}/bin" - fi - fi - - - # test if qt4 is completely defined - qt4_defined=yes - if test x${qt4_include_path} = x - then - qt4_defined=no - AC_MSG_NOTICE([No Qt4 include path defined]) - else - AC_MSG_NOTICE([Qt4 include path is ${qt4_include_path}]) - fi - if test x${qt4_library_path} = x - then - qt4_defined=no - AC_MSG_NOTICE([No Qt4 library path defined]) - else - AC_MSG_NOTICE([Qt4 library path is ${qt4_library_path}]) - fi - if test x${qt4_tools_path} = x - then - qt4_defined=no - AC_MSG_NOTICE([No Qt4 tools path defined]) - else - AC_MSG_NOTICE([Qt4 tools path is ${qt4_tools_path}]) - fi - - # saving values for compilation variables - saved_CPPFLAGS=$CPPFLAGS - saved_LDFLAGS=$LDFLAGS - saved_LIBS=$LIBS - - if ! test x${qt4_defined} = xno - then - # ask for qt4 support - AC_MSG_NOTICE([checking whether qt4 tools and headers are present]) - - # --- we test the presence of moc,first under the form moc-qt4, then moc - AC_PATH_PROGS(qt4_moc_found, [moc-qt4 moc], no, ${qt4_tools_path}) - test x${qt4_moc_found} = xno && AC_MSG_ERROR([Qt4 moc command NOT FOUND]) - QT_MOC=$qt4_moc_found - AC_SUBST(QT_MOC) - - # --- we test the presence of uic,first under the form uic-qt4, then uic - AC_PATH_PROGS(qt4_uic_found, [uic-qt4 uic], no, ${qt4_tools_path}) - test x${qt4_uic_found} = xno && AC_MSG_ERROR([Qt4 uic command NOT FOUND]) - QT_UIC=$qt4_uic_found - AC_SUBST(QT_UIC) - - # --- we test the presence of rcc,first under the form rcc-qt4, then rcc - AC_PATH_PROGS(qt4_rcc_found, [rcc-qt4 rcc], no, ${qt4_tools_path}) - test x${qt4_rcc_found} = xno && AC_MSG_ERROR([Qt4 rcc command NOT FOUND]) - QT_RCC=$qt4_rcc_found - AC_SUBST(QT_RCC) - - # --- we test the header file presence and usability - QTINC="" - AC_CHECK_FILE($qt4_include_path/qt4/QtCore/qglobal.h,QTINC="/qt4",QTINC="") - qt4_include_path="$qt4_include_path${QTINC}" - qt4_cppflags="" - qt4_cppflags="${qt4_cppflags} -I$qt4_include_path/QtCore" - qt4_cppflags="${qt4_cppflags} -I$qt4_include_path/QtGui" - qt4_cppflags="${qt4_cppflags} -I$qt4_include_path/Qt" - qt4_cppflags="${qt4_cppflags} -I$qt4_include_path" - CPPFLAGS="${CPPFLAGS} ${qt4_cppflags}" - AC_LANG_PUSH(C++) - AC_CHECK_HEADERS([qapplication.h], - [qt4_header_found=yes], - [qt4_header_found=no], - []) - AC_LANG_POP(C++) - test x${qt4_header_found} = xno && AC_MSG_ERROR([Qt4 include file NOT FOUND]) - AC_SUBST(qt4_cppflags) - - # --- we test the library file presence and usability - if test x${qt4_library_path} = x/usr/lib - then - qt4_ldflags="" - else - qt4_ldflags="-L$qt4_library_path" - fi - - AC_MSG_NOTICE([checking whether link with qt4 is working]) - qt4_libs="-lQtCore -lQtGui" - LDFLAGS="${LDFLAGS} ${qt4_ldflags}" - LIBS="${LIBS} ${qt4_libs}" - AC_LANG_PUSH(C++) - - AC_LINK_IFELSE([AC_LANG_PROGRAM( - [[ #include - #include ]], - [[ QApplication app(0, 0); - QPushButton hello("Hello world!"); - hello.resize(100, 30); - hello.show(); ]] )], - [qt4_lib_found=yes], [qt4_lib_found=no] ) - - test x${qt4_lib_found} = xno && AC_MSG_ERROR([Qt4 library NOT FOUND]) - - AC_LANG_POP(C++) - AC_SUBST(qt4_ldflags) - AC_SUBST(qt4_libs) - - # --- after all tests are successful, we support Qt4 - WITH_QT4=1 - qt_ok=yes - AC_MSG_NOTICE([Qt4 support is OK]) - - else - # --- no Qt4 support - AC_MSG_NOTICE([No Qt4 support]) - fi - - # restoring saved values - CPPFLAGS=$saved_CPPFLAGS - LDFLAGS=$saved_LDFLAGS - LIBS=$saved_LIBS - - fi - # --- end: only when qt4 wanted (no explicit --without-qt4 nor --with-qt4=no) - # ---------------------------------------------------------------------- - - # Propagate test into atlocal - AC_SUBST(WITH_QT4) - - # Propagate test into Makefiles... - AM_CONDITIONAL(WITH_QT4, test $WITH_QT4 = 1) - - # ... and into source files - AC_DEFINE_UNQUOTED(HAS_QT4, $WITH_QT4, [Qt4 library]) - -]) - - -AC_DEFUN([I2_CHECK_QSCINTILLA], -[ - AC_REQUIRE([I2_CHECK_QT4]) - qscintilla_ok=no - WITH_QSCI4=0 - - # ---------------------------------------------------------------------- - # --- check qscintilla only when qt4 OK - - if test x${WITH_QT4} = x1 - then - - # --- check if qsci4 includes directory is defined - qsci4_include_path="" - qsci4_cppflags="" - - AC_ARG_WITH([qsci4-includes], - AC_HELP_STRING([--with-qsci4-includes@<:@=DIR@:>@], [where the Qsci4 includes are: default @<:@$QTDIR/include/Qsci@:>@ or @<:@/usr/include/Qsci@:>@]), - [qsci4_include_path=$withval]) - - if test x${qsci4_include_path} = x ; then - # --- "" --- try to use QSCINTILLA_DIR/include/Qsci - if test "x${QSCINTILLA_DIR}" != "x" ; then - qsci4_include_path="${QSCINTILLA_DIR}/include" - else - qsci4_include_path=no - fi - fi - - if test x${qsci4_include_path} = xno ; then - # --- "no" --- no native installation, try to find in Qt - qsci4_include_path="${QT_DIR}/include${QTINC}/Qsci" - qsci4_cppflags=" -I$qsci4_include_path" - # " -I${QT_DIR}/include${QTINC}" is included in qt4_cppflags - else - if test x${qsci4_include_path} = xyes ; then - # --- "yes" --- try to find in /usr/include/Qsci - qsci4_include_path="/usr/include${QTINC}/Qsci" - qsci4_cppflags=" -I$qsci4_include_path" - # " -I/usr/include${QTINC}" is included in qt4_cppflags or by default (if QTINC is empty) - else - # --- "other" --- try to find in given dir - qsci4_cppflags=" -I$qsci4_include_path/Qsci -I$qsci4_include_path" - fi - fi - - AC_MSG_NOTICE($qsci4_cppflags) - - # --- check if qsci4 libraries directory is defined - qsci4_library_path="" - - AC_ARG_WITH([qsci4-libraries], - AC_HELP_STRING([--with-qsci4-libraries@<:@=DIR@:>@], [where the Qsci4 libraries are: default @<:@$QTDIR/lib@:>@ or @<:@/usr/lib@:>@]), - [qsci4_library_path=$withval]) - - if test x${qsci4_library_path} = x ; then - # --- "" --- try to use QSCINTILLA_DIR/lib - if test "x${QSCINTILLA_DIR}" != "x" ; then - qsci4_library_path="${QSCINTILLA_DIR}/lib" - else - qsci4_library_path=no - fi - fi - - if test x${qsci4_library_path} = xno ; then - # --- "no" --- no native installation, try to find in Qt - qsci4_library_path="${QT_DIR}/lib" - else - if test x${qsci4_library_path} = xyes ; then - # --- "yes" --- try to find in /usr/lib - qsci4_library_path="/usr/lib" - fi - fi - - AC_MSG_NOTICE($qsci4_library_path) - - # saving values for compilation variables - saved_CPPFLAGS=$CPPFLAGS - saved_LDFLAGS=$LDFLAGS - saved_LIBS=$LIBS - - # ask for qsci4 support - AC_MSG_NOTICE([checking whether qscintilla for qt4 headers are present]) - - # --- we test the header file presence and usability - CPPFLAGS="${CPPFLAGS} ${qsci4_cppflags} ${qt4_cppflags}" - AC_LANG_PUSH(C++) - AC_CHECK_HEADERS([qsciscintilla.h], - [qsci4_header_found=yes], - [qsci4_header_found=no], - []) - AC_LANG_POP(C++) - if test x${qsci4_header_found} = xyes - then - AC_SUBST(qsci4_cppflags) - - # --- we test the library file presence and usability - if test x${qsci4_library_path} = x/usr/lib/qt4/lib - then - qsci4_library_path=/usr/lib - fi - if test x${qsci4_library_path} = x/usr/lib - then - qsci4_ldflags="" - else - qsci4_ldflags="-L$qsci4_library_path" - fi - - AC_MSG_NOTICE([checking whether qscintilla2 library is present]) - qsci4_libs=-lqscintilla2 - AC_CHECK_FILE([${qsci4_library_path}/libqscintilla2.so], - [qsci4_library_found=yes], - [qsci4_library_found=no]) - if test x${qsci4_library_found} = xyes - then - AC_MSG_NOTICE([qscintilla for qt4 support]) - AC_SUBST(qsci4_ldflags) - AC_SUBST(qsci4_libs) - WITH_QSCI4=1 - qscintilla_ok=yes - fi - - else - AC_MSG_NOTICE([no support for qscintilla for qt4]) - fi - - # restoring saved values - CPPFLAGS=$saved_CPPFLAGS - LDFLAGS=$saved_LDFLAGS - LIBS=$saved_LIBS - - else - # --- end: check qscintilla only when qt4 OK - # ---------------------------------------------------------------------- - AC_MSG_NOTICE([qscintilla for qt4 not checked because Qt4 not wanted or not detected]) - fi - - # Propagate test into atlocal - AC_SUBST(WITH_QSCI4) - - # Propagate test into Makefiles... - AM_CONDITIONAL(WITH_QSCI4, test $WITH_QSCI4 = 1) - - # ... and into source files - AC_DEFINE_UNQUOTED(HAS_QSCI4, $WITH_QSCI4, [QsciScintilla library]) - -]) diff --git a/m4/production.m4 b/m4/production.m4 deleted file mode 100644 index a7d0785..0000000 --- a/m4/production.m4 +++ /dev/null @@ -1,102 +0,0 @@ -dnl Copyright (C) 2009-2019 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, or (at your option) any later version. -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$ -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/src/bases/make_begin.am b/src/bases/make_begin.am deleted file mode 100644 index a8968fb..0000000 --- a/src/bases/make_begin.am +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2009-2019 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -## -# Here any commonly used variables can be defined -## - -# Standard directory for installation -salomeincludedir = $(includedir)/salome -libdir = $(prefix)/lib/salome -bindir = $(prefix)/bin/salome -salomescriptdir = $(bindir) - -# Directory for installing resource files -salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ - -# Documentation directory -docdir = $(datadir)/doc/salome - -# translation (*.qm) files generation (lrelease) -%.qm: resources/%.ts - $(QT_DIR)/bin/lrelease $< -qm $@ - -- 2.39.2