linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 402
fixes bug(s): https://launchpad.net/bugs/671384
committer: Razzloss <razzloss@xxxxxxxxx>
branch nick: master
timestamp: Thu 2010-11-25 18:54:23 +0200
message:
  Move libnotify check last to fix a problem with other checks failing to link due to missing -lgtk
modified:
  SConstruct


--
lp:linuxdcpp
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk

Your team LinuxDC++ Team is subscribed to branch lp:linuxdcpp.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk/+edit-subscription

=== modified file 'SConstruct'
--- SConstruct	2010-10-14 04:31:03 +0000
+++ SConstruct	2010-11-25 16:54:23 +0000
@@ -179,13 +179,6 @@
 		print '\tNote: You might have the lib but not the headers'
 		Exit(1)
 
-	# TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies
-	if not conf.CheckPKG('libnotify >= 0.4.1'):
-		print '\tlibnotify >= 0.4.1 not found, disabling notifications.'
-		print '\tNote: You might have the lib but not the headers'
-	else:
-		conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY')
-		conf.env.ParseConfig('pkg-config --libs libnotify')
 	
 	if not conf.CheckCXXHeader('boost/version.hpp', '<>'):
 		print '\tboost not found.'
@@ -240,6 +233,14 @@
 	if conf.CheckHeader(['sys/types.h', 'sys/socket.h', 'ifaddrs.h', 'net/if.h']):
 		conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H')
 
+	# TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies
+	if not conf.CheckPKG('libnotify >= 0.4.1'):
+		print '\tlibnotify >= 0.4.1 not found, disabling notifications.'
+		print '\tNote: You might have the lib but not the headers'
+	else:
+		conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY')
+		conf.env.ParseConfig('pkg-config --libs libnotify')
+
 	conf.CheckBZRRevision()
 
 	env = conf.Finish()