[Spice-devel] [RFC] client: Remove client code

Christophe Fergeau cfergeau at redhat.com
Fri Nov 21 02:49:08 PST 2014


The client has been superseded by virt-viewer (
http://virt-manager.org/download/sources/virt-viewer/ ) and is no longer
being maintained.
---

I think it's time that we remove this code, just let me know if you think we
should keep it a bit longer, I'll just drop that patch for a while :)

Christophe


 Makefile.am                                        |     4 -
 README                                             |     5 -
 client/.gitignore                                  |    13 -
 client/Makefile.am                                 |   249 -
 client/application.cpp                             |  2685 --
 client/application.h                               |   413 -
 client/audio_channels.h                            |   107 -
 client/audio_devices.h                             |    43 -
 client/cache.hpp                                   |   121 -
 client/canvas.cpp                                  |   186 -
 client/canvas.h                                    |   352 -
 client/client_net_socket.cpp                       |   388 -
 client/client_net_socket.h                         |   154 -
 client/cmd_line_parser.cpp                         |   518 -
 client/cmd_line_parser.h                           |   104 -
 client/common.h                                    |    92 -
 client/controller.cpp                              |   448 -
 client/controller.h                                |   119 -
 client/cursor.cpp                                  |   115 -
 client/cursor.h                                    |    72 -
 client/cursor_channel.cpp                          |   670 -
 client/cursor_channel.h                            |    93 -
 client/debug.h                                     |    92 -
 client/display_channel.cpp                         |  1901 --
 client/display_channel.h                           |   247 -
 client/event_sources.h                             |    94 -
 client/foreign_menu.cpp                            |   376 -
 client/foreign_menu.h                              |    98 -
 client/glz_decode_tmpl.c                           |   337 -
 client/glz_decoded_image.h                         |    64 -
 client/glz_decoder.cpp                             |   301 -
 client/glz_decoder.h                               |    84 -
 client/glz_decoder_config.h                        |    64 -
 client/glz_decoder_window.cpp                      |   329 -
 client/glz_decoder_window.h                        |   122 -
 client/gui/Makefile.am                             |    20 -
 client/gui/commonv2c.ttf.c                         |  2766 --
 client/gui/commonwealth-10.font.c                  |    12 -
 client/gui/dejavu_sans-10.font.c                   |    12 -
 client/gui/dejavu_sans.ttf.c                       | 25487 -------------------
 client/gui/gui.cpp                                 |  1418 --
 client/gui/gui.h                                   |   143 -
 client/gui/resource_provider.cpp                   |   148 -
 client/gui/resource_provider.h                     |    59 -
 client/gui/softrenderer.cpp                        |   390 -
 client/gui/softrenderer.h                          |   148 -
 client/gui/softtexture.cpp                         |   139 -
 client/gui/softtexture.h                           |    58 -
 client/gui/taharez_look.imageset.c                 |  1238 -
 client/gui/taharez_look.looknfeel.c                | 15117 -----------
 client/gui/taharez_look.scheme.c                   |   449 -
 client/gui/taharez_look.tga.c                      | 16388 ------------
 client/hot_keys.cpp                                |   147 -
 client/hot_keys.h                                  |    48 -
 client/icon.h                                      |    35 -
 client/inputs_channel.cpp                          |   614 -
 client/inputs_channel.h                            |    96 -
 client/inputs_handler.h                            |    42 -
 client/jpeg_decoder.cpp                            |   153 -
 client/jpeg_decoder.h                              |    96 -
 client/menu.cpp                                    |   147 -
 client/menu.h                                      |   102 -
 client/mjpeg_decoder.cpp                           |   277 -
 client/mjpeg_decoder.h                             |    74 -
 client/monitor.cpp                                 |    49 -
 client/monitor.h                                   |    57 -
 client/pixels_source.h                             |    58 -
 client/platform.h                                  |   205 -
 client/playback_channel.cpp                        |   364 -
 client/process_loop.cpp                            |   406 -
 client/process_loop.h                              |   244 -
 client/read_write_mutex.h                          |   119 -
 client/record_channel.cpp                          |   293 -
 client/red_canvas_base.h                           |    26 -
 client/red_channel.cpp                             |   887 -
 client/red_channel.h                               |   353 -
 client/red_client.cpp                              |  1410 -
 client/red_client.h                                |   387 -
 client/red_drawable.h                              |   122 -
 client/red_gdi_canvas.cpp                          |    97 -
 client/red_gdi_canvas.h                            |    53 -
 client/red_gl_canvas.cpp                           |   123 -
 client/red_gl_canvas.h                             |    66 -
 client/red_key.h                                   |   152 -
 client/red_peer.cpp                                |   463 -
 client/red_peer.h                                  |   209 -
 client/red_pixmap.h                                |    67 -
 client/red_pixmap_gdi.h                            |    35 -
 client/red_pixmap_gl.h                             |    49 -
 client/red_pixmap_sw.h                             |    30 -
 client/red_sw_canvas.cpp                           |   112 -
 client/red_sw_canvas.h                             |    50 -
 client/red_types.h                                 |    37 -
 client/red_window.h                                |   200 -
 client/screen.cpp                                  |   944 -
 client/screen.h                                    |   211 -
 client/screen_layer.cpp                            |   239 -
 client/screen_layer.h                              |    87 -
 client/shared_cache.hpp                            |   223 -
 client/smartcard_channel.cpp                       |   553 -
 client/smartcard_channel.h                         |   159 -
 client/tests/.gitignore                            |     1 -
 client/tests/controller_test/README.txt            |    10 -
 client/tests/controller_test/build                 |     4 -
 client/tests/controller_test/controller_test.cpp   |   206 -
 client/tests/controller_test/controller_test.sln   |    20 -
 .../tests/controller_test/controller_test.vcproj   |   198 -
 client/threads.cpp                                 |   142 -
 client/threads.h                                   |   134 -
 client/utils.cpp                                   |    44 -
 client/utils.h                                     |   156 -
 client/windows/atomic_count.h                      |    41 -
 client/windows/event_sources_p.cpp                 |   211 -
 client/windows/event_sources_p.h                   |    51 -
 client/windows/generate.bat                        |     2 -
 client/windows/generate1.bat                       |     2 -
 client/windows/getopt.h                            |    56 -
 client/windows/main.cpp                            |   110 -
 client/windows/my_getopt.cpp                       |   281 -
 client/windows/my_getopt.h                         |    72 -
 client/windows/named_pipe.cpp                      |   232 -
 client/windows/named_pipe.h                        |    94 -
 client/windows/pixels_source.cpp                   |   110 -
 client/windows/pixels_source_p.h                   |    28 -
 client/windows/platform.cpp                        |  1213 -
 client/windows/platform_utils.cpp                  |   150 -
 client/windows/platform_utils.h                    |   100 -
 client/windows/playback.cpp                        |   178 -
 client/windows/playback.h                          |    54 -
 client/windows/record.cpp                          |   195 -
 client/windows/record.h                            |    57 -
 client/windows/red_drawable.cpp                    |   153 -
 client/windows/red_pixmap.cpp                      |    44 -
 client/windows/red_pixmap_gdi.cpp                  |   121 -
 client/windows/red_pixmap_sw.cpp                   |   120 -
 client/windows/red_window.cpp                      |  1106 -
 client/windows/red_window_p.h                      |    71 -
 client/windows/redc.rc                             |   137 -
 client/windows/redc.sln                            |    26 -
 client/windows/redc.vcproj                         |  1007 -
 client/windows/resource.h                          |    18 -
 client/windows/spice.ico                           |   Bin 15086 -> 0 bytes
 client/windows/spicec.exe.manifest                 |    10 -
 client/windows/stdint.h                            |   393 -
 client/windows/sticky_alt.bmp                      |   Bin 17550 -> 0 bytes
 client/windows/win_platform.h                      |    39 -
 client/x11/.gitignore                              |    11 -
 client/x11/atomic_count.h                          |    43 -
 client/x11/event_sources_p.cpp                     |   229 -
 client/x11/event_sources_p.h                       |    54 -
 client/x11/images/alt_image.c                      |   735 -
 client/x11/images/red_icon.c                       |   275 -
 client/x11/main.cpp                                |    51 -
 client/x11/named_pipe.cpp                          |   170 -
 client/x11/named_pipe.h                            |    61 -
 client/x11/pixels_source.cpp                       |   108 -
 client/x11/pixels_source_p.h                       |    93 -
 client/x11/platform.cpp                            |  3815 ---
 client/x11/platform_utils.cpp                      |    33 -
 client/x11/platform_utils.h                        |    38 -
 client/x11/playback.cpp                            |   221 -
 client/x11/playback.h                              |    48 -
 client/x11/record.cpp                              |   243 -
 client/x11/record.h                                |    62 -
 client/x11/red_drawable.cpp                        |   796 -
 client/x11/red_pixmap.cpp                          |    44 -
 client/x11/red_pixmap_gl.cpp                       |   314 -
 client/x11/red_pixmap_sw.cpp                       |    93 -
 client/x11/red_window.cpp                          |  2251 --
 client/x11/red_window_p.h                          |    86 -
 client/x11/res.cpp                                 |    82 -
 client/x11/res.h                                   |    24 -
 client/x11/resource.h                              |    24 -
 client/x11/x_icon.cpp                              |   175 -
 client/x11/x_icon.h                                |    52 -
 client/x11/x_platform.h                            |    56 -
 client/zlib_decoder.cpp                            |    78 -
 client/zlib_decoder.h                              |    43 -
 configure.ac                                       |   208 +-
 179 files changed, 1 insertion(+), 104034 deletions(-)
 delete mode 100644 client/.gitignore
 delete mode 100644 client/Makefile.am
 delete mode 100644 client/application.cpp
 delete mode 100644 client/application.h
 delete mode 100644 client/audio_channels.h
 delete mode 100644 client/audio_devices.h
 delete mode 100644 client/cache.hpp
 delete mode 100644 client/canvas.cpp
 delete mode 100644 client/canvas.h
 delete mode 100644 client/client_net_socket.cpp
 delete mode 100644 client/client_net_socket.h
 delete mode 100644 client/cmd_line_parser.cpp
 delete mode 100644 client/cmd_line_parser.h
 delete mode 100644 client/common.h
 delete mode 100644 client/controller.cpp
 delete mode 100644 client/controller.h
 delete mode 100644 client/cursor.cpp
 delete mode 100644 client/cursor.h
 delete mode 100644 client/cursor_channel.cpp
 delete mode 100644 client/cursor_channel.h
 delete mode 100644 client/debug.h
 delete mode 100644 client/display_channel.cpp
 delete mode 100644 client/display_channel.h
 delete mode 100644 client/event_sources.h
 delete mode 100644 client/foreign_menu.cpp
 delete mode 100644 client/foreign_menu.h
 delete mode 100644 client/glz_decode_tmpl.c
 delete mode 100644 client/glz_decoded_image.h
 delete mode 100644 client/glz_decoder.cpp
 delete mode 100644 client/glz_decoder.h
 delete mode 100644 client/glz_decoder_config.h
 delete mode 100644 client/glz_decoder_window.cpp
 delete mode 100644 client/glz_decoder_window.h
 delete mode 100644 client/gui/Makefile.am
 delete mode 100644 client/gui/commonv2c.ttf.c
 delete mode 100644 client/gui/commonwealth-10.font.c
 delete mode 100644 client/gui/dejavu_sans-10.font.c
 delete mode 100644 client/gui/dejavu_sans.ttf.c
 delete mode 100644 client/gui/gui.cpp
 delete mode 100644 client/gui/gui.h
 delete mode 100644 client/gui/resource_provider.cpp
 delete mode 100644 client/gui/resource_provider.h
 delete mode 100644 client/gui/softrenderer.cpp
 delete mode 100644 client/gui/softrenderer.h
 delete mode 100644 client/gui/softtexture.cpp
 delete mode 100644 client/gui/softtexture.h
 delete mode 100644 client/gui/taharez_look.imageset.c
 delete mode 100644 client/gui/taharez_look.looknfeel.c
 delete mode 100644 client/gui/taharez_look.scheme.c
 delete mode 100644 client/gui/taharez_look.tga.c
 delete mode 100644 client/hot_keys.cpp
 delete mode 100644 client/hot_keys.h
 delete mode 100644 client/icon.h
 delete mode 100644 client/inputs_channel.cpp
 delete mode 100644 client/inputs_channel.h
 delete mode 100644 client/inputs_handler.h
 delete mode 100644 client/jpeg_decoder.cpp
 delete mode 100644 client/jpeg_decoder.h
 delete mode 100644 client/menu.cpp
 delete mode 100644 client/menu.h
 delete mode 100644 client/mjpeg_decoder.cpp
 delete mode 100644 client/mjpeg_decoder.h
 delete mode 100644 client/monitor.cpp
 delete mode 100644 client/monitor.h
 delete mode 100644 client/pixels_source.h
 delete mode 100644 client/platform.h
 delete mode 100644 client/playback_channel.cpp
 delete mode 100644 client/process_loop.cpp
 delete mode 100644 client/process_loop.h
 delete mode 100644 client/read_write_mutex.h
 delete mode 100644 client/record_channel.cpp
 delete mode 100644 client/red_canvas_base.h
 delete mode 100644 client/red_channel.cpp
 delete mode 100644 client/red_channel.h
 delete mode 100644 client/red_client.cpp
 delete mode 100644 client/red_client.h
 delete mode 100644 client/red_drawable.h
 delete mode 100644 client/red_gdi_canvas.cpp
 delete mode 100644 client/red_gdi_canvas.h
 delete mode 100644 client/red_gl_canvas.cpp
 delete mode 100644 client/red_gl_canvas.h
 delete mode 100644 client/red_key.h
 delete mode 100644 client/red_peer.cpp
 delete mode 100644 client/red_peer.h
 delete mode 100644 client/red_pixmap.h
 delete mode 100644 client/red_pixmap_gdi.h
 delete mode 100644 client/red_pixmap_gl.h
 delete mode 100644 client/red_pixmap_sw.h
 delete mode 100644 client/red_sw_canvas.cpp
 delete mode 100644 client/red_sw_canvas.h
 delete mode 100644 client/red_types.h
 delete mode 100644 client/red_window.h
 delete mode 100644 client/screen.cpp
 delete mode 100644 client/screen.h
 delete mode 100644 client/screen_layer.cpp
 delete mode 100644 client/screen_layer.h
 delete mode 100644 client/shared_cache.hpp
 delete mode 100644 client/smartcard_channel.cpp
 delete mode 100644 client/smartcard_channel.h
 delete mode 100644 client/tests/.gitignore
 delete mode 100644 client/tests/controller_test/README.txt
 delete mode 100755 client/tests/controller_test/build
 delete mode 100644 client/tests/controller_test/controller_test.cpp
 delete mode 100644 client/tests/controller_test/controller_test.sln
 delete mode 100644 client/tests/controller_test/controller_test.vcproj
 delete mode 100644 client/threads.cpp
 delete mode 100644 client/threads.h
 delete mode 100644 client/utils.cpp
 delete mode 100644 client/utils.h
 delete mode 100644 client/windows/atomic_count.h
 delete mode 100644 client/windows/event_sources_p.cpp
 delete mode 100644 client/windows/event_sources_p.h
 delete mode 100644 client/windows/generate.bat
 delete mode 100644 client/windows/generate1.bat
 delete mode 100644 client/windows/getopt.h
 delete mode 100644 client/windows/main.cpp
 delete mode 100644 client/windows/my_getopt.cpp
 delete mode 100644 client/windows/my_getopt.h
 delete mode 100644 client/windows/named_pipe.cpp
 delete mode 100644 client/windows/named_pipe.h
 delete mode 100644 client/windows/pixels_source.cpp
 delete mode 100644 client/windows/pixels_source_p.h
 delete mode 100644 client/windows/platform.cpp
 delete mode 100644 client/windows/platform_utils.cpp
 delete mode 100644 client/windows/platform_utils.h
 delete mode 100644 client/windows/playback.cpp
 delete mode 100644 client/windows/playback.h
 delete mode 100644 client/windows/record.cpp
 delete mode 100644 client/windows/record.h
 delete mode 100644 client/windows/red_drawable.cpp
 delete mode 100644 client/windows/red_pixmap.cpp
 delete mode 100644 client/windows/red_pixmap_gdi.cpp
 delete mode 100644 client/windows/red_pixmap_sw.cpp
 delete mode 100644 client/windows/red_window.cpp
 delete mode 100644 client/windows/red_window_p.h
 delete mode 100644 client/windows/redc.rc
 delete mode 100644 client/windows/redc.sln
 delete mode 100644 client/windows/redc.vcproj
 delete mode 100644 client/windows/resource.h
 delete mode 100644 client/windows/spice.ico
 delete mode 100644 client/windows/spicec.exe.manifest
 delete mode 100644 client/windows/stdint.h
 delete mode 100644 client/windows/sticky_alt.bmp
 delete mode 100644 client/windows/win_platform.h
 delete mode 100644 client/x11/.gitignore
 delete mode 100644 client/x11/atomic_count.h
 delete mode 100644 client/x11/event_sources_p.cpp
 delete mode 100644 client/x11/event_sources_p.h
 delete mode 100644 client/x11/images/alt_image.c
 delete mode 100644 client/x11/images/red_icon.c
 delete mode 100644 client/x11/main.cpp
 delete mode 100644 client/x11/named_pipe.cpp
 delete mode 100644 client/x11/named_pipe.h
 delete mode 100644 client/x11/pixels_source.cpp
 delete mode 100644 client/x11/pixels_source_p.h
 delete mode 100644 client/x11/platform.cpp
 delete mode 100644 client/x11/platform_utils.cpp
 delete mode 100644 client/x11/platform_utils.h
 delete mode 100644 client/x11/playback.cpp
 delete mode 100644 client/x11/playback.h
 delete mode 100644 client/x11/record.cpp
 delete mode 100644 client/x11/record.h
 delete mode 100644 client/x11/red_drawable.cpp
 delete mode 100644 client/x11/red_pixmap.cpp
 delete mode 100644 client/x11/red_pixmap_gl.cpp
 delete mode 100644 client/x11/red_pixmap_sw.cpp
 delete mode 100644 client/x11/red_window.cpp
 delete mode 100644 client/x11/red_window_p.h
 delete mode 100644 client/x11/res.cpp
 delete mode 100644 client/x11/res.h
 delete mode 100644 client/x11/resource.h
 delete mode 100644 client/x11/x_icon.cpp
 delete mode 100644 client/x11/x_icon.h
 delete mode 100644 client/x11/x_platform.h
 delete mode 100644 client/zlib_decoder.cpp
 delete mode 100644 client/zlib_decoder.h

diff --git a/Makefile.am b/Makefile.am
index c7a0e92..cada94d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,10 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = spice-common server docs
 
-if SUPPORT_CLIENT
-SUBDIRS += client
-endif
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = spice-server.pc
 
diff --git a/README b/README
index dea4344..76b3969 100644
--- a/README
+++ b/README
@@ -37,11 +37,6 @@ build SPICE
 The following optional dependancies increase the available
 functionality
 
-    GE Gui         >= 0.6.0,  < 0.7.0   (GUI app support)
-    OpenGL                              (GUI app support)
-    Alsa                                (Linux support)
-    XRandR         >= 1.2               (X11 support)
-    Xinerama       >= 1.0               (X11 support)
     libcacard      >= 0.1.2             (Smartcard support)
 
 Communication
diff --git a/client/.gitignore b/client/.gitignore
deleted file mode 100644
index 0561c05..0000000
diff --git a/client/Makefile.am b/client/Makefile.am
deleted file mode 100644
index 97b56f6..0000000
diff --git a/client/application.cpp b/client/application.cpp
deleted file mode 100644
index cdce86d..0000000
diff --git a/client/application.h b/client/application.h
deleted file mode 100644
index 3f9940d..0000000
diff --git a/client/audio_channels.h b/client/audio_channels.h
deleted file mode 100644
index fdb4dc9..0000000
diff --git a/client/audio_devices.h b/client/audio_devices.h
deleted file mode 100644
index 111c366..0000000
diff --git a/client/cache.hpp b/client/cache.hpp
deleted file mode 100644
index 7dce671..0000000
diff --git a/client/canvas.cpp b/client/canvas.cpp
deleted file mode 100644
index f132186..0000000
diff --git a/client/canvas.h b/client/canvas.h
deleted file mode 100644
index 213a753..0000000
diff --git a/client/client_net_socket.cpp b/client/client_net_socket.cpp
deleted file mode 100644
index 9df6801..0000000
diff --git a/client/client_net_socket.h b/client/client_net_socket.h
deleted file mode 100644
index bc9bdd1..0000000
diff --git a/client/cmd_line_parser.cpp b/client/cmd_line_parser.cpp
deleted file mode 100644
index 12d5945..0000000
diff --git a/client/cmd_line_parser.h b/client/cmd_line_parser.h
deleted file mode 100644
index 1ce1807..0000000
diff --git a/client/common.h b/client/common.h
deleted file mode 100644
index 13ef1c7..0000000
diff --git a/client/controller.cpp b/client/controller.cpp
deleted file mode 100644
index 63082c4..0000000
diff --git a/client/controller.h b/client/controller.h
deleted file mode 100644
index a59d333..0000000
diff --git a/client/cursor.cpp b/client/cursor.cpp
deleted file mode 100644
index 0fbf366..0000000
diff --git a/client/cursor.h b/client/cursor.h
deleted file mode 100644
index 3210f1e..0000000
diff --git a/client/cursor_channel.cpp b/client/cursor_channel.cpp
deleted file mode 100644
index 48786e3..0000000
diff --git a/client/cursor_channel.h b/client/cursor_channel.h
deleted file mode 100644
index 3458c5f..0000000
diff --git a/client/debug.h b/client/debug.h
deleted file mode 100644
index f2cc299..0000000
diff --git a/client/display_channel.cpp b/client/display_channel.cpp
deleted file mode 100644
index 47076ad..0000000
diff --git a/client/display_channel.h b/client/display_channel.h
deleted file mode 100644
index 8a30289..0000000
diff --git a/client/event_sources.h b/client/event_sources.h
deleted file mode 100644
index 0db8ce6..0000000
diff --git a/client/foreign_menu.cpp b/client/foreign_menu.cpp
deleted file mode 100644
index 70b6dc2..0000000
diff --git a/client/foreign_menu.h b/client/foreign_menu.h
deleted file mode 100644
index 6138087..0000000
diff --git a/client/glz_decode_tmpl.c b/client/glz_decode_tmpl.c
deleted file mode 100644
index ad78cd7..0000000
diff --git a/client/glz_decoded_image.h b/client/glz_decoded_image.h
deleted file mode 100644
index 2e607f8..0000000
diff --git a/client/glz_decoder.cpp b/client/glz_decoder.cpp
deleted file mode 100644
index d688051..0000000
diff --git a/client/glz_decoder.h b/client/glz_decoder.h
deleted file mode 100644
index 0d505fd..0000000
diff --git a/client/glz_decoder_config.h b/client/glz_decoder_config.h
deleted file mode 100644
index c15f012..0000000
diff --git a/client/glz_decoder_window.cpp b/client/glz_decoder_window.cpp
deleted file mode 100644
index 51d44ab..0000000
diff --git a/client/glz_decoder_window.h b/client/glz_decoder_window.h
deleted file mode 100644
index f89d18f..0000000
diff --git a/client/gui/Makefile.am b/client/gui/Makefile.am
deleted file mode 100644
index 81e4f88..0000000
diff --git a/client/gui/commonv2c.ttf.c b/client/gui/commonv2c.ttf.c
deleted file mode 100644
index 6e708e7..0000000
diff --git a/client/gui/commonwealth-10.font.c b/client/gui/commonwealth-10.font.c
deleted file mode 100644
index ee05ab8..0000000
diff --git a/client/gui/dejavu_sans-10.font.c b/client/gui/dejavu_sans-10.font.c
deleted file mode 100644
index 76939bb..0000000
diff --git a/client/gui/dejavu_sans.ttf.c b/client/gui/dejavu_sans.ttf.c
deleted file mode 100644
index ae3b59a..0000000
diff --git a/client/gui/gui.cpp b/client/gui/gui.cpp
deleted file mode 100644
index 4bf7ac8..0000000
diff --git a/client/gui/gui.h b/client/gui/gui.h
deleted file mode 100644
index b93b42a..0000000
diff --git a/client/gui/resource_provider.cpp b/client/gui/resource_provider.cpp
deleted file mode 100644
index 3c0b897..0000000
diff --git a/client/gui/resource_provider.h b/client/gui/resource_provider.h
deleted file mode 100644
index c0d319b..0000000
diff --git a/client/gui/softrenderer.cpp b/client/gui/softrenderer.cpp
deleted file mode 100644
index c888bc0..0000000
diff --git a/client/gui/softrenderer.h b/client/gui/softrenderer.h
deleted file mode 100644
index b97f9d5..0000000
diff --git a/client/gui/softtexture.cpp b/client/gui/softtexture.cpp
deleted file mode 100644
index d9ce9a0..0000000
diff --git a/client/gui/softtexture.h b/client/gui/softtexture.h
deleted file mode 100644
index 668ca4f..0000000
diff --git a/client/gui/taharez_look.imageset.c b/client/gui/taharez_look.imageset.c
deleted file mode 100644
index adaf7b8..0000000
diff --git a/client/gui/taharez_look.looknfeel.c b/client/gui/taharez_look.looknfeel.c
deleted file mode 100644
index 23549ad..0000000
diff --git a/client/gui/taharez_look.scheme.c b/client/gui/taharez_look.scheme.c
deleted file mode 100644
index 319f238..0000000
diff --git a/client/gui/taharez_look.tga.c b/client/gui/taharez_look.tga.c
deleted file mode 100644
index 2ccdb9c..0000000
diff --git a/client/hot_keys.cpp b/client/hot_keys.cpp
deleted file mode 100644
index 763ba2c..0000000
diff --git a/client/hot_keys.h b/client/hot_keys.h
deleted file mode 100644
index e78390d..0000000
diff --git a/client/icon.h b/client/icon.h
deleted file mode 100644
index 35b0a9d..0000000
diff --git a/client/inputs_channel.cpp b/client/inputs_channel.cpp
deleted file mode 100644
index c148eff..0000000
diff --git a/client/inputs_channel.h b/client/inputs_channel.h
deleted file mode 100644
index cff3f90..0000000
diff --git a/client/inputs_handler.h b/client/inputs_handler.h
deleted file mode 100644
index 060a4ad..0000000
diff --git a/client/jpeg_decoder.cpp b/client/jpeg_decoder.cpp
deleted file mode 100644
index c85902f..0000000
diff --git a/client/jpeg_decoder.h b/client/jpeg_decoder.h
deleted file mode 100644
index ae76f50..0000000
diff --git a/client/menu.cpp b/client/menu.cpp
deleted file mode 100644
index ebbd323..0000000
diff --git a/client/menu.h b/client/menu.h
deleted file mode 100644
index 280cf38..0000000
diff --git a/client/mjpeg_decoder.cpp b/client/mjpeg_decoder.cpp
deleted file mode 100644
index 28d4f08..0000000
diff --git a/client/mjpeg_decoder.h b/client/mjpeg_decoder.h
deleted file mode 100644
index 8455e0d..0000000
diff --git a/client/monitor.cpp b/client/monitor.cpp
deleted file mode 100644
index 3d74296..0000000
diff --git a/client/monitor.h b/client/monitor.h
deleted file mode 100644
index bbaaf17..0000000
diff --git a/client/pixels_source.h b/client/pixels_source.h
deleted file mode 100644
index 55841a6..0000000
diff --git a/client/platform.h b/client/platform.h
deleted file mode 100644
index 7b543e9..0000000
diff --git a/client/playback_channel.cpp b/client/playback_channel.cpp
deleted file mode 100644
index 9f8c334..0000000
diff --git a/client/process_loop.cpp b/client/process_loop.cpp
deleted file mode 100644
index 9cd530e..0000000
diff --git a/client/process_loop.h b/client/process_loop.h
deleted file mode 100644
index 33ca2d1..0000000
diff --git a/client/read_write_mutex.h b/client/read_write_mutex.h
deleted file mode 100644
index 107474e..0000000
diff --git a/client/record_channel.cpp b/client/record_channel.cpp
deleted file mode 100644
index 047cdd0..0000000
diff --git a/client/red_canvas_base.h b/client/red_canvas_base.h
deleted file mode 100644
index 1506055..0000000
diff --git a/client/red_channel.cpp b/client/red_channel.cpp
deleted file mode 100644
index f585732..0000000
diff --git a/client/red_channel.h b/client/red_channel.h
deleted file mode 100644
index 3cf5160..0000000
diff --git a/client/red_client.cpp b/client/red_client.cpp
deleted file mode 100644
index 6a71291..0000000
diff --git a/client/red_client.h b/client/red_client.h
deleted file mode 100644
index c4b418a..0000000
diff --git a/client/red_drawable.h b/client/red_drawable.h
deleted file mode 100644
index 8ad3d4c..0000000
diff --git a/client/red_gdi_canvas.cpp b/client/red_gdi_canvas.cpp
deleted file mode 100644
index 09a1553..0000000
diff --git a/client/red_gdi_canvas.h b/client/red_gdi_canvas.h
deleted file mode 100644
index dbebe33..0000000
diff --git a/client/red_gl_canvas.cpp b/client/red_gl_canvas.cpp
deleted file mode 100644
index e8c3f1e..0000000
diff --git a/client/red_gl_canvas.h b/client/red_gl_canvas.h
deleted file mode 100644
index e78b1cc..0000000
diff --git a/client/red_key.h b/client/red_key.h
deleted file mode 100644
index 3789c9a..0000000
diff --git a/client/red_peer.cpp b/client/red_peer.cpp
deleted file mode 100644
index d2a6098..0000000
diff --git a/client/red_peer.h b/client/red_peer.h
deleted file mode 100644
index b0faa9d..0000000
diff --git a/client/red_pixmap.h b/client/red_pixmap.h
deleted file mode 100644
index 3f12855..0000000
diff --git a/client/red_pixmap_gdi.h b/client/red_pixmap_gdi.h
deleted file mode 100644
index 828b76b..0000000
diff --git a/client/red_pixmap_gl.h b/client/red_pixmap_gl.h
deleted file mode 100644
index 88d14a1..0000000
diff --git a/client/red_pixmap_sw.h b/client/red_pixmap_sw.h
deleted file mode 100644
index 0c96a1f..0000000
diff --git a/client/red_sw_canvas.cpp b/client/red_sw_canvas.cpp
deleted file mode 100644
index d18af0f..0000000
diff --git a/client/red_sw_canvas.h b/client/red_sw_canvas.h
deleted file mode 100644
index a192c47..0000000
diff --git a/client/red_types.h b/client/red_types.h
deleted file mode 100644
index d527339..0000000
diff --git a/client/red_window.h b/client/red_window.h
deleted file mode 100644
index bf59d8b..0000000
diff --git a/client/screen.cpp b/client/screen.cpp
deleted file mode 100644
index ce14edd..0000000
diff --git a/client/screen.h b/client/screen.h
deleted file mode 100644
index 4093006..0000000
diff --git a/client/screen_layer.cpp b/client/screen_layer.cpp
deleted file mode 100644
index 3638509..0000000
diff --git a/client/screen_layer.h b/client/screen_layer.h
deleted file mode 100644
index 1168b24..0000000
diff --git a/client/shared_cache.hpp b/client/shared_cache.hpp
deleted file mode 100644
index 450116c..0000000
diff --git a/client/smartcard_channel.cpp b/client/smartcard_channel.cpp
deleted file mode 100644
index 720b879..0000000
diff --git a/client/smartcard_channel.h b/client/smartcard_channel.h
deleted file mode 100644
index 0423bff..0000000
diff --git a/client/tests/.gitignore b/client/tests/.gitignore
deleted file mode 100644
index 5095497..0000000
diff --git a/client/tests/controller_test/README.txt b/client/tests/controller_test/README.txt
deleted file mode 100644
index aa2536a..0000000
diff --git a/client/tests/controller_test/build b/client/tests/controller_test/build
deleted file mode 100755
index 995372f..0000000
diff --git a/client/tests/controller_test/controller_test.cpp b/client/tests/controller_test/controller_test.cpp
deleted file mode 100644
index 82b3166..0000000
diff --git a/client/tests/controller_test/controller_test.sln b/client/tests/controller_test/controller_test.sln
deleted file mode 100644
index f274757..0000000
diff --git a/client/tests/controller_test/controller_test.vcproj b/client/tests/controller_test/controller_test.vcproj
deleted file mode 100644
index a71fa5a..0000000
diff --git a/client/threads.cpp b/client/threads.cpp
deleted file mode 100644
index e255bee..0000000
diff --git a/client/threads.h b/client/threads.h
deleted file mode 100644
index 5bfd38b..0000000
diff --git a/client/utils.cpp b/client/utils.cpp
deleted file mode 100644
index 6b195b3..0000000
diff --git a/client/utils.h b/client/utils.h
deleted file mode 100644
index d8d6962..0000000
diff --git a/client/windows/atomic_count.h b/client/windows/atomic_count.h
deleted file mode 100644
index 7520fca..0000000
diff --git a/client/windows/event_sources_p.cpp b/client/windows/event_sources_p.cpp
deleted file mode 100644
index bbf48d9..0000000
diff --git a/client/windows/event_sources_p.h b/client/windows/event_sources_p.h
deleted file mode 100644
index 14cc816..0000000
diff --git a/client/windows/generate.bat b/client/windows/generate.bat
deleted file mode 100644
index 27d8487..0000000
diff --git a/client/windows/generate1.bat b/client/windows/generate1.bat
deleted file mode 100644
index 97da9be..0000000
diff --git a/client/windows/getopt.h b/client/windows/getopt.h
deleted file mode 100644
index df07082..0000000
diff --git a/client/windows/main.cpp b/client/windows/main.cpp
deleted file mode 100644
index 7a83305..0000000
diff --git a/client/windows/my_getopt.cpp b/client/windows/my_getopt.cpp
deleted file mode 100644
index 5237b8e..0000000
diff --git a/client/windows/my_getopt.h b/client/windows/my_getopt.h
deleted file mode 100644
index c75101a..0000000
diff --git a/client/windows/named_pipe.cpp b/client/windows/named_pipe.cpp
deleted file mode 100644
index c813112..0000000
diff --git a/client/windows/named_pipe.h b/client/windows/named_pipe.h
deleted file mode 100644
index 10d5ced..0000000
diff --git a/client/windows/pixels_source.cpp b/client/windows/pixels_source.cpp
deleted file mode 100644
index 3ddf556..0000000
diff --git a/client/windows/pixels_source_p.h b/client/windows/pixels_source_p.h
deleted file mode 100644
index f06be0e..0000000
diff --git a/client/windows/platform.cpp b/client/windows/platform.cpp
deleted file mode 100644
index fc51a12..0000000
diff --git a/client/windows/platform_utils.cpp b/client/windows/platform_utils.cpp
deleted file mode 100644
index a4c9c41..0000000
diff --git a/client/windows/platform_utils.h b/client/windows/platform_utils.h
deleted file mode 100644
index a652fed..0000000
diff --git a/client/windows/playback.cpp b/client/windows/playback.cpp
deleted file mode 100644
index 87ed26a..0000000
diff --git a/client/windows/playback.h b/client/windows/playback.h
deleted file mode 100644
index 6493eff..0000000
diff --git a/client/windows/record.cpp b/client/windows/record.cpp
deleted file mode 100644
index a2e5f39..0000000
diff --git a/client/windows/record.h b/client/windows/record.h
deleted file mode 100644
index 7326419..0000000
diff --git a/client/windows/red_drawable.cpp b/client/windows/red_drawable.cpp
deleted file mode 100644
index 65c1aa6..0000000
diff --git a/client/windows/red_pixmap.cpp b/client/windows/red_pixmap.cpp
deleted file mode 100644
index 6685e41..0000000
diff --git a/client/windows/red_pixmap_gdi.cpp b/client/windows/red_pixmap_gdi.cpp
deleted file mode 100644
index 132ee6c..0000000
diff --git a/client/windows/red_pixmap_sw.cpp b/client/windows/red_pixmap_sw.cpp
deleted file mode 100644
index fac40a0..0000000
diff --git a/client/windows/red_window.cpp b/client/windows/red_window.cpp
deleted file mode 100644
index fcb033b..0000000
diff --git a/client/windows/red_window_p.h b/client/windows/red_window_p.h
deleted file mode 100644
index 73d74e3..0000000
diff --git a/client/windows/redc.rc b/client/windows/redc.rc
deleted file mode 100644
index ec9a9b2..0000000
diff --git a/client/windows/redc.sln b/client/windows/redc.sln
deleted file mode 100644
index 3ee7123..0000000
diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
deleted file mode 100644
index 3d5bae3..0000000
diff --git a/client/windows/resource.h b/client/windows/resource.h
deleted file mode 100644
index c3549be..0000000
diff --git a/client/windows/spice.ico b/client/windows/spice.ico
deleted file mode 100644
index ae9200c33b19f5f7198966edd8885802f72cd6a0..0000000000000000000000000000000000000000
diff --git a/client/windows/spicec.exe.manifest b/client/windows/spicec.exe.manifest
deleted file mode 100644
index b7d1d0a..0000000
diff --git a/client/windows/stdint.h b/client/windows/stdint.h
deleted file mode 100644
index 3013161..0000000
diff --git a/client/windows/sticky_alt.bmp b/client/windows/sticky_alt.bmp
deleted file mode 100644
index 4013472b67614f7622031b0c7da69b39ddf64f9d..0000000000000000000000000000000000000000
diff --git a/client/windows/win_platform.h b/client/windows/win_platform.h
deleted file mode 100644
index c1a356c..0000000
diff --git a/client/x11/.gitignore b/client/x11/.gitignore
deleted file mode 100644
index 2f08d7e..0000000
diff --git a/client/x11/atomic_count.h b/client/x11/atomic_count.h
deleted file mode 100644
index 02bb08d..0000000
diff --git a/client/x11/event_sources_p.cpp b/client/x11/event_sources_p.cpp
deleted file mode 100644
index 5f9f452..0000000
diff --git a/client/x11/event_sources_p.h b/client/x11/event_sources_p.h
deleted file mode 100644
index 4b826bb..0000000
diff --git a/client/x11/images/alt_image.c b/client/x11/images/alt_image.c
deleted file mode 100644
index cf5d6cb..0000000
diff --git a/client/x11/images/red_icon.c b/client/x11/images/red_icon.c
deleted file mode 100644
index 143d4e2..0000000
diff --git a/client/x11/main.cpp b/client/x11/main.cpp
deleted file mode 100644
index f95b3a2..0000000
diff --git a/client/x11/named_pipe.cpp b/client/x11/named_pipe.cpp
deleted file mode 100644
index ad6b2e5..0000000
diff --git a/client/x11/named_pipe.h b/client/x11/named_pipe.h
deleted file mode 100644
index 379cbff..0000000
diff --git a/client/x11/pixels_source.cpp b/client/x11/pixels_source.cpp
deleted file mode 100644
index 71ea9ff..0000000
diff --git a/client/x11/pixels_source_p.h b/client/x11/pixels_source_p.h
deleted file mode 100644
index 8431121..0000000
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp
deleted file mode 100644
index 6a37483..0000000
diff --git a/client/x11/platform_utils.cpp b/client/x11/platform_utils.cpp
deleted file mode 100644
index 6ae30a4..0000000
diff --git a/client/x11/platform_utils.h b/client/x11/platform_utils.h
deleted file mode 100644
index 03a2489..0000000
diff --git a/client/x11/playback.cpp b/client/x11/playback.cpp
deleted file mode 100644
index 83946aa..0000000
diff --git a/client/x11/playback.h b/client/x11/playback.h
deleted file mode 100644
index c0b8c52..0000000
diff --git a/client/x11/record.cpp b/client/x11/record.cpp
deleted file mode 100644
index 6bc9f60..0000000
diff --git a/client/x11/record.h b/client/x11/record.h
deleted file mode 100644
index fc46948..0000000
diff --git a/client/x11/red_drawable.cpp b/client/x11/red_drawable.cpp
deleted file mode 100644
index 19532c7..0000000
diff --git a/client/x11/red_pixmap.cpp b/client/x11/red_pixmap.cpp
deleted file mode 100644
index af30f52..0000000
diff --git a/client/x11/red_pixmap_gl.cpp b/client/x11/red_pixmap_gl.cpp
deleted file mode 100644
index 7978a40..0000000
diff --git a/client/x11/red_pixmap_sw.cpp b/client/x11/red_pixmap_sw.cpp
deleted file mode 100644
index 3fd8677..0000000
diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp
deleted file mode 100644
index 7e16fcd..0000000
diff --git a/client/x11/red_window_p.h b/client/x11/red_window_p.h
deleted file mode 100644
index 4856be0..0000000
diff --git a/client/x11/res.cpp b/client/x11/res.cpp
deleted file mode 100644
index efbd8de..0000000
diff --git a/client/x11/res.h b/client/x11/res.h
deleted file mode 100644
index 8320e9b..0000000
diff --git a/client/x11/resource.h b/client/x11/resource.h
deleted file mode 100644
index 562b9b9..0000000
diff --git a/client/x11/x_icon.cpp b/client/x11/x_icon.cpp
deleted file mode 100644
index edd983f..0000000
diff --git a/client/x11/x_icon.h b/client/x11/x_icon.h
deleted file mode 100644
index b8b5e96..0000000
diff --git a/client/x11/x_platform.h b/client/x11/x_platform.h
deleted file mode 100644
index 39a2d1c..0000000
diff --git a/client/zlib_decoder.cpp b/client/zlib_decoder.cpp
deleted file mode 100644
index f5741d3..0000000
diff --git a/client/zlib_decoder.h b/client/zlib_decoder.h
deleted file mode 100644
index c91ed49..0000000
diff --git a/configure.ac b/configure.ac
index 3c81adf..420eb90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,6 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)
 
-# For automake >= 1.12
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip subdir-objects])
 AM_MAINTAINER_MODE
 
@@ -33,7 +30,6 @@ AC_PROG_CC_C99
 if test x"$ac_cv_prog_cc_c99" = xno; then
     AC_MSG_ERROR([C99 compiler is required.])
 fi
-AC_PROG_CXX
 AC_PROG_INSTALL
 AC_CANONICAL_HOST
 AC_PROG_LIBTOOL
@@ -47,8 +43,6 @@ AC_CHECK_HEADERS([execinfo.h])
 AC_CHECK_HEADERS([linux/sockios.h])
 AC_FUNC_ALLOCA
 
-AC_DEFINE([__STDC_FORMAT_MACROS],[],[Force definition of format macros for C++])
-
 SPICE_LT_VERSION=m4_format("%d:%d:%d", SPICE_CURRENT, SPICE_REVISION, SPICE_AGE)
 AC_SUBST(SPICE_LT_VERSION)
 
@@ -74,54 +68,8 @@ esac
 AC_MSG_RESULT($variant bit)
 AM_CONDITIONAL([X86_64], [test "$variant" = 64])
 
-AC_MSG_CHECKING([for native Win32])
-case "$host" in
-  *-*-mingw*)
-    os_win32=yes
-    ;;
-  *)
-    os_win32=no
-    ;;
-esac
-AC_MSG_RESULT([$os_win32])
-
-case $host in
-  *-*-linux*)
-    os_linux=yes
-    ;;
-esac
-
-dnl =========================================================================
-dnl Check OS target
-
-AC_MSG_CHECKING([for some Win32 platform])
-case "$host" in
-  *-*-mingw*|*-*-cygwin*)
-    platform_win32=yes
-    ;;
-  *)
-    platform_win32=no
-    ;;
-esac
-AC_MSG_RESULT([$platform_win32])
-if test "$platform_win32" = yes; then
-  red_target=windows
-else
-  red_target=x11
-fi
-
-AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
-AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
-AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")
-
 dnl =========================================================================
 dnl Check optional features
-AC_ARG_ENABLE(gui,
-[  --enable-gui         Enable start dialog with CEGUI],,
-[enable_gui="no"])
-AS_IF([test x"$enable_gui" != "xno"], [enable_gui="yes"])
-AM_CONDITIONAL(SUPPORT_GUI, test "x$enable_gui" != "xno")
-
 AC_ARG_ENABLE(opengl,
 [  --enable-opengl         Enable opengl requirement / support (not recommended)],,
 [enable_opengl="no"])
@@ -137,12 +85,6 @@ if test "x$enable_smartcard" = "xyes"; then
    AC_DEFINE([USE_SMARTCARD], [1], [Define if supporting smartcard proxying])
 fi
 
-AC_ARG_ENABLE(client,
-[  --enable-client         Enable spice client],,
-[enable_client="no"])
-AS_IF([test x"$enable_client" != "xno"], [enable_client="yes"])
-AM_CONDITIONAL(SUPPORT_CLIENT, test "x$enable_client" = "xyes")
-
 AC_ARG_ENABLE(automated_tests,
 [  --enable-automated-tests     Enable automated tests using spicy-screenshot (part of spice--gtk)],,
 [enable_automated_tests="no"])
@@ -166,49 +108,10 @@ AC_CHECK_LIB(rt, clock_gettime,
    )
 AC_SUBST(LIBRT)
 
-if test "$red_target" = "windows"; then
-	AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" -lpthreadGC2 -lversion -lmsimg32 $LIBM"])
-else
-	AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" -pthread $LIBM $LIBRT"])
-fi
-
-dnl The client needs a yield function
-AC_MSG_CHECKING(for posix yield function)
-for yield_func in pthread_yield pthread_yield_np sched_yield \
-					thr_yield; do
-    spice_save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $SPICE_NONPKGCONFIG_LIBS"
-    AC_TRY_LINK([#include <pthread.h>],
-		[$yield_func()],
-		[posix_yield_func="$yield_func"
-		break])
-    CPPFLAGS="$spice_save_CPPFLAGS"
-done
-if test x"$posix_yield_func" = xnone; then
-    AC_MSG_ERROR([No posix yield function found])
-else
-    AC_MSG_RESULT($posix_yield_func)
-    posix_yield_func="$posix_yield_func()"
-fi
-AC_DEFINE_UNQUOTED([POSIX_YIELD_FUNC],$posix_yield_func,[The POSIX RT yield function])
+AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" -pthread $LIBM $LIBRT"])
 
 SPICE_REQUIRES=""
 
-if test "x$enable_gui" = "xyes" && test "x$enable_client" = "xyes" ; then
-    PKG_CHECK_MODULES(CEGUI06, CEGUI-0.6 >= 0.6.0 CEGUI-0.6 < 0.7.0,
-    [
-        AC_SUBST(CEGUI06_CFLAGS)
-        AC_SUBST(CEGUI06_LIBS)
-        AC_DEFINE([USE_GUI], [1], [Define to build with CEGUI support])
-    ],
-    [
-        PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.6.0 CEGUI < 0.7.0)
-        AC_SUBST(CEGUI_CFLAGS)
-        AC_SUBST(CEGUI_LIBS)
-        AC_DEFINE([USE_GUI], [1], [Define to build with CEGUI support])
-    ])
-fi
-
 if test "x$enable_smartcard" = "xyes"; then
     PKG_CHECK_MODULES(CAC_CARD, libcacard >= 0.1.2)
     SMARTCARD_LIBS="$CAC_CARD_LIBS"
@@ -272,68 +175,6 @@ AC_SUBST(GL_CFLAGS)
 AC_SUBST(GL_LIBS)
 AS_VAR_APPEND([SPICE_NONPKGCONFIG_LIBS], [" $GL_LIBS"])
 
-if test "x$red_target" = "xx11" && test "x$enable_client" = "xyes" ; then
-	if test "$os_linux" = yes; then
-		PKG_CHECK_MODULES(ALSA, alsa)
-		AC_SUBST(ALSA_CFLAGS)
-		AC_SUBST(ALSA_LIBS)
-	fi
-
-	PKG_CHECK_MODULES(XRANDR, xrandr)
-	PKG_CHECK_MODULES(XFIXES, xfixes)
-	PKG_CHECK_MODULES(MISC_X, x11 xext xrender)
-	AC_SUBST(XRANDR_CFLAGS)
-	AC_SUBST(XRANDR_LIBS)
-	AC_SUBST(MISC_X_CFLAGS)
-	AC_SUBST(MISC_X_LIBS)
-
-	PKG_CHECK_MODULES(XRANDR12,
-	        xrandr >= 1.2,
-	        have_xrandr12=yes,
-	        have_xrandr12=no)
-else
-	have_xrandr12=no
-fi
-
-AM_CONDITIONAL([HAVE_XRANDR12], [test "x$have_xrandr12" = "xyes"])
-if test "x$have_xrandr12" = "xyes" ; then
-  AC_DEFINE([HAVE_XRANDR12], [], [Define if we have XRANDR 12])
-fi
-
-# Add parameter for libXinerama
-AC_ARG_ENABLE([xinerama],
-    [AS_HELP_STRING([--disable-xinerama],
-        [disable Xinerama library @<:@default=no@:>@])])
-
-if test "x$enable_xinerama" != "xno"; then
-    PKG_CHECK_MODULES(XINERAMA,
-        xinerama >= 1.0,
-        have_xinerama=yes,
-        have_xinerama=no)
-else
-    have_xinerama=no
-fi
-
-if test "x$enable_xinerama" = "xyes" && test "x$have_xinerama" = "xno"; then
-    AC_MSG_ERROR([Requested Xinerama library was not found])
-fi
-
-AM_CONDITIONAL([HAVE_XINERAMA], [test "x$have_xinerama" = "xyes"])
-if test "x$have_xinerama" = "xyes" ; then
-  AC_DEFINE([HAVE_XINERAMA], [], [Define if we have Xinerama])
-  AC_SUBST(XINERAMA_CFLAGS)
-  AC_SUBST(XINERAMA_LIBS)
-  AS_VAR_APPEND([SPICE_REQUIRES], [" xinerama"])
-fi
-
-# Add parameter for (partial) static linkage of spice client.
-# this is used to achive single binary package for all (?) distros.
-AC_ARG_ENABLE(static-linkage,
-[  --enable-static-linkage will generate spice client binary with static linkage to external libraries ],,
-[enable_static_linkage="no"])
-AS_IF([test x"$enable_static_linkage" != "xno"],
-[SPICEC_STATIC_LINKAGE_BSTATIC=["-Wl,-Bstatic"]])
-
 AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
     AC_MSG_CHECKING([for jpeglib.h])
     AC_TRY_CPP(
@@ -439,35 +280,7 @@ SPICE_COMPILE_WARNINGS
 LIBVIRT_LINKER_RELRO
 LIBVIRT_LINKER_NO_INDIRECT
 
-# use ximage.h for win32 build if it is found (no package for mingw32 atm)
-if test $os_win32 = "yes" ; then
-    AC_MSG_CHECKING([for cximage])
-    AC_TRY_CPP(
-[#include <ximage.h>
-int main()
-{
- return CXIMAGE_FORMAT_RAW;
-)}
-],[
- AC_MSG_RESULT([found])
- have_cximage="yes"
-]
-,[AC_MSG_RESULT([missing])
- CXIMAGE_CFLAGS='-DDISABLE_CXIMAGE'
- have_cximage="no"
- ]
-)
-fi
-AC_SUBST(CXIMAGE_CFLAGS)
-
-# check for windres for mingw32 builds
-if test $os_win32 = "yes" ; then
-    AC_CHECK_PROGS(WINDRES,i686-pc-mingw32-windres mingw-windres mingw32-windres,false)
-    AC_SUBST(WINDRES)
-fi
-
 AC_SUBST(WARN_CFLAGS)
-AC_SUBST(CFLAGS_CFLAGS)
 
 dnl =========================================================================
 dnl -fvisibility stuff
@@ -511,7 +324,6 @@ Makefile
 spice-server.pc
 server/Makefile
 server/tests/Makefile
-client/Makefile
 docs/Makefile
 docs/manual/Makefile
 ])
@@ -527,18 +339,6 @@ echo "
         c++ compiler:             ${CXX}
         python:                   ${PYTHON}
 
-        Build Spice client:       ${enable_client}
-" ; if test "x$enable_client" = "xyes"; then echo "\
-        Have XRANDR 1.2:          ${have_xrandr12}
-
-        Have Xinerama:            ${have_xinerama}
-
-        Red target:               ${red_target}
-
-        OpenGL:                   ${enable_opengl}
-
-        GUI:                      ${enable_gui}
-" ; fi ; echo "\
         Smartcard:                ${enable_smartcard}
 
         SASL support:             ${enable_sasl}
@@ -548,12 +348,6 @@ echo "
         Manual:                   ${have_asciidoc}
 "
 
-if test $os_win32 = "yes" ; then
-echo \
-"        Copy & Paste Images:     ${have_cximage}
-"
-fi
-
 echo \
 "        Now type 'make' to build $PACKAGE
 "
-- 
2.1.0



More information about the Spice-devel mailing list