1 files changed, 37 insertions, 22 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 8ae2dad..1bfe83c 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -120,27 +120,6 @@ if( WITH_TDEHWLIB )
 endif( )
 
 
-##### hal #######################################
-
-if( WITH_HAL )
-  pkg_search_module( HAL hal )
-  if( HAL_FOUND )
-    set ( HAVE_HAL 1 )
-    # search for dbus
-    pkg_search_module( DBUS dbus-1 )
-    if( NOT DBUS_FOUND )
-      tde_message_fatal( "dbus-1 is required, but was not found on your system" )
-    endif( )
-    # search for dbus-tqt
-    pkg_search_module( DBUS_TQT dbus-tqt )
-    if( NOT DBUS_TQT_FOUND )
-      tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
-    endif()
-  else ( )
-    tde_message_fatal( "hal is required, but was not found on your system" )
-  endif( )
-endif( )
-
 ##### arts ######################################
 
 if( WITH_ARTS )
@@ -204,13 +183,14 @@ if( WITH_TAGLIB )
   if( NOT TAGLIB_FOUND )
     tde_message_fatal( "taglib is requested, but was not found on your system" )
   endif( )
+  set( HAVE_TAGLIB 1 )
 endif( )
 
 
 ##### mad #######################################
 
 if( WITH_MAD )
-  pkg_search_module( MAD mad )
+  pkg_search_module( MAD libmad mad )
   if( NOT MAD_FOUND )
     tde_message_fatal( "mad is requested, but was not found on your system" )
   endif( )
@@ -263,3 +243,38 @@ if( WITH_LAME )
     tde_message_fatal( "lame is requested, but was not found on your system" )
   endif( )
 endif( )
+
+
+##### check architecture
+
+if( NOT CMAKE_ARCHITECTURE )
+  execute_process(
+    COMMAND ${CMAKE_C_COMPILER} -dumpmachine
+    OUTPUT_VARIABLE CMAKE_ARCHITECTURE
+    ERROR_VARIABLE CMAKE_ARCHITECTURE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_STRIP_TRAILING_WHITESPACE )
+  set( CMAKE_ARCHITECTURE "${CMAKE_ARCHITECTURE}" CACHE INTERNAL "" FORCE )
+  message( STATUS "Detected ${CMAKE_ARCHITECTURE} target architecture" )
+endif( )
+
+
+##### check specific architecture dependant support
+
+if( ${CMAKE_ARCHITECTURE} MATCHES "i.86" )
+
+  # MMX support
+  message( STATUS "Performing MMX support test" )
+  check_c_source_compiles( "
+    int main() {
+      #if defined(__GNUC__)
+      __asm__(\"pxor %mm0, %mm0\");
+      #else
+      #error Not gcc on x86/x86_64
+      #endif
+      return 0;
+    }"
+    HAVE_X86_MMX
+  )
+
+endif( )