summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordscho <dscho>2003-02-16 01:25:42 +0000
committerdscho <dscho>2003-02-16 01:25:42 +0000
commitaaee934fa354a2db784c91bd2993c65f6684afae (patch)
treee98097d588f25beade7a6251e0f1888801b7a129
parent3c5d1b0ff208eadfdb9543e0da2d6149644bab03 (diff)
downloadlibtdevnc-aaee934f.tar.gz
libtdevnc-aaee934f.zip
fixed --link option to libvncserver-config
-rw-r--r--configure.ac12
-rw-r--r--libvncserver-config.in2
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