Fix libgcc library detection

Fix QT directories detection
Thanks to Francois Andriot
(cherry picked from commit 6221fac26c)

setup.py

@@ -126,7 +126,7 @@ class BuildLibpythonize(Command):
                 
             # Find the C library (libgcc, libgcc_s or some other variation).
             if self.clib is None:
-                canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name() ]
+                canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name(), "/usr/lib" ]
                 self.clib = kdedistutils.FindFileInPaths("libgcc*.so",canidatepaths)
                 if self.clib!=None:
                     self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0]

src/kdedistutils.py

@@ -564,6 +564,9 @@ class BuildKControlModule(Command):
             # Qt inc dir
             if self.qt_inc_dir is None:
                 canidatepaths = []
+                qtinc = os.getenv("QTINC")
+                if qtinc != None:
+                    canidatepaths.append(qtinc)
                 qtdir = os.getenv("QTDIR")
                 if qtdir != None:
                     canidatepaths.append(os.path.join(qtdir,"include"))
@@ -585,6 +588,9 @@ class BuildKControlModule(Command):
             # Qt lib dir
             if self.qt_lib_dir is None:
                 canidatepaths = []
+                qtlib = os.getenv("QTLIB")
+                if qtlib != None:
+                    canidatepaths.append(qtlib)
                 qtdir = os.getenv("QTDIR")
                 if qtdir != None:
                     canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
@@ -634,7 +640,7 @@ class BuildKControlModule(Command):
                 
             # Find the C library (libgcc, libgcc_s or some other variation).
             if self.clib is None:
-                canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name() ]
+                canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name(), "/usr/lib" ]
                 self.clib = FindFileInPaths("libgcc*.so",canidatepaths)
                 if self.clib!=None:
                     self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0]
@@ -1479,6 +1485,9 @@ class BuildKioslave(Command):
             # Qt inc dir
             if self.qt_inc_dir is None:
                 canidatepaths = []
+                qtinc = os.getenv("QTINC")
+                if qtinc != None:
+                    canidatepaths.append(qtinc)
                 qtdir = os.getenv("QTDIR")
                 if qtdir != None:
                     canidatepaths.append(os.path.join(qtdir,"include"))
@@ -1499,6 +1508,9 @@ class BuildKioslave(Command):
             # Qt lib dir
             if self.qt_lib_dir is None:
                 canidatepaths = []
+                qtlib = os.getenv("QTLIB")
+                if qtlib != None:
+                    canidatepaths.append(qtlib)
                 qtdir = os.getenv("QTDIR")
                 if qtdir != None:
                     canidatepaths.append(os.path.join(qtdir,get_libdir_name()))