samba-cvs.cvs
[Top] [All Lists]

svn commit: samba r13546 - in branches/SAMBA_3_0/source: .

Subject: svn commit: samba r13546 - in branches/SAMBA_3_0/source: .
From:
Date: Fri, 17 Feb 2006 19:19:26 +0000 GMT
Author: jerry
Date: 2006-02-17 19:19:25 +0000 (Fri, 17 Feb 2006)
New Revision: 13546

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13546

Log:
NSS soname merge from trunk
Modified:
   branches/SAMBA_3_0/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in      2006-02-17 19:07:58 UTC (rev 
13545)
+++ branches/SAMBA_3_0/source/configure.in      2006-02-17 19:19:25 UTC (rev 
13546)
@@ -206,7 +206,7 @@
 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 @@
 HOST_OS="$host_os"
 LDSHFLAGS="-shared"
 SONAMEFLAG="#"
-SONAMEVERSIONSUFFIX=""
+NSSSONAMEVERSIONSUFFIX=""
 SHLD="\${CC} \${CFLAGS}"
 PICFLAGS=""
 PICSUFFIX="po"
@@ -1447,7 +1447,7 @@
                        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 @@
                        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

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r13546 - in branches/SAMBA_3_0/source: ., jerry <=