diff options
| author | Gerald Carter <jerry@samba.org> | 2006-02-17 19:19:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:12 -0500 |
| commit | f4e11e9ddbecd5ec0a50246c891a3c696be526a9 (patch) | |
| tree | fe5f6150df17502512eedc3a743205c727abf59f /source3 | |
| parent | 671c0098f683510194ae672973b167c0532eeba8 (diff) | |
| download | samba-f4e11e9ddbecd5ec0a50246c891a3c696be526a9.tar.gz samba-f4e11e9ddbecd5ec0a50246c891a3c696be526a9.tar.bz2 samba-f4e11e9ddbecd5ec0a50246c891a3c696be526a9.zip | |
r13546: NSS soname merge from trunk
(This used to be commit 380d89d148548b4658f705e900d874094a123359)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/configure.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/configure.in b/source3/configure.in index 6ec2b3808f..48563ed970 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -206,7 +206,7 @@ dnl Unique-to-Samba variables we'll be playing with. AC_SUBST(SHELL) AC_SUBST(LDSHFLAGS) AC_SUBST(SONAMEFLAG) -AC_SUBST(SONAMEVERSIONSUFFIX) +AC_SUBST(NSSSONAMEVERSIONSUFFIX) AC_SUBST(SHLD) AC_SUBST(HOST_OS) AC_SUBST(PICFLAGS) @@ -1422,7 +1422,7 @@ BLDSHARED="false" HOST_OS="$host_os" LDSHFLAGS="-shared" SONAMEFLAG="#" -SONAMEVERSIONSUFFIX="" +NSSSONAMEVERSIONSUFFIX="" SHLD="\${CC} \${CFLAGS}" PICFLAGS="" PICSUFFIX="po" @@ -1447,7 +1447,7 @@ if test "$enable_shared" = "yes"; then DYNEXP="-Wl,--export-dynamic" PICFLAGS="-fPIC" SONAMEFLAG="-Wl,-soname=" - SONAMEVERSIONSUFFIX=".2" + NSSSONAMEVERSIONSUFFIX=".2" AC_DEFINE(STAT_ST_BLOCKSIZE,512) ;; *solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris]) @@ -1456,6 +1456,8 @@ if test "$enable_shared" = "yes"; then SONAMEFLAG="-h " if test "${GCC}" = "yes"; then PICFLAGS="-fPIC" + SONAMEFLAG="-Wl,-soname=" + NSSSONAMEVERSIONSUFFIX=".1" if test "${ac_cv_prog_gnu_ld}" = "yes"; then DYNEXP="-Wl,-E" fi |