diff options
| author | dscho <dscho> | 2003-02-28 14:05:27 +0000 |
|---|---|---|
| committer | dscho <dscho> | 2003-02-28 14:05:27 +0000 |
| commit | c4d44f983e02ec6b2e94585033c8ce8eea905e64 (patch) | |
| tree | 008a635ed3db1b90dc5e9aec904e31cc5c032a59 | |
| parent | 8d308e2fb867836f670059f29f9391e33af05c03 (diff) | |
| download | libtdevnc-c4d44f983e02ec6b2e94585033c8ce8eea905e64.tar.gz libtdevnc-c4d44f983e02ec6b2e94585033c8ce8eea905e64.zip | |
let libvncserver-config behave as expected when called without installing
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libvncserver-config.in | 23 |
3 files changed, 26 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index cc4093c..49277b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,3 +42,10 @@ rpm: $(PACKAGE)-$(VERSION).tar.gz libvncserver.spec cp $(PACKAGE)-$(VERSION).tar.gz @RPMSOURCEDIR@ rpm -ba libvncserver.spec endif + +all: make_config_executable + +make_config_executable: + chmod a+x libvncserver-config + + diff --git a/configure.ac b/configure.ac index ea65d9f..fafee46 100644 --- a/configure.ac +++ b/configure.ac @@ -124,3 +124,5 @@ AC_CONFIG_FILES([Makefile libvncserver.spec libvncserver-config]) AC_OUTPUT +chmod a+x ./libvncserver-config + diff --git a/libvncserver-config.in b/libvncserver-config.in index 2570cf7..8412639 100644 --- a/libvncserver-config.in +++ b/libvncserver-config.in @@ -3,6 +3,16 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ 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: @PACKAGE@-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--link] [--libs] [--cflags]" @@ -39,18 +49,18 @@ while test $# -gt 0; do echo @VERSION@ ;; --cflags) - if [ "@includedir@" != /usr/include ]; then - includes=-I@includedir@ + if [ "$includedir" != /usr/include ]; then + includes=-I"$includedir" fi - echo $includes + echo "$includes" ;; --libs) if [ "`uname`" = "SunOS" ]; then - libdirs="-L@libdir@ -R@libdir@" + libdirs="-L$libdir -R$libdir" else - libdirs="-L@libdir@" + libdirs="-L$libdir" fi - echo $libdirs -lvncserver @LIBS@ + echo "$libdirs" -lvncserver @LIBS@ ;; --link) echo @CCLD@ @@ -62,3 +72,4 @@ while test $# -gt 0; do esac shift done + |