The R Project SVN R

Rev

Rev 79974 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 79974 Rev 80011
Line 61... Line 61...
61 
    else
 61 
    else
62 
       xmodlist="${modlist}"
 62 
       xmodlist="${modlist}"
63 
    fi
 63 
    fi
64 
    CAIRO_CPPFLAGS=`"${PKG_CONFIG}" --cflags ${modlist}`
 64 
    CAIRO_CPPFLAGS=`"${PKG_CONFIG}" --cflags ${modlist}`
65 
    CAIROX11_CPPFLAGS=`"${PKG_CONFIG}" --cflags ${xmodlist}`
 65 
    CAIROX11_CPPFLAGS=`"${PKG_CONFIG}" --cflags ${xmodlist}`
- 
 
 66 
    ## Static builds may currently be impossible as harfbuzz
- 
 
 67 
    ## requires graphite2 and that does not support static building.
66 
    if test "x$use_static_cairo" = xyes; then
 68 
    if test "x$use_static_cairo" = xyes; then
67 
       AC_MSG_NOTICE([using static cairo])
 69 
       AC_MSG_NOTICE([using static pangocairo])
68 
       CAIRO_LIBS=`"${PKG_CONFIG}" --static --libs ${modlist}`
 70 
       CAIRO_LIBS=`"${PKG_CONFIG}" --static --libs ${modlist}`
69 
       CAIROX11_LIBS=`"${PKG_CONFIG}" --static --libs ${xmodlist}`
 71 
       CAIROX11_LIBS=`"${PKG_CONFIG}" --static --libs ${xmodlist}`
70 
    else
 72 
    else
71 
       CAIRO_LIBS=`"${PKG_CONFIG}" --libs ${modlist}`
 73 
       CAIRO_LIBS=`"${PKG_CONFIG}" --libs ${modlist}`
72 
       CAIROX11_LIBS=`"${PKG_CONFIG}" --libs ${xmodlist}`
 74 
       CAIROX11_LIBS=`"${PKG_CONFIG}" --libs ${xmodlist}`