Changeset 4061 for neercs/trunk
- Timestamp:
- Nov 29, 2009, 1:41:20 PM (12 years ago)
- Location:
- neercs/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
neercs/trunk/configure.ac
r4025 r4061 58 58 enable_python="yes" 59 59 ]) 60 AC_ARG_ENABLE(ruby, 61 [ --enable-ruby build Ruby interpreter (default yes)]) 62 AS_IF([test "x$enable_ruby" != "xno"], [ 63 enable_ruby="yes" 64 ]) 60 65 61 66 CACA="no" … … 109 114 fi 110 115 116 ac_cv_my_have_ruby="no" 117 if 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 128 fi 129 AM_CONDITIONAL(USE_RUBY, test "${ac_cv_my_have_ruby}" = "yes") 111 130 112 131 # Optimizations -
neercs/trunk/src/attach.c
r4059 r4061 150 150 struct sockaddr_un addr; 151 151 152 debug("Connecting to %s", screen_list-> socket_path[socktype]);152 debug("Connecting to %s", screen_list->comm.socket_path[socktype]); 153 153 154 154 /* Open the socket */ -
neercs/trunk/src/lock.c
r4060 r4061 130 130 131 131 132 if (strlen(screen_list->lock msg))132 if (strlen(screen_list->lock.lockmsg)) 133 133 { 134 134 x = ((caca_get_canvas_width(cv) - w) / 2) + 135 (strlen(screen_list->lock msg));135 (strlen(screen_list->lock.lockmsg)); 136 136 y += 2; 137 137 caca_set_color_ansi(cv, CACA_RED, CACA_BLUE); 138 caca_printf(cv, x, y, "Error : %s", screen_list->lock msg);138 caca_printf(cv, x, y, "Error : %s", screen_list->lock.lockmsg); 139 139 } 140 140 #endif … … 197 197 perror("failed to look up hostname"); 198 198 ret = pam_end(pamh, PAM_ABORT); 199 sprintf(screen_list->lock msg, "Can't get hostname");199 sprintf(screen_list->lock.lockmsg, "Can't get hostname"); 200 200 pam_end(pamh, PAM_SUCCESS); 201 201 return 0; … … 205 205 if (ret != PAM_SUCCESS) 206 206 { 207 sprintf(screen_list->lock msg, "Can't set hostname");207 sprintf(screen_list->lock.lockmsg, "Can't set hostname"); 208 208 pam_end(pamh, PAM_SUCCESS); 209 209 return 0; … … 213 213 if (ret != PAM_SUCCESS) 214 214 { 215 sprintf(screen_list->lock msg, "Can't authenticate");215 sprintf(screen_list->lock.lockmsg, "Can't authenticate"); 216 216 pam_end(pamh, PAM_SUCCESS); 217 217 return 0; -
neercs/trunk/src/screen_list.c
r4060 r4061 106 106 107 107 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); 110 109 111 110 /* Build local config file path */
Note: See TracChangeset
for help on using the changeset viewer.