Changeset 4061 for neercs


Ignore:
Timestamp:
Nov 29, 2009, 1:41:20 PM (10 years ago)
Author:
Pascal Terjan
Message:
  • Fix build
Location:
neercs/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • neercs/trunk/configure.ac

    r4025 r4061  
    5858  enable_python="yes"
    5959])
     60AC_ARG_ENABLE(ruby,
     61  [  --enable-ruby           build Ruby interpreter (default yes)])
     62AS_IF([test "x$enable_ruby" != "xno"], [
     63  enable_ruby="yes"
     64])
    6065
    6166CACA="no"
     
    109114fi
    110115
     116ac_cv_my_have_ruby="no"
     117if test "${enable_ruby}" != "no"; then
     118  AC_PATH_PROG(RUBY, ruby, no)
     119  if test "${RUBY}" != "no"; then
     120    RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@')"
     121    RUBY_LIBS="-L$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"RUBY_SO_NAME"@:>@')"
     122    AC_SUBST(RUBY_CFLAGS)
     123    AC_SUBST(RUBY_LIBS)
     124    CPPFLAGS="${CPPFLAGS} ${RUBY_CFLAGS}"
     125    AC_CHECK_HEADERS([ruby.h],
     126     [ac_cv_my_have_ruby="yes"])
     127  fi
     128fi
     129AM_CONDITIONAL(USE_RUBY, test "${ac_cv_my_have_ruby}" = "yes")
    111130
    112131# Optimizations
  • neercs/trunk/src/attach.c

    r4059 r4061  
    150150    struct sockaddr_un addr;
    151151
    152     debug("Connecting to %s", screen_list->socket_path[socktype]);
     152    debug("Connecting to %s", screen_list->comm.socket_path[socktype]);
    153153
    154154    /* Open the socket */
  • neercs/trunk/src/lock.c

    r4060 r4061  
    130130
    131131
    132     if (strlen(screen_list->lockmsg))
     132    if (strlen(screen_list->lock.lockmsg))
    133133    {
    134134        x = ((caca_get_canvas_width(cv) - w) / 2) +
    135             (strlen(screen_list->lockmsg));
     135            (strlen(screen_list->lock.lockmsg));
    136136        y += 2;
    137137        caca_set_color_ansi(cv, CACA_RED, CACA_BLUE);
    138         caca_printf(cv, x, y, "Error : %s", screen_list->lockmsg);
     138        caca_printf(cv, x, y, "Error : %s", screen_list->lock.lockmsg);
    139139    }
    140140#endif
     
    197197        perror("failed to look up hostname");
    198198        ret = pam_end(pamh, PAM_ABORT);
    199         sprintf(screen_list->lockmsg, "Can't get hostname");
     199        sprintf(screen_list->lock.lockmsg, "Can't get hostname");
    200200        pam_end(pamh, PAM_SUCCESS);
    201201        return 0;
     
    205205    if (ret != PAM_SUCCESS)
    206206    {
    207         sprintf(screen_list->lockmsg, "Can't set hostname");
     207        sprintf(screen_list->lock.lockmsg, "Can't set hostname");
    208208        pam_end(pamh, PAM_SUCCESS);
    209209        return 0;
     
    213213    if (ret != PAM_SUCCESS)
    214214    {
    215         sprintf(screen_list->lockmsg, "Can't authenticate");
     215        sprintf(screen_list->lock.lockmsg, "Can't authenticate");
    216216        pam_end(pamh, PAM_SUCCESS);
    217217        return 0;
  • neercs/trunk/src/screen_list.c

    r4060 r4061  
    106106   
    107107    memset(screen_list->lock.lockmsg, 0, 1024);
    108 c    memset(screen_list->lock.lockpass, 0, 1024);
    109    
     108    memset(screen_list->lock.lockpass, 0, 1024);
    110109   
    111110    /* Build local config file path */
Note: See TracChangeset for help on using the changeset viewer.