mirror of
https://github.com/samba-team/samba.git
synced 2025-09-21 21:44:21 +03:00
r13546: NSS soname merge from trunk
(This used to be commit 380d89d148
)
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
671c0098f6
commit
f4e11e9ddb
@@ -206,7 +206,7 @@ dnl Unique-to-Samba variables we'll be playing with.
|
|||||||
AC_SUBST(SHELL)
|
AC_SUBST(SHELL)
|
||||||
AC_SUBST(LDSHFLAGS)
|
AC_SUBST(LDSHFLAGS)
|
||||||
AC_SUBST(SONAMEFLAG)
|
AC_SUBST(SONAMEFLAG)
|
||||||
AC_SUBST(SONAMEVERSIONSUFFIX)
|
AC_SUBST(NSSSONAMEVERSIONSUFFIX)
|
||||||
AC_SUBST(SHLD)
|
AC_SUBST(SHLD)
|
||||||
AC_SUBST(HOST_OS)
|
AC_SUBST(HOST_OS)
|
||||||
AC_SUBST(PICFLAGS)
|
AC_SUBST(PICFLAGS)
|
||||||
@@ -1422,7 +1422,7 @@ BLDSHARED="false"
|
|||||||
HOST_OS="$host_os"
|
HOST_OS="$host_os"
|
||||||
LDSHFLAGS="-shared"
|
LDSHFLAGS="-shared"
|
||||||
SONAMEFLAG="#"
|
SONAMEFLAG="#"
|
||||||
SONAMEVERSIONSUFFIX=""
|
NSSSONAMEVERSIONSUFFIX=""
|
||||||
SHLD="\${CC} \${CFLAGS}"
|
SHLD="\${CC} \${CFLAGS}"
|
||||||
PICFLAGS=""
|
PICFLAGS=""
|
||||||
PICSUFFIX="po"
|
PICSUFFIX="po"
|
||||||
@@ -1447,7 +1447,7 @@ if test "$enable_shared" = "yes"; then
|
|||||||
DYNEXP="-Wl,--export-dynamic"
|
DYNEXP="-Wl,--export-dynamic"
|
||||||
PICFLAGS="-fPIC"
|
PICFLAGS="-fPIC"
|
||||||
SONAMEFLAG="-Wl,-soname="
|
SONAMEFLAG="-Wl,-soname="
|
||||||
SONAMEVERSIONSUFFIX=".2"
|
NSSSONAMEVERSIONSUFFIX=".2"
|
||||||
AC_DEFINE(STAT_ST_BLOCKSIZE,512)
|
AC_DEFINE(STAT_ST_BLOCKSIZE,512)
|
||||||
;;
|
;;
|
||||||
*solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
|
*solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
|
||||||
@@ -1456,6 +1456,8 @@ if test "$enable_shared" = "yes"; then
|
|||||||
SONAMEFLAG="-h "
|
SONAMEFLAG="-h "
|
||||||
if test "${GCC}" = "yes"; then
|
if test "${GCC}" = "yes"; then
|
||||||
PICFLAGS="-fPIC"
|
PICFLAGS="-fPIC"
|
||||||
|
SONAMEFLAG="-Wl,-soname="
|
||||||
|
NSSSONAMEVERSIONSUFFIX=".1"
|
||||||
if test "${ac_cv_prog_gnu_ld}" = "yes"; then
|
if test "${ac_cv_prog_gnu_ld}" = "yes"; then
|
||||||
DYNEXP="-Wl,-E"
|
DYNEXP="-Wl,-E"
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user