Changeset 4061 for neercs/trunkTweet

Timestamp:

Nov 29, 2009, 1:41:20 PM (12 years ago)

Author:

Pascal Terjan

Message:

• Fix build

Location:

neercs/trunk

Files:

• configure.ac (modified) (2 diffs)
• src/attach.c (modified) (1 diff)
• src/lock.c (modified) (4 diffs)
• src/screen_list.c (modified) (1 diff)

neercs/trunk/configure.ac

@@ -58 +58 @@
   enable_python="yes"
 ])
+AC_ARG_ENABLE(ruby,
+  [  --enable-ruby           build Ruby interpreter (default yes)])
+AS_IF([test "x$enable_ruby" != "xno"], [
+  enable_ruby="yes"
+])
 
 CACA="no"
@@ -109 +114 @@
 fi
 
+ac_cv_my_have_ruby="no"
+if test "${enable_ruby}" != "no"; then
+  AC_PATH_PROG(RUBY, ruby, no)
+  if test "${RUBY}" != "no"; then
+    RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@')"
+    RUBY_LIBS="-L$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"RUBY_SO_NAME"@:>@')"
+    AC_SUBST(RUBY_CFLAGS)
+    AC_SUBST(RUBY_LIBS)
+    CPPFLAGS="${CPPFLAGS} ${RUBY_CFLAGS}"
+    AC_CHECK_HEADERS([ruby.h],
+     [ac_cv_my_have_ruby="yes"])
+  fi
+fi
+AM_CONDITIONAL(USE_RUBY, test "${ac_cv_my_have_ruby}" = "yes")
 
 # Optimizations

neercs/trunk/src/attach.c

@@ -150 +150 @@
     struct sockaddr_un addr;
 
-    debug("Connecting to %s", screen_list->socket_path[socktype]);
+    debug("Connecting to %s", screen_list->comm.socket_path[socktype]);
 
     /* Open the socket */

neercs/trunk/src/lock.c

@@ -130 +130 @@
 
 
-    if (strlen(screen_list->lockmsg))
+    if (strlen(screen_list->lock.lockmsg))
     {
         x = ((caca_get_canvas_width(cv) - w) / 2) +
-            (strlen(screen_list->lockmsg));
+            (strlen(screen_list->lock.lockmsg));
         y += 2;
         caca_set_color_ansi(cv, CACA_RED, CACA_BLUE);
-        caca_printf(cv, x, y, "Error : %s", screen_list->lockmsg);
+        caca_printf(cv, x, y, "Error : %s", screen_list->lock.lockmsg);
     }
 #endif
@@ -197 +197 @@
         perror("failed to look up hostname");
         ret = pam_end(pamh, PAM_ABORT);
-        sprintf(screen_list->lockmsg, "Can't get hostname");
+        sprintf(screen_list->lock.lockmsg, "Can't get hostname");
         pam_end(pamh, PAM_SUCCESS);
         return 0;
@@ -205 +205 @@
     if (ret != PAM_SUCCESS)
     {
-        sprintf(screen_list->lockmsg, "Can't set hostname");
+        sprintf(screen_list->lock.lockmsg, "Can't set hostname");
         pam_end(pamh, PAM_SUCCESS);
         return 0;
@@ -213 +213 @@
     if (ret != PAM_SUCCESS)
     {
-        sprintf(screen_list->lockmsg, "Can't authenticate");
+        sprintf(screen_list->lock.lockmsg, "Can't authenticate");
         pam_end(pamh, PAM_SUCCESS);
         return 0;

neercs/trunk/src/screen_list.c

@@ -106 +106 @@
     
     memset(screen_list->lock.lockmsg, 0, 1024);
-c    memset(screen_list->lock.lockpass, 0, 1024);
-    
+    memset(screen_list->lock.lockpass, 0, 1024);
     
     /* Build local config file path */