Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdenetwork

10 years ago · f166176868
parent ecc461cfc7 664adfa61b
commit f166176868
2 changed files with 6 additions and 5 deletions
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@ -9,6 +9,11 @@
 #
 #################################################

+# required stuff
+tde_setup_architecture_flags( )
+find_package( TQt )
+find_package( TDE )
+
 ##### check for gcc visibility support #########
 # FIXME
 # This should check for [T]Qt3 visibility support
@ -27,10 +32,6 @@ if( BUILD_KOPETE OR BUILD_KPPP )
  check_include_file( string.h HAVE_STRING_H )
 endif( )

-# required stuff
-find_package( TQt )
-find_package( TDE )
-
 if( WITH_SLP )
  check_library_exists( slp "SLPOpen" "" HAVE_SLP )
  if( HAVE_SLP )
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090