summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordscho <dscho>2006-09-12 22:20:41 +0000
committerdscho <dscho>2006-09-12 22:20:41 +0000
commit94501cdcfaeecf09c42584589a4d419ce6ecf8aa (patch)
tree8aa891655d8745b4ca79eaa9264b9f16fefef86d
parent75b900a38ae72c6a64c358f4cf76c1a2627bf2ea (diff)
downloadlibtdevnc-94501cdc.tar.gz
libtdevnc-94501cdc.zip
fix in-place compilation of VisualNaCro
-rw-r--r--VisualNaCro/Makefile.am2
-rw-r--r--libvncserver-config.in15
2 files changed, 9 insertions, 8 deletions
diff --git a/VisualNaCro/Makefile.am b/VisualNaCro/Makefile.am
index 13891c5..5ad3f0d 100644
--- a/VisualNaCro/Makefile.am
+++ b/VisualNaCro/Makefile.am
@@ -4,7 +4,7 @@ OBJS=nacro.o
ISRCS=nacro_wrap.c
IOBJS=nacro_wrap.o
TARGET=nacro
-LIBS= -lvncclient @LIBVNCSERVERLIBS@
+LIBS= @LIBVNCSERVERLIBS@
nacro_CFLAGS= @LIBVNCSERVERCFLAGS@
diff --git a/libvncserver-config.in b/libvncserver-config.in
index 13fc4c1..24dbced 100644
--- a/libvncserver-config.in
+++ b/libvncserver-config.in
@@ -11,7 +11,7 @@ if [ -f "`dirname "$0"`/libvncserver-config.in" ]; then
dir="`dirname "$0"`"
prefix="`cd "$dir"; pwd`"
includedir="$prefix"
- libdir="$prefix"/libvncserver
+ libdir="$prefix/libvncserver $prefix/libvncclient"
fi
usage="\
@@ -55,12 +55,13 @@ while test $# -gt 0; do
echo "$includes"
;;
--libs)
- if [ "`uname`" = "SunOS" ]; then
- libdirs="-L$libdir -R$libdir"
- else
- libdirs="-L$libdir"
- fi
- echo "$libdirs" -lvncserver @LIBS@ @WSOCKLIB@
+ for dir in $libdir; do
+ echo -n "-L$dir "
+ if [ "`uname`" = "SunOS" ]; then
+ echo -n "-R$dir "
+ fi
+ done
+ echo -lvncserver -lvncclient @LIBS@ @WSOCKLIB@
;;
--link)
echo @CC@