Skip to content

L
libvncserver
Commit 60918e66 authored by runge's avatar runge
Browse files
Options

configure.ac: add switches for most X extensions.

parent 9b3163c0
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 37 deletions
ChangeLog
View file @ 60918e66
2006-01-12 Karl Runge <runge@karlrunge.com>
* configure.ac: add switches for most X extensions.
2006-01-10 Johannes E. Schindelin <Johannes.Schindelin@gmx.de> 2006-01-10 Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
* libvncserver/{main.c,rfbserver.c}: fix timely closing of clients; * libvncserver/{main.c,rfbserver.c}: fix timely closing of clients;
the client iterator in rfbProcessEvents() has to iterate also the client iterator in rfbProcessEvents() has to iterate also
......
configure.ac
View file @ 60918e66
...@@ -19,7 +19,7 @@ AC_PATH_PROG([AR], [ar], [/usr/bin/ar], ...@@ -19,7 +19,7 @@ AC_PATH_PROG([AR], [ar], [/usr/bin/ar],
# Options # Options
AH_TEMPLATE(WITH_TIGHTVNC_FILETRANSFER, [Disable TightVNCFileTransfer protocol]) AH_TEMPLATE(WITH_TIGHTVNC_FILETRANSFER, [Disable TightVNCFileTransfer protocol])
AC_ARG_WITH(tightvnc-filetransfer, AC_ARG_WITH(tightvnc-filetransfer,
[ --without-filetransfer disable TightVNC file transfer protocol], [ --without-filetransfer disable TightVNC file transfer protocol],
, [ with_tightvnc_filetransfer=yes ]) , [ with_tightvnc_filetransfer=yes ])
# AC_DEFINE moved to after libpthread check. # AC_DEFINE moved to after libpthread check.
...@@ -59,6 +59,22 @@ AH_TEMPLATE(HAVE_LIBXTRAP, [DEC-XTRAP extension build environment present]) ...@@ -59,6 +59,22 @@ AH_TEMPLATE(HAVE_LIBXTRAP, [DEC-XTRAP extension build environment present])
AH_TEMPLATE(HAVE_RECORD, [RECORD extension build environment present]) AH_TEMPLATE(HAVE_RECORD, [RECORD extension build environment present])
AH_TEMPLATE(HAVE_SOLARIS_XREADSCREEN, [Solaris XReadScreen available]) AH_TEMPLATE(HAVE_SOLARIS_XREADSCREEN, [Solaris XReadScreen available])
AH_TEMPLATE(HAVE_IRIX_XREADDISPLAY, [IRIX XReadDisplay available]) AH_TEMPLATE(HAVE_IRIX_XREADDISPLAY, [IRIX XReadDisplay available])
AC_ARG_WITH(xkeyboard,
[ --without-xkeyboard disable xkeyboard extension support],,)
AC_ARG_WITH(xinerama,
[ --without-xinerama disable xinerama extension support],,)
AC_ARG_WITH(xrandr,
[ --without-xrandr disable xrandr extension support],,)
AC_ARG_WITH(xfixes,
[ --without-xfixes disable xfixes extension support],,)
AC_ARG_WITH(xdamage,
[ --without-xdamage disable xdamage extension support],,)
AC_ARG_WITH(xtrap,
[ --without-xtrap disable xtrap extension support],,)
AC_ARG_WITH(xrecord,
[ --without-xrecord disable xrecord extension support],,)
if test "$X_CFLAGS" != "-DX_DISPLAY_MISSING"; then if test "$X_CFLAGS" != "-DX_DISPLAY_MISSING"; then
AC_CHECK_LIB(X11, XGetImage, HAVE_X="true", AC_CHECK_LIB(X11, XGetImage, HAVE_X="true",
HAVE_X="false", HAVE_X="false",
...@@ -89,13 +105,16 @@ if test "$X_CFLAGS" != "-DX_DISPLAY_MISSING"; then ...@@ -89,13 +105,16 @@ if test "$X_CFLAGS" != "-DX_DISPLAY_MISSING"; then
[AC_DEFINE(HAVE_XTEST)], , [AC_DEFINE(HAVE_XTEST)], ,
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS) $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
AC_CHECK_LIB(Xtst, XRecordEnableContextAsync, if test "x$with_xrecord" != "xno"; then
X_PRELIBS="$X_PRELIBS -lXtst" AC_CHECK_LIB(Xtst, XRecordEnableContextAsync,
[AC_DEFINE(HAVE_RECORD)], , X_PRELIBS="$X_PRELIBS -lXtst"
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS) [AC_DEFINE(HAVE_RECORD)], ,
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
fi
# we use XTRAP on X11R5, or user can set X11VNC_USE_XTRAP # we use XTRAP on X11R5, or user can set X11VNC_USE_XTRAP
if test ! -z "$X11VNC_USE_XTRAP" -o -z "$HAVE_XTESTGRABCONTROL"; then if test "x$with_xtrap" != "xno"; then
if test ! -z "$X11VNC_USE_XTRAP" -o -z "$HAVE_XTESTGRABCONTROL"; then
AC_CHECK_LIB(XTrap, XETrapSetGrabServer, AC_CHECK_LIB(XTrap, XETrapSetGrabServer,
X_PRELIBS="$X_PRELIBS -lXTrap" X_PRELIBS="$X_PRELIBS -lXTrap"
[AC_DEFINE(HAVE_LIBXTRAP)], , [AC_DEFINE(HAVE_LIBXTRAP)], ,
...@@ -105,38 +124,49 @@ if test "$X_CFLAGS" != "-DX_DISPLAY_MISSING"; then ...@@ -105,38 +124,49 @@ if test "$X_CFLAGS" != "-DX_DISPLAY_MISSING"; then
X_PRELIBS="$X_PRELIBS -lXETrap" X_PRELIBS="$X_PRELIBS -lXETrap"
[AC_DEFINE(HAVE_LIBXTRAP)], , [AC_DEFINE(HAVE_LIBXTRAP)], ,
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS) $X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
fi
fi fi
saved_CPPFLAGS="$CPPFLAGS" if test "x$with_xkeyboard" != "xno"; then
CPPFLAGS="$CPPFLAGS $X_CFLAGS" saved_CPPFLAGS="$CPPFLAGS"
AC_CHECK_HEADER(X11/XKBlib.h, HAVE_XKBLIB_H="true", CPPFLAGS="$CPPFLAGS $X_CFLAGS"
HAVE_XKBLIB_H="false", [#include <X11/Xlib.h>]) AC_CHECK_HEADER(X11/XKBlib.h, HAVE_XKBLIB_H="true",
CPPFLAGS="$saved_CPPFLAGS" HAVE_XKBLIB_H="false", [#include <X11/Xlib.h>])
if test $HAVE_XKBLIB_H = "true"; then CPPFLAGS="$saved_CPPFLAGS"
AC_CHECK_LIB(X11, XkbSelectEvents, if test $HAVE_XKBLIB_H = "true"; then
[AC_DEFINE(HAVE_XKEYBOARD)], , AC_CHECK_LIB(X11, XkbSelectEvents,
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS) [AC_DEFINE(HAVE_XKEYBOARD)], ,
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
fi
fi fi
AC_CHECK_LIB(Xinerama, XineramaQueryScreens, if test "x$with_xinerama" != "xno"; then
X_PRELIBS="$X_PRELIBS -lXinerama" AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
[AC_DEFINE(HAVE_LIBXINERAMA)], , X_PRELIBS="$X_PRELIBS -lXinerama"
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS) [AC_DEFINE(HAVE_LIBXINERAMA)], ,
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
fi
AC_CHECK_LIB(Xrandr, XRRSelectInput, if test "x$with_xrandr" != "xno"; then
X_PRELIBS="$X_PRELIBS -lXrandr" AC_CHECK_LIB(Xrandr, XRRSelectInput,
[AC_DEFINE(HAVE_LIBXRANDR)], , X_PRELIBS="$X_PRELIBS -lXrandr"
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS) [AC_DEFINE(HAVE_LIBXRANDR)], ,
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
fi
AC_CHECK_LIB(Xfixes, XFixesGetCursorImage, if test "x$with_xfixes" != "xno"; then
X_PRELIBS="$X_PRELIBS -lXfixes" AC_CHECK_LIB(Xfixes, XFixesGetCursorImage,
[AC_DEFINE(HAVE_LIBXFIXES) HAVE_LIBXFIXES="true"], , X_PRELIBS="$X_PRELIBS -lXfixes"
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS) [AC_DEFINE(HAVE_LIBXFIXES) HAVE_LIBXFIXES="true"], ,
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
fi
AC_CHECK_LIB(Xdamage, XDamageQueryExtension, if test "x$with_xdamage" != "xno"; then
X_PRELIBS="$X_PRELIBS -lXdamage" AC_CHECK_LIB(Xdamage, XDamageQueryExtension,
[AC_DEFINE(HAVE_LIBXDAMAGE) HAVE_LIBXDAMAGE="true"], , X_PRELIBS="$X_PRELIBS -lXdamage"
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS) [AC_DEFINE(HAVE_LIBXDAMAGE) HAVE_LIBXDAMAGE="true"], ,
$X_LIBS $X_PRELIBS -lX11 $X_EXTRA_LIBS)
fi
if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then
# need /usr/sfw/lib in RPATH for Solaris 10 and later # need /usr/sfw/lib in RPATH for Solaris 10 and later
......
x11vnc/ChangeLog
View file @ 60918e66
2006-01-12 Karl Runge <runge@karlrunge.com>
* fix -DSMALL_FOOTPRINT=N builds.
2006-01-11 Karl Runge <runge@karlrunge.com> 2006-01-11 Karl Runge <runge@karlrunge.com>
* x11vnc: close fd > 2 in run_user_command(), -nocmds in crash_debug, * x11vnc: close fd > 2 in run_user_command(), -nocmds in crash_debug,
fix 64bit bug for -solid. fix 64bit bug for -solid.
......
x11vnc/README
View file @ 60918e66
x11vnc README file Date: Wed Jan 11 13:09:08 EST 2006 x11vnc README file Date: Wed Jan 11 23:08:25 EST 2006
The following information is taken from these URLs: The following information is taken from these URLs:
......
x11vnc/tkx11vnc
View file @ 60918e66
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
exec wish "$0" "$@" exec wish "$0" "$@"
catch {rename send {}} catch {rename send {}}
# #
# Copyright (c) 2004-2005 Karl J. Runge <runge@karlrunge.com> # Copyright (c) 2004-2006 Karl J. Runge <runge@karlrunge.com>
# All rights reserved. # All rights reserved.
# #
# This is free software; you can redistribute it and/or modify # This is free software; you can redistribute it and/or modify
...@@ -5955,7 +5955,7 @@ if {"$argv" == "-spit"} { ...@@ -5955,7 +5955,7 @@ if {"$argv" == "-spit"} {
puts "#ifndef _TKX11VNC_H" puts "#ifndef _TKX11VNC_H"
puts "#define _TKX11VNC_H" puts "#define _TKX11VNC_H"
puts "#ifdef NOGUI" puts "#ifdef NOGUI"
puts "char gui_code[] = \"\";" puts "char gui_code\[\] = \"\";"
puts "#else" puts "#else"
puts "/*" puts "/*"
puts " * tkx11vnc.h: generated by 'tkx11vnc -spit'" puts " * tkx11vnc.h: generated by 'tkx11vnc -spit'"
......
x11vnc/tkx11vnc.h
View file @ 60918e66
#ifndef _TKX11VNC_H #ifndef _TKX11VNC_H
#define _TKX11VNC_H #define _TKX11VNC_H
#ifdef NOGUI #ifdef NOGUI
char gui_code = ""; char gui_code[] = "";
#else #else
/* /*
* tkx11vnc.h: generated by 'tkx11vnc -spit' * tkx11vnc.h: generated by 'tkx11vnc -spit'
...@@ -14,7 +14,7 @@ char gui_code = ""; ...@@ -14,7 +14,7 @@ char gui_code = "";
"exec wish \"$0\" \"$@\"\n" "exec wish \"$0\" \"$@\"\n"
"catch {rename send {}}\n" "catch {rename send {}}\n"
"#\n" "#\n"
"# Copyright (c) 2004-2005 Karl J. Runge <runge@karlrunge.com>\n" "# Copyright (c) 2004-2006 Karl J. Runge <runge@karlrunge.com>\n"
"# All rights reserved.\n" "# All rights reserved.\n"
"#\n" "#\n"
"# This is free software; you can redistribute it and/or modify\n" "# This is free software; you can redistribute it and/or modify\n"
...@@ -5966,7 +5966,7 @@ char gui_code = ""; ...@@ -5966,7 +5966,7 @@ char gui_code = "";
" puts \"#ifndef _TKX11VNC_H\"\n" " puts \"#ifndef _TKX11VNC_H\"\n"
" puts \"#define _TKX11VNC_H\"\n" " puts \"#define _TKX11VNC_H\"\n"
" puts \"#ifdef NOGUI\"\n" " puts \"#ifdef NOGUI\"\n"
" puts \"char gui_code[] = \\\"\\\";\"\n" " puts \"char gui_code\\[\\] = \\\"\\\";\"\n"
" puts \"#else\"\n" " puts \"#else\"\n"
" puts \"/*\"\n" " puts \"/*\"\n"
" puts \" * tkx11vnc.h: generated by 'tkx11vnc -spit'\"\n" " puts \" * tkx11vnc.h: generated by 'tkx11vnc -spit'\"\n"
......
x11vnc/x11vnc.h
View file @ 60918e66
...@@ -117,6 +117,11 @@ ...@@ -117,6 +117,11 @@
#endif #endif
#if (SMALL_FOOTPRINT > 1) #if (SMALL_FOOTPRINT > 1)
#undef LIBVNCSERVER_HAVE_XKEYBOARD
#undef LIBVNCSERVER_HAVE_LIBXINERAMA
#undef LIBVNCSERVER_HAVE_LIBXRANDR
#undef LIBVNCSERVER_HAVE_LIBXFIXES
#undef LIBVNCSERVER_HAVE_LIBXDAMAGE
#define LIBVNCSERVER_HAVE_XKEYBOARD 0 #define LIBVNCSERVER_HAVE_XKEYBOARD 0
#define LIBVNCSERVER_HAVE_LIBXINERAMA 0 #define LIBVNCSERVER_HAVE_LIBXINERAMA 0
#define LIBVNCSERVER_HAVE_LIBXRANDR 0 #define LIBVNCSERVER_HAVE_LIBXRANDR 0
...@@ -125,6 +130,9 @@ ...@@ -125,6 +130,9 @@
#endif #endif
#if (SMALL_FOOTPRINT > 2) #if (SMALL_FOOTPRINT > 2)
#undef LIBVNCSERVER_HAVE_UTMPX_H
#undef LIBVNCSERVER_HAVE_PWD_H
#undef REMOTE_CONTROL
#define LIBVNCSERVER_HAVE_UTMPX_H 0 #define LIBVNCSERVER_HAVE_UTMPX_H 0
#define LIBVNCSERVER_HAVE_PWD_H 0 #define LIBVNCSERVER_HAVE_PWD_H 0
#define REMOTE_CONTROL 0 #define REMOTE_CONTROL 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment