Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 56185e37c8a6b94ee2c6de6dd28f3c3d1db16d9f..2984cd29452a3042803d1f02eb4f2310c82e9fef 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -20,6 +20,14 @@
 # File   : make_common_starter.am
 # Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
 # ---
+
+# ============================================================
+# The following is to avoid PACKAGE_... env variable
+# redefinition compilation warnings
+# ============================================================
+AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
+AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
+
 # ============================================================
 # This file defines the common definitions used in several
 # Makefile. This file must be included, if needed, by the file

diff --git a/build_configure b/build_configure
index c7a682197647d0e2ab1bd7397e748e34e16fc1a6..a999047bb184901b27e8ea45568ee362f72a0a19 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -68,34 +68,15 @@ cd ${CONF_DIR}
 ABS_CONF_DIR=`pwd`
 
 #######################################################################
-mkdir -p salome_adm/unix/config_files
-#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files
-#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix
-
-cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix
-
-#cp -f ${GUI_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
-#cp -f ${MED_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
-#cp -f ${GEOM_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
-#cp -f ${SMESH_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
-
-# remove KERNEL deprecated configure files
-#for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \
-#    check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig ac_cxx_typename.m4 \
-#    check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 missing
-#    do
-#      rm -f salome_adm/unix/config_files/${deprecated}
-#    done
-                     
 
 # ____________________________________________________________________
 # aclocal creates the aclocal.m4 file from the standard macro and the
-# custom macro embedded in the directory salome_adm/unix/config_files
+# custom macro embedded in the directory adm_local/unix/config_files
 # and KERNEL config_files directory.
 # output:
 #   aclocal.m4
 #   autom4te.cache (directory)
-echo "====================================================== aclocal"
+echo "======================================================= aclocal"
 
 aclocal -I adm_local/unix/config_files \
         -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
@@ -109,10 +90,10 @@ aclocal -I adm_local/unix/config_files \
 # version. The files are created in the directory specified with the
 # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac).
 # output:
-#   salome_adm/unix/config_files/config.guess
-#   salome_adm/unix/config_files/config.sub
-#   salome_adm/unix/config_files/ltmain.sh
-#echo "====================================================== libtoolize"
+#   adm_local/unix/config_files/config.guess
+#   adm_local/unix/config_files/config.sub
+#   adm_local/unix/config_files/ltmain.sh
+echo "==================================================== libtoolize"
 
 libtoolize --force --copy --automake || exit 1
 
@@ -132,11 +113,11 @@ autoconf
 # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). This step also
 # creates the Makefile.in files from the Makefile.am files.
 # output:
-#   salome_adm/unix/config_files/compile
-#   salome_adm/unix/config_files/depcomp
-#   salome_adm/unix/config_files/install-sh
-#   salome_adm/unix/config_files/missing
-#   salome_adm/unix/config_files/py-compile
+#   adm_local/unix/config_files/compile
+#   adm_local/unix/config_files/depcomp
+#   adm_local/unix/config_files/install-sh
+#   adm_local/unix/config_files/missing
+#   adm_local/unix/config_files/py-compile
 #   Makefile.in (from Makefile.am)
 echo "====================================================== automake"
 

diff --git a/configure.ac b/configure.ac
index 2779fec9d9a7fb506cd3537b769c0744a31f5f98..28ab0e81680b6d7cf78643ac87813f2627523f09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # ---
 #
 AC_INIT([Salome2 Project BLSURFPLUGIN module], [5.1.2], [webmaster.salome@opencascade.com], [SalomeBLSURFPLUGIN])
-AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
+AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([-Wno-portability])
@@ -92,7 +92,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the
 dnl full-path to the binary instead.
 case "$INSTALL" in
    *install-sh*)
-      INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh
+      INSTALL='\${KERNEL_ROOT_DIR}'/adm_local/unix/config_files/install-sh
       ;;
 esac
 
@@ -401,7 +401,6 @@ echo
 # autoscan, the Makefile list is generated in the output file configure.scan.
 # This could be helpfull to update de configuration.
 AC_OUTPUT([ \
-  salome_adm/unix/SALOMEconfig.h \
   adm_local/Makefile \
   adm_local/unix/Makefile \
   adm_local/unix/config_files/Makefile \

diff --git a/idl/Makefile.am b/idl/Makefile.am
index d12329e9fcd7adee1999a8dd77a4aa384e6a95ad..af8b04eccc601a56e41af0d12806e62012b96ea4 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -47,7 +47,6 @@ libSalomeIDLBLSURFPLUGIN_la_CPPFLAGS = \
        $(SMESH_CXXFLAGS) \
        @CORBA_CXXFLAGS@ \
        @CORBA_INCLUDES@ \
-       -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl
 
 libSalomeIDLBLSURFPLUGIN_la_LDFLAGS = -no-undefined -version-info=0:0:0
@@ -72,8 +71,7 @@ IDLCXXFLAGS = \
        -I$(top_builddir)/idl/salome \
        -I$(KERNEL_ROOT_DIR)/idl/salome \
        -I$(GEOM_ROOT_DIR)/idl/salome \
-       -I$(SMESH_ROOT_DIR)/idl/salome \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(SMESH_ROOT_DIR)/idl/salome
 IDLPYFLAGS  = \
        @IDLPYFLAGS@ \
        -I$(KERNEL_ROOT_DIR)/idl/salome \
@@ -109,7 +107,7 @@ mostlyclean-local:
        @for dep in $^ dummy; do \
          if [ $$dep != "dummy" ]; then \
            echo Building dependencies for $$dep; \
-           $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix $$dep 2>/dev/null | \
+           $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \
            sed 's/\.o/\SK.cc/' >>$@; \
          fi; \
        done ;

diff --git a/src/BLSURFPlugin/Makefile.am b/src/BLSURFPlugin/Makefile.am
index ab7d0267a3d43e1b25038963b8e12ff1c681dd83..aa7f03011f9ee38ed9fbc93bd9e865c77325c148 100644 (file)
--- a/src/BLSURFPlugin/Makefile.am
+++ b/src/BLSURFPlugin/Makefile.am
@@ -41,10 +41,10 @@ dist_libBLSURFEngine_la_SOURCES =   \
        BLSURFPlugin_i.cxx
 
 libBLSURFEngine_la_CPPFLAGS =  \
-   $(QT_INCLUDES)          \
-   $(PYTHON_INCLUDES)      \
-   $(KERNEL_CXXFLAGS)  \
-   $(GUI_CXXFLAGS)             \
+       $(QT_INCLUDES)          \
+       $(PYTHON_INCLUDES)      \
+       $(KERNEL_CXXFLAGS)      \
+       $(GUI_CXXFLAGS)         \
        $(MED_CXXFLAGS)         \
        $(GEOM_CXXFLAGS)        \
        $(CAS_CPPFLAGS)         \
@@ -53,8 +53,7 @@ libBLSURFEngine_la_CPPFLAGS = \
        $(CORBA_CXXFLAGS)       \
        $(CORBA_INCLUDES)       \
        $(BOOST_CPPFLAGS)       \
-       -I$(top_builddir)/idl   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 #Qt uniquement necessaire pour le getActiveStudyDocument de SMeshGuiUtils.h
 

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index 0539f7e0b29d75fa5c8a72a8859f435c349f3275..28c611f08d9e14cc4510448f738522f6a8fb29c5 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -56,9 +56,8 @@ libBLSURFPluginGUI_la_CPPFLAGS =      \
        $(CORBA_INCLUDES)               \
        $(BLSURF_INCLUDES)              \
        -I$(srcdir)/../BLSURFPlugin     \
-       -I$(srcdir)/../PluginUtils  \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(srcdir)/../PluginUtils      \
+       -I$(top_builddir)/idl
 
 libBLSURFPluginGUI_la_LDFLAGS =                        \
        ../BLSURFPlugin/libBLSURFEngine.la      \

diff --git a/src/PluginUtils/Makefile.am b/src/PluginUtils/Makefile.am
index 27d9ca562060b416de962055c21783d2431b342b..2ba0d1231af049ff90e5b7de11b48833de5e8f2f 100644 (file)
--- a/src/PluginUtils/Makefile.am
+++ b/src/PluginUtils/Makefile.am
@@ -47,8 +47,7 @@ libGeomSelectionTools_la_CPPFLAGS =   \
        $(BOOST_CPPFLAGS)               \
        $(CORBA_CXXFLAGS)               \
        $(CORBA_INCLUDES)               \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGeomSelectionTools_la_LDFLAGS =             \
        ${SMESH_LDFLAGS} -lSMESH                \