Changeset 2431Tweet

Timestamp:

06/15/08 20:01:08 (5 years ago)

Author:

pterjan

Message:

• Don't break build on platforms where grab is not supported

Location:

neercs/trunk

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/main.c (modified) (2 diffs)
• src/neercs.h (modified) (3 diffs)
• src/screens.c (modified) (2 diffs)
• src/term.c (modified) (2 diffs)

neercs/trunk/configure.ac

@@ -37 +37 @@
 AC_SUBST(UTIL_LIBS)
 
+case $target_cpu in 
+  i?86)
+    case $target_os in
+      linux*) grab=yes;;
+      *) grab=no;;
+    esac;;
+  *)    grab=no;; 
+esac 
+
+AM_CONDITIONAL(USE_GRAB, test "$grab" = "yes")
+if test "$grab" = "yes"; then
+  AC_DEFINE(USE_GRAB, 1, [Grabbing processes is supported])
+fi
+
 # Optimizations
 CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"

neercs/trunk/src/Makefile.am

@@ -2 +2 @@
 bin_PROGRAMS = neercs
 
-neercs_SOURCES = neercs.h grab.c main.c screens.c term.c effects.c wm.c
+
+if USE_GRAB
+grab_c=grab.c
+endif
+
+neercs_SOURCES = neercs.h $(grab_c) main.c screens.c term.c effects.c wm.c
 neercs_CFLAGS = @CACA_CFLAGS@
 neercs_LDADD = @CACA_LIBS@ @UTIL_LIBS@

neercs/trunk/src/main.c

@@ -99 +99 @@
             if(!strcmp(argv[i + 1], "-P"))
             {
+#ifdef USE_GRAB
                 if(i + 2 > argc)
                 {
@@ -106 +107 @@
                 tmp = create_screen_grab(w, h, atoi(argv[i + 2]));
                 i++;
+#else
+                fprintf(stderr, "Grabbing process is not supported, sorry\n");
+                exit(1);
+#endif
             }
             else

neercs/trunk/src/neercs.h

@@ -16 +16 @@
 #include <stdint.h>
 #include <caca.h>
-
 
 #define CURRENTSCREEN screen_list->screen[screen_list->pty]
@@ -76 +75 @@
 
 int create_pty(char *cmd, unsigned int w, unsigned int h, int *cpid);
+#ifdef USE_GRAB
 int create_pty_grab(pid_t pid, unsigned int w, unsigned int h);
 int grab_process(pid_t pid, char *ptyname, int ptyfd);
+#endif
 
 long int import_term(struct screen_list *screen_list, struct screen *sc, void const *data, unsigned int size);
@@ -89 +90 @@
 /* Screens management */
 struct screen* create_screen(int w, int h, char *command);
+#ifdef USE_GRAB
 struct screen* create_screen_grab(int w, int h, int pid);
+#endif
 int destroy_screen(struct screen *s);
 int add_screen(struct screen_list *list, struct screen *s);

neercs/trunk/src/screens.c

@@ -29 +29 @@
 #include "neercs.h"
 
+#ifdef USE_GRAB
 struct screen* create_screen_grab(int w, int h, int pid)
 {
@@ -56 +57 @@
     return s;
 }
+#endif
 
 struct screen* create_screen(int w, int h, char *command)

neercs/trunk/src/term.c

@@ -578 +578 @@
 }
 
+#ifdef USE_GRAB
 int create_pty_grab(pid_t pid, unsigned int w, unsigned int h)
 {
@@ -596 +597 @@
     return fdm;
 }
+#endif
 
 int set_tty_size(int fd, unsigned int w, unsigned int h)