Changeset 3678

Timestamp:

28/11/08 17:54:49 (6 weeks ago)

Author:

dmeyer

Message:

improvde imlib2 checks

Files:

• trunk/display/setup.py (modified) (4 diffs)

trunk/display/setup.py

@@ -42 +42 @@
     print 'kaa.base not installed'
     sys.exit(1)
+
+# check disable parameter
+disable = []
+for arg in sys.argv[:]:
+    if arg.startswith('--disable-'):
+        disable.append(arg[10:])
+        sys.argv.remove(arg)
 
 # config file
@@ -91 +98 @@
         config.define('HAVE_X11_COMPOSITE')
         x11.add_library('XComposite')
-        
+
     features = { 'with': [], 'without': [] }
     imlib2 = get_library('imlib2')
-    if imlib2 and imlib2.compile(['<Imlib2.h>'], 'imlib_context_set_display(NULL);'):
+    if 'imlib2-x11' in disable or 'imlib2' in disable:
+        features['without'].append('imlib2')
+    elif imlib2 and imlib2.compile(['<Imlib2.h>'], 'imlib_context_set_display(NULL);'):
         config.define('USE_IMLIB2_X11')
         x11.add_library('imlib2')
         features['with'].append('imlib2')
-    else:
-        features['without'].append('imlib2')
-
+    elif imlib2:
+        print
+        print 'Imlib2 was compiled without X11 support. Therefore Imlib2 for the'
+        print 'kaa.display.X11 module is disabled. Please re-compile imlib2 with X11'
+        print 'support or add --disable-imlib2-x11 to the setup.py parameter'
+        print
+        sys.exit(1)
+    else:
+        print
+        print 'Imlib2 not found. Therefore Imlib2 for the kaa.display.X11 module is'
+        print 'disabled. Please install imlib2 or add --disable-imlib2 to the setup.py'
+        print 'parameter.'
+        print
+        sys.exit(1)
     if evas and evas.compile(['<Evas.h>', '<Evas_Engine_Software_X11.h>']):
         features['with'].append('evas')
@@ -123 +143 @@
 
 
-if get_library('imlib2'):
-
+if get_library('imlib2') and not 'imlib2' in disable:
     # the framebuffer so module
-    fb = Extension('kaa.display._FBmodule', 
-                   [ 'src/fb.c', 'src/common.c'])
+    fb = Extension('kaa.display._FBmodule', [ 'src/fb.c', 'src/common.c'])
     fb.add_library('imlib2')
     if evas and evas.compile(['<Evas.h>', '<Evas_Engine_FB.h>']):
@@ -156 +174 @@
 
 
-if pygame and get_library('sdl') and get_library('imlib2'):
+if pygame and get_library('sdl') and get_library('imlib2') and not 'imlib2' in disable:
 
     # pygame module