Integration of 0019971: A patch for cmake compilation.

[modules/kernel.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4d28fad9fccbf5a2802b385aefc4e514757446a2..e48747ab9b37040142f4ba7bf9deb86d264928b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # ================================================================
 #
 #AC_PREREQ(2.59)
-AC_INIT([Salome2 Project], [4.1.1], [paul.rascle@edf.fr], [SalomeKer])
+AC_INIT([Salome2 Project], [5.0.0], [paul.rascle@edf.fr], [SalomeKERNEL])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...
@@ -14,7 +14,7 @@ AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([tar-pax])
 #AC_CONFIG_HEADER([config.h])
 
-XVERSION=0x040101
+XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
 AC_SUBST(XVERSION)
 
 # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
@@ -475,39 +475,12 @@ else
    AC_SUBST(SETX) SETX="set -x"
 fi
 
-echo 
-echo ---------------------------------------------
-echo copying resource files, shell scripts, and 
-echo xml files
-echo ---------------------------------------------
-echo
-
-
-mkdir -p bin/salome
-cd bin/salome
-for i in  `find $ROOT_SRCDIR/bin`
-do
-  local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR/bin,.,"`
-  case "$local_bin" in
-        *.in | *~) ;;
-        . | */CVS | */CVS/* | ./salome) ;;
-        ./appliskel |./appliskel/env.d) $INSTALL -d $local_bin ; echo $local_bin ;;
-        *) $INSTALL $i $local_bin; echo $local_bin ;;
-  esac
-done
-cd $ROOT_BUILDDIR
-
 echo
 echo ---------------------------------------------
 echo generating Makefiles and configure files
 echo ---------------------------------------------
 echo
 
-AC_OUTPUT_COMMANDS([ \
-       chmod +x ./bin/*; \
-       chmod +x ./bin/salome/* \
-])
-
 # This list is initiated using autoscan and must be updated manually
 # when adding a new file <filename>.in to manage. When you execute
 # autoscan, the Makefile list is generated in the output file configure.scan.
@@ -521,7 +494,6 @@ AC_OUTPUT([ \
        Makefile \
        ./bin/Makefile \
        ./bin/VERSION \
-       ./bin/runIDLparser \
        ./doc/Makefile \
        ./doc/salome/Makefile \
        ./doc/salome/tui/Makefile \
@@ -532,7 +504,6 @@ AC_OUTPUT([ \
        ./resources/Makefile \
        ./resources/KERNELCatalog.xml \
        ./resources/CatalogResources.xml \
-       ./resources/DEPRECATED/Plugin \
        ./src/Makefile \
        ./src/Basics/Makefile \
        ./src/Basics/Test/Makefile \