Correction.

diff --git a/salome_adm/unix/config_files/Makefile.am b/salome_adm/unix/config_files/Makefile.am
index 0c325253e4179937d13199d19b9e236fac6efa96..bd95886a530e662cf4e53b593cb022d764c32266 100644 (file)
--- a/salome_adm/unix/config_files/Makefile.am
+++ b/salome_adm/unix/config_files/Makefile.am
@@ -79,7 +79,8 @@ check_withihm.m4 \
 enable_pthreads.m4 \
 production.m4 \
 pyembed.m4 \
-python.m4
+python.m4 \
+check_libxml.m4
 
 dist_salome4depr_DATA=\
 $(DEPRECATED_FILES)

diff --git a/salome_adm/unix/config_files/check_libxml.m4 b/salome_adm/unix/config_files/check_libxml.m4
index 29fc1c31b926833ffd7970efb9a01fb08bc33c9d..ad4841c008d8720d40c14850ab2f17e5dd74ebbd 100644 (file)
--- a/salome_adm/unix/config_files/check_libxml.m4
+++ b/salome_adm/unix/config_files/check_libxml.m4
@@ -1,38 +1,53 @@
 AC_DEFUN([CHECK_LIBXML],[
 
-AC_CHECKING(for libxml)
+AC_CHECKING(for libxml library)
+
+AC_SUBST(LIBXML_INCLUDES)
+AC_SUBST(LIBXML_LIBS)
+
+LIBXML_INCLUDES=""
+LIBXML_LIBS=""
+
+libxml_ok=no
+
+LOCAL_INCLUDES=""
+LOCAL_LIBS=""
 
-# Custom location of libxml2 package can be specified
-# through LIBXML_DIR variable
 if test "x$LIBXML_DIR" != "x"
 then
-  CPPFLAGS="$CPPFLAGS -I$LIBXML_DIR/include/libxml2"
-  TMPLIBS="-L$LIBXML_DIR/lib -lxml2 $LIBS"
+  LOCAL_INCLUDES="-I$LIBXML_DIR/include/libxml2"
+  LOCAL_LIBS="-L$LIBXML_DIR/lib -lxml2"
 else
-  CPPFLAGS="$CPPFLAGS -I/usr/include/libxml2"
-  TMPLIBS="-lxml2 $LIBS"
+  LOCAL_INCLUDES="-I/usr/include/libxml2"
+  LOCAL_LIBS="-lxml2"
 fi
 
+dnl libxml2 headers
+
+CPPFLAGS_old="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES"
 AC_CHECK_HEADER(libxml/parser.h,libxml_ok="yes",libxml_ok="no")
+CPPFLAGS="$CPPFLAGS_old"
 
 if  test "x$libxml_ok" = "xyes"
 then
+
+dnl libxml2 library
+
   LIBS_old=$LIBS
-  LIBS=$TMPLIBS
+  LIBS="$LIBS $LOCAL_LIBS"
   AC_CHECK_LIB(xml2,xmlInitParser,libxml_ok="yes",libxml_ok="no",)
   LIBS=$LIBS_old
 fi
 
 if test "x$libxml_ok" = "xyes"
 then
-  LIBS=$TMPLIBS
+  LIBXML_INCLUDES="$LOCAL_INCLUDES"
+  LIBXML_LIBS="$LOCAL_LIBS"
 fi
 
 AC_MSG_RESULT(for libxml: $libxml_ok)
 
-LIBXML_LIBS=$LIBS
-AC_SUBST(LIBXML_LIBS)
-
 ])dnl
 dnl
 

diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index 4b681f518826431d13d6583b200c4e7c5307e3af..e9e6f065b95e467152ad10b79651790dd0e6b784 100644 (file)
--- a/src/Container/Makefile.am
+++ b/src/Container/Makefile.am
@@ -75,7 +75,7 @@ COMMON_CPPFLAGS=\
        -I$(srcdir)/../HDFPersist \
        -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
-       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ 
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@
 
 # This local variable defines the list of dependant libraries common to all target in this package.
 COMMON_LIBS =\

diff --git a/src/LifeCycleCORBA/Makefile.am b/src/LifeCycleCORBA/Makefile.am
index 2012177ed12bf296a7033dd2ef6c308280fb1c9a..208e60a7bbce499d2d5014470f7ae55079cd817a 100644 (file)
--- a/src/LifeCycleCORBA/Makefile.am
+++ b/src/LifeCycleCORBA/Makefile.am
@@ -58,7 +58,7 @@ COMMON_CPPFLAGS=\
        -I$(srcdir)/../ResourcesManager \
        -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
-       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
+       @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@
 
 # This local variable defines the list of dependant libraries common to all target in this package.
 COMMON_LIBS =\

diff --git a/src/ModuleCatalog/Makefile.am b/src/ModuleCatalog/Makefile.am
index b0a7fb204afba5efd72929f74e2b0cb34bd7e1c2..83f138d3dbb425f2fc535f1c8ae3259da0e5f18e 100644 (file)
--- a/src/ModuleCatalog/Makefile.am
+++ b/src/ModuleCatalog/Makefile.am
@@ -62,6 +62,7 @@ COMMON_CPPFLAGS=\
        -I$(srcdir)/../Utils \
        -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
+       @LIBXML_INCLUDES@ \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 
 # This local variable defines the list of dependant libraries common to all target in this package.
@@ -70,7 +71,8 @@ COMMON_LIBS =\
        ../Utils/libOpUtil.la \
        ../SALOMELocalTrace/libSALOMELocalTrace.la \
        ../Basics/libSALOMEBasics.la \
-       $(top_builddir)/idl/libSalomeIDLKernel.la
+       $(top_builddir)/idl/libSalomeIDLKernel.la \
+       @LIBXML_LIBS@
 
 libSalomeCatalog_la_SOURCES =\
        SALOME_ModuleCatalog_Handler.cxx  \

diff --git a/src/ResourcesManager/Makefile.am b/src/ResourcesManager/Makefile.am
index b617b4b2f825b6de6eb389f4bbe4de01242311bb..4205f936170e5d7b2f21dc988e9453d57c0fba64 100755 (executable)
--- a/src/ResourcesManager/Makefile.am
+++ b/src/ResourcesManager/Makefile.am
@@ -54,14 +54,15 @@ COMMON_CPPFLAGS=\
        -I$(srcdir)/../Utils \
        -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
-       -I/usr/include/libxml2 \
+       @LIBXML_INCLUDES@ \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 
 # This local variable defines the list of dependant libraries common to all target in this package.
 COMMON_LIBS =\
        ../NamingService/libSalomeNS.la \
        ../Utils/libOpUtil.la \
-       $(top_builddir)/idl/libSalomeIDLKernel.la
+       $(top_builddir)/idl/libSalomeIDLKernel.la \
+       @LIBXML_LIBS@
 
 #
 # ===============================================================