From: enk <enk@opencascade.com>
Date: Mon, 29 May 2006 12:12:47 +0000 (+0000)
Subject: 64 bits platform porting
X-Git-Tag: V3_2_0rc
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0b3e0eea164c94d8f07b6c56d4c1a56839dfcf17;p=tools%2Fhxx2salome.git

64 bits platform porting
---

diff --git a/config_files/check_qt.m4 b/config_files/check_qt.m4
index db765d6..bc45ba9 100644
--- 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 bf7377d..e7620bc 100644
--- 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 fb3312b..3d7dfb1 100644
--- 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