From aaee934fa354a2db784c91bd2993c65f6684afae Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Sun, 16 Feb 2003 01:25:42 +0000
Subject: [PATCH] fixed --link option to libvncserver-config

---
 configure.ac           | 12 ++++++++++--
 libvncserver-config.in |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3be2cc2..81b0232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,11 @@ AM_CONFIG_HEADER([include/rfbconfig.h])
 
 # Checks for programs.
 AC_PROG_CC
-CCLD="\$(CC)"
+if test -z "$CC"; then
+	CCLD="\$(CC)"
+else
+	CCLD="$CC"
+fi
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
@@ -55,7 +59,11 @@ if test ! -z "$HAVE_ZLIB_H"; then
 		if test x$CXX != xnone; then
 			AC_DEFINE(HAVE_ZRLE)
 			AC_PROG_CXX
-			CCLD="\$(CXX)"
+			if test -z "$CXX"; then
+				CCLD="\$(CXX)"
+			else
+				CCLD="$CXX"
+			fi
 		fi
 	fi
 else
diff --git a/libvncserver-config.in b/libvncserver-config.in
index 7de2fbf..c1c0749 100644
--- a/libvncserver-config.in
+++ b/libvncserver-config.in
@@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@
 exec_prefix_set=no
 
 usage="\
-Usage: @PACKAGE@-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+Usage: @PACKAGE@-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--link] [--libs] [--cflags]"
 
 if test $# -eq 0; then
       echo "${usage}" 1>&2