Diff for /python/pyGiNaC/setup4.py between versions 1.8 and 1.9

version 1.8, 2001/11/26 22:37:44 version 1.9, 2001/11/27 18:41:06
Line 72  include_dirs = [] #['tools']  # Uncommen Line 72  include_dirs = [] #['tools']  # Uncommen
 sources = []  sources = []
   
 #++++++++++++++++ GiNaC,CLN (,GMP) +++++++++++++++++++++++++++  #++++++++++++++++ GiNaC,CLN (,GMP) +++++++++++++++++++++++++++
 gmp_so = '/usr/lib/libgmp.so' # fix this path if CLN uses gmp.  
 s,ginac_version=commands.getstatusoutput (ginac_config+' --version')  s,ginac_version=commands.getstatusoutput (ginac_config+' --version')
 if not s:  if not s:
     print 'GiNaC Version',ginac_version      print 'GiNaC Version',ginac_version
Line 80  if not s: Line 79  if not s:
     ginac_so = os.path.join (ginac_prefix,'lib','libginac.so')      ginac_so = os.path.join (ginac_prefix,'lib','libginac.so')
     if os.path.isfile(ginac_so):      if os.path.isfile(ginac_so):
         extra_objects.append (ginac_so)          extra_objects.append (ginac_so)
         s,cln_version=commands.getstatusoutput ('cln-config --version')  
         if not s:  
             print 'CLN Version',cln_version  
             cln_prefix = commands.getoutput ('cln-config --prefix')  
             cln_so = os.path.join (cln_prefix,'lib','libcln.so')  
             cln_libs = commands.getoutput ('cln-config --libs')  
             if os.path.isfile (cln_so):  
                 extra_objects.append(cln_so)  
                 cln_libs = cln_libs.replace ('-lcln ',' ')  
             if re.match (r'.*-lgmp\b',cln_libs) and os.path.isfile (gmp_so):  
                 extra_objects.append(gmp_so)  
                 cln_libs = cln_libs.replace ('-lgmp',' ')  
             if re.match (r'.*-l',cln_libs):  
                 extra_link_args.append(cln_libs)  
             cln_flags = commands.getoutput ('cln-config --cppflags')  
             if cln_flags:  
                 extra_compile_args.append (cln_flags)  
         else:  
             libraries += ['cln']  
             print 'Failed to establish CLN using cln-config. Using defaults.'  
     else:      else:
         extra_link_args.append (commands.getoutput (ginac_config +' --libs'))          extra_link_args.append (commands.getoutput (ginac_config +' --libs'))
     extra_compile_args.append (commands.getoutput (ginac_config+' --cppflags'))      extra_compile_args.append (commands.getoutput (ginac_config+' --cppflags'))
 else:  else:
     print 'Failed to establish GiNaC using ginac-config. Using defaults.'      print 'Failed to establish GiNaC using ginac-config. Using defaults.'
     libraries += ['ginac','cln']      libraries += ['ginac']
   
 #++++++++++++++++++++ boost.python +++++++++++++++++++++  #++++++++++++++++++++ boost.python +++++++++++++++++++++
   

Removed from v.1.8  
changed lines
  Added in v.1.9


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>