Join modifications from branch BR_DEBUG_3_2_0b1

diff --git a/config_files/check_lib_location_suffix.m4 b/config_files/check_lib_location_suffix.m4
new file mode 100644 (file)
index 0000000..87b8441
--- /dev/null
+++ b/config_files/check_lib_location_suffix.m4
@@ -0,0 +1,40 @@
+dnl  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+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.
+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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl
+dnl
+dnl
+dnl @synopsis CHECK_LIB_LOCATION_SUFFIX
+dnl
+dnl Check warning flags for C++ compiler to control warning messages
+dnl
+dnl @author Eugeny Nikolaev (OCN) - 29/05/2009
+dnl
+
+
+AC_DEFUN([CHECK_LIB_LOCATION_SUFFIX],[
+
+    AC_CHECKING(for LIB_LOCATION_SUFFIX)
+    LIB_LOCATION_SUFFIX=""
+    case "$build_cpu" in
+    x86_64*)  LIB_LOCATION_SUFFIX="64" ;;
+    *)        LIB_LOCATION_SUFFIX="" ;;
+    esac
+    AC_SUBST(LIB_LOCATION_SUFFIX)
+
+])

diff --git a/config_files/check_qt.m4 b/config_files/check_qt.m4
index db765d6d355ddabf91d57cfbc6756a93b8ef20d2..bc45ba9ad50670fb5d6b2ea4e9d1c976af9ec454 100644 (file)
--- a/config_files/check_qt.m4
+++ b/config_files/check_qt.m4
@@ -109,7 +109,7 @@ if  test "x$qt_ok" = "xyes"
 then
   AC_MSG_CHECKING(linking qt library)
   LIBS_old=$LIBS
-  LIBS="$LIBS -L$QTDIR/lib -lqt-mt $OGL_LIBS"
+  LIBS="$LIBS -L$QTDIR/lib${LIB_LOCATION_SUFFIX} -lqt-mt $OGL_LIBS"
 
   CXXFLAGS_old=$CXXFLAGS
   CXXFLAGS="$CXXFLAGS -I$QTDIR/include"
@@ -131,8 +131,8 @@ then
     AC_MSG_RESULT(QTDIR environment variable may be wrong)
   else
     AC_MSG_RESULT(yes)
-       QT_LIBS="-L$QTDIR/lib -lqt-mt"
-    QT_MT_LIBS="-L$QTDIR/lib -lqt-mt"
+       QT_LIBS="-L$QTDIR/lib${LIB_LOCATION_SUFFIX} -lqt-mt"
+    QT_MT_LIBS="-L$QTDIR/lib${LIB_LOCATION_SUFFIX} -lqt-mt"
   fi
 
   LIBS=$LIBS_old

diff --git a/configure.in.base b/configure.in.base
index bf7377d47fa6cc0fdb4398b111bbd46b3b6225e2..e7620bcb84f4ea5479608d235bacb8f2d992b62d 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -8,6 +8,8 @@ AC_PROG_CXX
 AC_PROG_CXXCPP
 AC_PATH_XTRA
 
+CHECK_LIB_LOCATION_SUFFIX
+
 CHECK_QT
 
 AC_ENABLE_STATIC(no)

diff --git a/src/Makefile.am b/src/Makefile.am
index fb3312b5cb193700bc119ea0574859210710494d..3d7dfb1c86a4d8c470c50ab7e280bf1711692b32 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = ghxx2salome
 
 AM_CPPFLAGS = -I ${QTDIR}/include -DBINDIR="\"${bindir}\""
-LDADD = -L${QTDIR}/lib -lqt-mt
+LDADD = -L${QTDIR}/lib${LIB_LOCATION_SUFFIX} -lqt-mt
 CLEANFILES = hxx2salome_moc.cpp hxx2salome.h hxx2salome.cpp
 
 ghxx2salome_SOURCES = main.cpp hxx2salome.cpp hxx2salome_moc.cpp