Changeset 30525 in project


Ignore:
Timestamp:
03/04/14 22:56:12 (7 years ago)
Author:
felix winkelmann
Message:

g2 1.3: fixed setup/configuration bugs reported by sjamaan

Location:
release/4/g2
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • release/4/g2/tags/1.3/g2.scm

    r25836 r30525  
    134134                 int icon_width, int icon_height);
    135135<#
     136
     137(cond-expand
     138 ((not have-x11)
     139  (define (stub loc)
     140    (lambda _
     141      (error loc "This procedure requires libX11 to be installed")))
     142  (define g2:open-x11 (stub 'g2:open-x11))
     143  (define g2:open-x11x (stub 'g2:open-x11x)))
     144 (else))
    136145
    137146#>?
     
    227236  (define g2:gd-png (stub 'g2:gd-png))
    228237  (define g2:gd-jpeg (stub 'g2:gd-jpeg))
    229   (define g2:open-gd (stub 'g2:open-gd))))
     238  (define g2:open-gd (stub 'g2:open-gd)))
     239 (else))
    230240
    231241); end module
  • release/4/g2/tags/1.3/g2.setup

    r24028 r30525  
    1616          ,@(if has-gd '(-feature have-gd -C -DHAVE_GD -lgd) '()) ) )
    1717
    18 ;(run (csc g2.scm -s -O2 -d0  -X easyffi g2.import.scm))
     18(install-extension 'g2 '("g2.so" "g2.import.so"))
    1919
    20 (install-extension
    21  'g2
    22  '("g2.so" "g2.import.so")
    23  '((version 1.3) ) )
    24 
  • release/4/g2/trunk/g2.scm

    r25836 r30525  
    134134                 int icon_width, int icon_height);
    135135<#
     136
     137(cond-expand
     138 ((not have-x11)
     139  (define (stub loc)
     140    (lambda _
     141      (error loc "This procedure requires libX11 to be installed")))
     142  (define g2:open-x11 (stub 'g2:open-x11))
     143  (define g2:open-x11x (stub 'g2:open-x11x)))
     144 (else))
    136145
    137146#>?
     
    227236  (define g2:gd-png (stub 'g2:gd-png))
    228237  (define g2:gd-jpeg (stub 'g2:gd-jpeg))
    229   (define g2:open-gd (stub 'g2:open-gd))))
     238  (define g2:open-gd (stub 'g2:open-gd)))
     239 (else))
    230240
    231241); end module
  • release/4/g2/trunk/g2.setup

    r24028 r30525  
    1616          ,@(if has-gd '(-feature have-gd -C -DHAVE_GD -lgd) '()) ) )
    1717
    18 ;(run (csc g2.scm -s -O2 -d0  -X easyffi g2.import.scm))
     18(install-extension 'g2 '("g2.so" "g2.import.so"))
    1919
    20 (install-extension
    21  'g2
    22  '("g2.so" "g2.import.so")
    23  '((version 1.3) ) )
    24 
Note: See TracChangeset for help on using the changeset viewer.