From: adam <adam>
Date: Thu, 14 Oct 2010 10:38:46 +0000 (+0000)
Subject: Fix some tiny bug with 64 bits and :
X-Git-Tag: V5_1_5rc1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=19a781b93ee0ad2e59693af3b7dea24a6692c17d;p=modules%2Fgui.git

Fix some tiny bug with 64 bits and :
python 2.6
native products
---

diff --git a/adm_local/unix/config_files/check_pyqt.m4 b/adm_local/unix/config_files/check_pyqt.m4
index c23dac6d5..3b2111d6b 100644
--- a/adm_local/unix/config_files/check_pyqt.m4
+++ b/adm_local/unix/config_files/check_pyqt.m4
@@ -151,6 +151,9 @@ if test "x$pyqt_ok" == "xyes" ; then
     TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/PyQt4"
     TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/dist-packages/PyQt4"
     TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/pymodules/python${PYTHON_VERSION}/PyQt4"
+    if test "${build_cpu::6}" = "x86_64" ; then
+      TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib64/python2.6/site-packages/PyQt4"
+    fi
     TEST_SIPS_DIRS="${TEST_SIPS_DIRS} /usr/share/sip"
     TEST_SIPS_DIRS="${TEST_SIPS_DIRS} /usr/share/sip/PyQt4"
 
diff --git a/adm_local/unix/config_files/check_qwt.m4 b/adm_local/unix/config_files/check_qwt.m4
index e007e76f9..d834777d8 100644
--- a/adm_local/unix/config_files/check_qwt.m4
+++ b/adm_local/unix/config_files/check_qwt.m4
@@ -67,6 +67,25 @@ if test -z $QWTHOME; then
         fi
      done
   fi
+  if test "x$exist_ok" = "xno"; then
+     if test "${build_cpu::6}" = "x86_64" ; then
+       for d in /usr /usr/local ; do
+          for extension in qwt-qt4 qwt; do
+             AC_CHECK_FILE(${d}/lib64/lib${extension}.so,exist_ok=yes,exist_ok=no)
+             if test "x$exist_ok" = "xyes"; then
+                QWTHOME=$d
+                AC_MSG_RESULT(lib${extension}.so detected in $d/lib)
+                libqwt_name=${extension}
+                dnl  break, libqwt-qt4.so is choosen before libqwt.so since it is surely the Qt4 version.
+                break
+             fi
+          done
+          if test "x$exist_ok" = "xyes"; then
+             break
+          fi
+       done
+    fi
+  fi
   if test "x$exist_ok" = "xno"; then
      for d in `echo $LD_LIBRARY_PATH | sed -e "s/:/ /g"` ; do
         if test -f $d/libqwt.so ; then
diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4
index 9fa0d1b94..0234ec580 100644
--- a/adm_local/unix/config_files/check_sip.m4
+++ b/adm_local/unix/config_files/check_sip.m4
@@ -74,6 +74,9 @@ if test "x$sip_ok" = "xyes" ; then
     TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages"
     TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/dist-packages/PyQt4"
     TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib${LIB_LOCATION_SUFFIX}/pymodules/python${PYTHON_VERSION}"
+    if test "${build_cpu::6}" = "x86_64" ; then
+      TEST_LIB_DIRS="${TEST_LIB_DIRS} /usr/lib64/python${PYTHON_VERSION}/site-packages"
+    fi
     dnl Search sip.h file
     sip_ok=no
     for d in ${TEST_INC_DIRS} ; do