Commit c4d44f98 authored by dscho's avatar dscho

let libvncserver-config behave as expected when called without installing

parent 8d308e2f
...@@ -42,3 +42,10 @@ rpm: $(PACKAGE)-$(VERSION).tar.gz libvncserver.spec ...@@ -42,3 +42,10 @@ rpm: $(PACKAGE)-$(VERSION).tar.gz libvncserver.spec
cp $(PACKAGE)-$(VERSION).tar.gz @RPMSOURCEDIR@ cp $(PACKAGE)-$(VERSION).tar.gz @RPMSOURCEDIR@
rpm -ba libvncserver.spec rpm -ba libvncserver.spec
endif endif
all: make_config_executable
make_config_executable:
chmod a+x libvncserver-config
...@@ -124,3 +124,5 @@ AC_CONFIG_FILES([Makefile ...@@ -124,3 +124,5 @@ AC_CONFIG_FILES([Makefile
libvncserver.spec libvncserver.spec
libvncserver-config]) libvncserver-config])
AC_OUTPUT AC_OUTPUT
chmod a+x ./libvncserver-config
...@@ -3,6 +3,16 @@ ...@@ -3,6 +3,16 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
exec_prefix_set=no exec_prefix_set=no
includedir=@includedir@
libdir=@libdir@
# if this script is in the same directory as libvncserver-config.in, assume not installed
if [ -f "`dirname "$0"`/libvncserver-config.in" ]; then
dir="`dirname "$0"`"
prefix="`cd "$dir"; pwd`"
includedir="$prefix"
libdir="$prefix"
fi
usage="\ usage="\
Usage: @PACKAGE@-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--link] [--libs] [--cflags]" Usage: @PACKAGE@-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--link] [--libs] [--cflags]"
...@@ -39,18 +49,18 @@ while test $# -gt 0; do ...@@ -39,18 +49,18 @@ while test $# -gt 0; do
echo @VERSION@ echo @VERSION@
;; ;;
--cflags) --cflags)
if [ "@includedir@" != /usr/include ]; then if [ "$includedir" != /usr/include ]; then
includes=-I@includedir@ includes=-I"$includedir"
fi fi
echo $includes echo "$includes"
;; ;;
--libs) --libs)
if [ "`uname`" = "SunOS" ]; then if [ "`uname`" = "SunOS" ]; then
libdirs="-L@libdir@ -R@libdir@" libdirs="-L$libdir -R$libdir"
else else
libdirs="-L@libdir@" libdirs="-L$libdir"
fi fi
echo $libdirs -lvncserver @LIBS@ echo "$libdirs" -lvncserver @LIBS@
;; ;;
--link) --link)
echo @CCLD@ echo @CCLD@
...@@ -62,3 +72,4 @@ while test $# -gt 0; do ...@@ -62,3 +72,4 @@ while test $# -gt 0; do
esac esac
shift shift
done done
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