Update of /cvsroot/freevo/freevo/lib/pyimlib2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11785

Modified Files:
        setup.py 
Log Message:
auto detect imlib2 and sdl paths

Index: setup.py
===================================================================
RCS file: /cvsroot/freevo/freevo/lib/pyimlib2/setup.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup.py    23 Aug 2004 01:39:27 -0000      1.3
--- setup.py    23 Aug 2004 09:19:42 -0000      1.4
***************
*** 1,8 ****
  from distutils.core import setup, Extension
  import os
  
  files = ["imlib2.c", "image.c", "font.c", "rawformats.c", "display.c"]
! includes = []
! libs = ["Imlib2", "rt", "X11"]
  
  config_h = open('config.h', 'w')
--- 1,43 ----
  from distutils.core import setup, Extension
  import os
+ import sys
  
  files = ["imlib2.c", "image.c", "font.c", "rawformats.c", "display.c"]
! 
! include_dirs = []
! library_dirs = []
! libraries    = ['rt']
! 
! def check_config(name, minver):
!     """
!     Check dependencies add add the flags to include_dirs, library_dirs and
!     libraries. The basic logic is taken from pygame.
!     """
!     command = name + '-config --version --cflags --libs 2>/dev/null'
!     try:
!         config = os.popen(command).readlines()
!         if len(config) == 0:
!             raise ValueError, 'command not found'
!         flags  = (' '.join(config[1:]) + ' ').split()
!         ver = config[0].strip()
!         if minver and ver < minver:
!             err= 'requires %s version %s (%s found)' % \
!                  (name, minver, ver)
!             raise ValueError, err
!         for f in flags:
!             if f[:2] == '-I':
!                 include_dirs.append(f[2:])
!             if f[:2] == '-L':
!                 library_dirs.append(f[2:])
!             if f[:2] == '-l':
!                 libraries.append(f[2:])
!         return True
!     except Exception, e:
!         print 'WARNING: "%s-config" failed: %s' % (name, e)
!         return False
! 
! 
! if not check_config('imlib2', '1.1.1'):
!     sys.exit(1)
  
  config_h = open('config.h', 'w')
***************
*** 10,20 ****
  try:
      import pygame
!     if not os.path.isdir('/usr/include/python2.3/pygame/'):
          raise ImportError
!     print 'building pygame extention'
!     includes += ['/usr/include/SDL', '/usr/include/python2.3/pygame/', 
'/usr/local/include/SDL']
      config_h.write('#define USE_PYGAME\n')
  except ImportError:
!     pass
  
  config_h.close()
--- 45,60 ----
  try:
      import pygame
!     inc = pygame.__path__[0]
!     inc = inc[:inc.rfind('site-packages')] + 'pygame'
!     inc = inc[:inc.rfind('/lib/')] + '/include' + inc[inc.rfind('/lib/')+4:]
!     if not os.path.isdir(inc):
          raise ImportError
!     if not check_config('sdl', '1.2.5'):
!         raise ImportError
!     print 'pygame extention enabled'
!     include_dirs.append(inc)
      config_h.write('#define USE_PYGAME\n')
  except ImportError:
!     print 'pygame extention disabled'
  
  config_h.close()
***************
*** 24,30 ****
                Extension("_Imlib2module", 
                        files,
!                       library_dirs=["/usr/X11R6/lib"],
!                         include_dirs=includes,
!                       libraries=libs)
        ],
        py_modules=["Imlib2"]
--- 64,70 ----
                Extension("_Imlib2module", 
                        files,
!                       library_dirs=library_dirs,
!                         include_dirs=include_dirs,
!                       libraries=libraries)
        ],
        py_modules=["Imlib2"]



-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to