x11 work

3 files changed, 11 insertions, 1 deletions

diff --git a/src/firejail/Makefile.in b/src/firejail/Makefile.in
index cf57d96d5..ba6bda0a5 100644
--- a/src/firejail/Makefile.in
+++ b/src/firejail/Makefile.in
@@ -14,13 +14,14 @@ HAVE_BIND=@HAVE_BIND@
 HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
 HAVE_NETWORK=@HAVE_NETWORK@
 HAVE_USERNS=@HAVE_USERNS@
+HAVE_X11=@HAVE_X11@
 
 
 H_FILE_LIST       = $(sort $(wildcard *.[h]))
 C_FILE_LIST       = $(sort $(wildcard *.c))
 OBJS = $(C_FILE_LIST:.c=.o)
 BINOBJS =  $(foreach file, $(OBJS), $file)
-CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(prefix)"'  -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_SECCOMP) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security
+CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(prefix)"'  -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_SECCOMP) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security
 LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread
 
 %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/pid.h
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 2a5ded984..d2a093520 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -261,12 +261,17 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
 #ifndef HAVE_CHROOT
                 printf("Chroot support is disabled.\n");
 #endif
+#ifndef HAVE_X11
+                printf("X11 support is disabled.\n");
+#endif
                 exit(0);
         }
+#ifdef HAVE_X11
         else if (strcmp(argv[i], "--x11") == 0) {
                 x11_start(argc, argv);
                 exit(0);
         }
+#endif
 #ifdef HAVE_NETWORK     
         else if (strncmp(argv[i], "--bandwidth=", 12) == 0) {
                 logargs(argc, argv);
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 5e8fb9bbd..218113f46 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -27,6 +27,7 @@
 #include <sys/mount.h>
 
 void fs_x11(void) {
+#ifdef HAVE_X11
         // extract display
         char *d = getenv("DISPLAY");
         if (!d)
@@ -94,9 +95,11 @@ void fs_x11(void) {
          if (mount(RUN_RO_DIR, RUN_WHITELIST_X11_DIR, "none", MS_BIND, "mode=400,gid=0") == -1)
                 errExit("mount");
          fs_logger2("blacklist", RUN_WHITELIST_X11_DIR);
+#endif
 }
 
 
+#ifdef HAVE_X11
 void x11_start(int argc, char **argv) {
         EUID_ASSERT();
         int i;
@@ -215,3 +218,4 @@ void x11_start(int argc, char **argv) {
                 printf("Xpra server pid %d, client pid %d\n", server, client);
         exit(0);
 }
+#endif