diff options
| author | runge <runge> | 2007-05-27 00:27:36 +0000 |
|---|---|---|
| committer | runge <runge> | 2007-05-27 00:27:36 +0000 |
| commit | e871649dab17d079a558c9282add9f2f6445c180 (patch) | |
| tree | 1c6d1d3cb5b6e5fa5ea28502857f704b91e8788e | |
| parent | dd193b133536e68121ff0afebc9ca225f32ff54b (diff) | |
| download | libtdevnc-e871649d.tar.gz libtdevnc-e871649d.zip | |
clobbered x11vnc/Makefile.am by mistake.
| -rw-r--r-- | x11vnc/Makefile.am | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/x11vnc/Makefile.am b/x11vnc/Makefile.am index a0176f3..2165698 100644 --- a/x11vnc/Makefile.am +++ b/x11vnc/Makefile.am @@ -1,5 +1,9 @@ AM_CFLAGS = -I $(top_srcdir) +if HAVE_SYSTEM_LIBVNCSERVER +LDADD = @SYSTEM_LIBVNCSERVER_LIBS@ @WSOCKLIB@ +else LDADD = ../libvncserver/libvncserver.la ../libvncclient/libvncclient.la @WSOCKLIB@ +endif if OSX x11vnc_LDFLAGS = -framework ApplicationServices -framework Carbon -framework IOKit -framework Cocoa @@ -18,11 +22,11 @@ endif bin_PROGRAMS=x11vnc x11vnc_SOURCES = 8to24.c avahi.c cleanup.c connections.c cursor.c gui.c help.c inet.c keyboard.c linuxfb.c macosx.c macosxCG.c macosxCGP.c macosxCGS.c options.c pm.c pointer.c rates.c remote.c scan.c screen.c selection.c solid.c sslcmds.c sslhelper.c uinput.c unixpw.c user.c userinput.c util.c v4l.c win_utils.c x11vnc.c x11vnc_defs.c xdamage.c xevents.c xinerama.c xkb_bell.c xrandr.c xrecord.c xwrappers.c 8to24.h allowed_input_t.h avahi.h blackout_t.h cleanup.h connections.h cursor.h enums.h gui.h help.h inet.h keyboard.h linuxfb.h macosx.h macosxCG.h macosxCGP.h macosxCGS.h nox11.h nox11_funcs.h options.h params.h pm.h pointer.h rates.h remote.h scan.h screen.h scrollevent_t.h selection.h solid.h sslcmds.h sslhelper.h ssltools.h tkx11vnc.h uinput.h unixpw.h user.h userinput.h util.h v4l.h win_utils.h winattr_t.h x11vnc.h xdamage.h xevents.h xinerama.h xkb_bell.h xrandr.h xrecord.h xwrappers.h -if HAVE_X -INCLUDES=@X_CFLAGS@ @AVAHI_CFLAGS@ -x11vnc_LDADD=$(LDADD) @SSL_LIBS@ @CRYPT_LIBS@ @X_LIBS@ @AVAHI_LIBS@ $(LD_CYGIPC) + +if HAVE_SYSTEM_LIBVNCSERVER +INCLUDES=@SYSTEM_LIBVNCSERVER_CFLAGS@ @X_CFLAGS@ @AVAHI_CFLAGS@ else -INCLUDES=@AVAHI_CFLAGS@ -x11vnc_LDADD=$(LDADD) @SSL_LIBS@ @CRYPT_LIBS@ @AVAHI_LIBS@ $(LD_CYGIPC) +INCLUDES=@X_CFLAGS@ @AVAHI_CFLAGS@ endif +x11vnc_LDADD=$(LDADD) @SSL_LIBS@ @CRYPT_LIBS@ @X_LIBS@ @AVAHI_LIBS@ $(LD_CYGIPC) |