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 d197275873da1bc97fa61b99d20cb9dc91ab691e..2754dbdb3b3e0f239c683e3617e79aed8917bc29 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -23,6 +23,14 @@
 #
 # ---
 #
+
+# ============================================================
+# 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 92736e296589e0074ebee812afa4482636d7c67e..7bc399c415a78459dcc42cf813cdf3c8694eeac8 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -71,34 +71,16 @@ 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 \
         -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
@@ -111,10 +93,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
 
@@ -134,11 +116,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 15404bf04b834be0a63b99a625c4035926cb1eca..ff9667b4f147cce0937589390a6915315c0e5684 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # ---
 
 AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [5.1.2], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN])
-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])
@@ -95,7 +95,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
 
@@ -429,7 +429,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 2befccb9119ebb2ea429516ba6ee59aa3c0bd894..1f7d913bd207a0e0af4bb6e5eaffee535cf17840 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -52,7 +52,6 @@ libSalomeIDLGHS3DPRLPLUGIN_la_CPPFLAGS = \
        $(SMESH_CXXFLAGS) \
        @CORBA_CXXFLAGS@ \
        @CORBA_INCLUDES@ \
-       -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl
 
 libSalomeIDLGHS3DPRLPLUGIN_la_LDFLAGS = -no-undefined -version-info=0:0:0
@@ -77,8 +76,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 \
@@ -114,7 +112,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/GHS3DPRLPlugin/Makefile.am b/src/GHS3DPRLPlugin/Makefile.am
index 28c2d41a535c8dc30d21b64a2840a275496a1630..be631027de7e5146544d1f074c40057a6fb48ccf 100644 (file)
--- a/src/GHS3DPRLPlugin/Makefile.am
+++ b/src/GHS3DPRLPlugin/Makefile.am
@@ -52,8 +52,7 @@ libGHS3DPRLEngine_la_CPPFLAGS =       \
        $(CORBA_CXXFLAGS)       \
        $(CORBA_INCLUDES)       \
        $(BOOST_CPPFLAGS)       \
-       -I$(top_builddir)/idl   \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGHS3DPRLEngine_la_LDFLAGS  =                        \
        ../../idl/libSalomeIDLGHS3DPRLPLUGIN.la \

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 4d5ba5bd8f9d0387e7c7a99514b0d9b948496f61..16f8f70ba85eba77284ac7ef6255f680b4053298 100644 (file)
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -57,8 +57,7 @@ libGHS3DPRLPluginGUI_la_CPPFLAGS =    \
        $(CORBA_CXXFLAGS)               \
        $(CORBA_INCLUDES)               \
        -I$(srcdir)/../GHS3DPRLPlugin   \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 libGHS3DPRLPluginGUI_la_LDFLAGS =              \
        ../GHS3DPRLPlugin/libGHS3DPRLEngine.la  \