[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/bksys
From:       Harald Fernengel <harry () kdevelop ! org>
Date:       2006-02-24 14:24:47
Message-ID: 1140791087.660605.5069.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 513106 by harald:

my SuSE 10 doesn't ship a pkg-config file to libgif, so fall back to the
old-fashioned lib recognition if pkg-config returns no match


 M  +6 -5      libgif.py  


--- trunk/KDE/kdelibs/bksys/libgif.py #513105:513106
@@ -28,7 +28,12 @@
 		pkgs.generate(env)
 
 		have_lib = 0
-		if env['HAVE_PKGCONFIG'] == 0:
+		if env['HAVE_PKGCONFIG'] != 0:
+			have_lib = env.pkgConfig_findPackage('GIF', 'libgif', '4.0')
+			if not have_lib:
+				have_lib = env.pkgConfig_findPackage('GIF', 'libungif', '4.0')
+
+                if not have_lib:
 			conf = env.Configure()
 			if conf.CheckHeader('gif_lib.h'):
 				if conf.CheckLib('gif'):
@@ -48,10 +53,6 @@
 					conf.env['LIB_GIF']      = [ 'libungif' ]
 					have_lib = 1
 			env = conf.Finish()
-		else:
-			have_lib = env.pkgConfig_findPackage('GIF', 'libgif', '4.0')
-			if not have_lib:
-				have_lib = env.pkgConfig_findPackage('GIF', 'libungif', '4.0')
 
 		env.write_lib_header( 'libgif', have_lib, False )
 
[prev in list] [next in list] [prev in thread] [next in thread]