diff options
| author | Aleksey Sanin <aleksey@src.gnome.org> | 2003-05-12 18:29:57 +0000 |
|---|---|---|
| committer | Aleksey Sanin <aleksey@src.gnome.org> | 2003-05-12 18:29:57 +0000 |
| commit | dd82777cdd95c334e12c5f915d8db0cf9ce62e06 (patch) | |
| tree | 42280da4dd9c53073d0b48047ed468fc1eb8a9e9 | |
| parent | d2ad1b7d271bc43a6e2311a508f1f3cc8fc5d3a8 (diff) | |
| download | xmlsec1-dd82777cdd95c334e12c5f915d8db0cf9ce62e06.tar.gz xmlsec1-dd82777cdd95c334e12c5f915d8db0cf9ce62e06.tar.bz2 xmlsec1-dd82777cdd95c334e12c5f915d8db0cf9ce62e06.zip | |
updated NSS link options (use -r[ath fopr gnu ldd)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 28 |
2 files changed, 28 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Mon May 12 10:01:30 2003 Aleksey Sanin <aleksey@aleksey.com> + + * configure.in: link with NSS using -rpath (Tej) + Mon May 5 08:00:31 2003 Aleksey Sanin <aleksey@aleksey.com> * configure.in: new configuration options for NSS (Tej) diff --git a/configure.in b/configure.in index 33d6e052..22b434fa 100644 --- a/configure.in +++ b/configure.in @@ -445,7 +445,12 @@ else if test "$with_nspr" != "" ; then NSPR_PREFIX="$with_nspr" NSPR_CFLAGS="-I$with_nspr/include" - NSPR_LIBS="-L$with_nspr/lib $NSPR_LIBS_LIST" + if test "$with_gnu_ld" = yes + then + NSPR_LIBS="-Wl,-rpath -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST" + else + NSPR_LIBS="-L$with_nspr/lib $NSPR_LIBS_LIST" + fi NSPR_LDADDS="-L$with_nspr/lib $NSPR_LIBS_LIST" NSPR_INCLUDES_FOUND="yes" NSPR_LIBS_FOUND="yes" @@ -472,7 +477,12 @@ else if test "$dir" = "/usr/lib" ; then NSPR_LIBS="$NSPR_LIBS_LIST" else - NSPR_LIBS="-L$dir $NSPR_LIBS_LIST" + if test "$with_gnu_ld" = yes + then + NSPR_LIBS="-Wl,-rpath -Wl,$dir -L$dir $NSPR_LIBS_LIST" + else + NSPR_LIBS="-L$dir $NSPR_LIBS_LIST" + fi fi NSPR_LIBS_FOUND="yes" break @@ -509,7 +519,12 @@ else if test "$with_nss" != "" ; then NSS_PREFIX="$with_nss" NSS_CFLAGS="-I$with_nss/include" - NSS_LIBS="-L$with_nss/lib $NSS_LIBS_LIST" + if test "$with_gnu_ld" = yes + then + NSS_LIBS="-Wl,-rpath -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST" + else + NSS_LIBS="-L$with_nss/lib $NSS_LIBS_LIST" + fi NSS_LDADDS="-L$with_nss/lib $NSS_LIBS_LIST" NSS_INCLUDES_FOUND="yes" NSS_LIBS_FOUND="yes" @@ -535,7 +550,12 @@ else if test "$dir" = "/usr/lib" ; then NSS_LIBS="$NSS_LIBS_LIST" else - NSS_LIBS="-L$dir $NSS_LIBS_LIST" + if test "$with_gnu_ld" = yes + then + NSS_LIBS="-Wl,-rpath -Wl,$dir -L$dir $NSS_LIBS_LIST" + else + NSS_LIBS="-L$dir $NSS_LIBS_LIST" + fi fi NSS_LIBS_FOUND="yes" break |