On Linux, use $(CC) to link the shared library. Define _REENTRANT in just

one place for Solaris.  Use the null command : instead of 'true'.
Modified files: configure.in, configure.
This commit is contained in:
wtc%netscape.com 2001-05-21 22:55:09 +00:00
Родитель 069bfa0edf
Коммит c70b2e0e8c
2 изменённых файлов: 6 добавлений и 11 удалений

10
nsprpub/configure поставляемый
Просмотреть файл

@ -3494,9 +3494,9 @@ EOF
CXXFLAGS="$CXXFLAGS -ansi -Wall -pipe"
MDCPUCFG_H=_linux.cfg
PR_MD_CSRCS=linux.c
MKSHLIB='$(LD) $(DSO_LDOPTS) -soname $(notdir $@) -o $@'
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
DSO_CFLAGS=-fPIC
DSO_LDOPTS=-shared
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
OS_LIBS="$OS_LIBS -lc"
_OPTIMIZE_FLAGS=-O2
case "${target_cpu}" in
@ -4987,10 +4987,6 @@ echo "configure:4975: checking whether ${CC-cc} accepts -pthreads" >&5
case "$target" in
*-solaris*)
cat >> confdefs.h <<\EOF
#define _REENTRANT 1
EOF
if test "$ac_cv_have_dash_pthreads" = "yes"; then
_PTHREAD_LDFLAGS=
fi
@ -5154,7 +5150,7 @@ EOF
fi
if test -n "$USE_PTHREADS"; then
if echo $OS_RELEASE | egrep -c '(V2.0|V3.2)' 2>/dev/null; then
true
:
else
cat >> confdefs.h <<\EOF
#define _PR_HAVE_THREADSAFE_GETHOST 1

Просмотреть файл

@ -1027,9 +1027,9 @@ case "$target" in
CXXFLAGS="$CXXFLAGS -ansi -Wall -pipe"
MDCPUCFG_H=_linux.cfg
PR_MD_CSRCS=linux.c
MKSHLIB='$(LD) $(DSO_LDOPTS) -soname $(notdir $@) -o $@'
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
DSO_CFLAGS=-fPIC
DSO_LDOPTS=-shared
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
OS_LIBS="$OS_LIBS -lc"
_OPTIMIZE_FLAGS=-O2
case "${target_cpu}" in
@ -1933,7 +1933,6 @@ if test -n "$USE_PTHREADS"; then
case "$target" in
*-solaris*)
AC_DEFINE(_REENTRANT)
if test "$ac_cv_have_dash_pthreads" = "yes"; then
_PTHREAD_LDFLAGS=
fi
@ -2043,7 +2042,7 @@ case "$target" in
fi
if test -n "$USE_PTHREADS"; then
if echo $OS_RELEASE | egrep -c '(V2.0|V3.2)' 2>/dev/null; then
true
:
else
AC_DEFINE(_PR_HAVE_THREADSAFE_GETHOST)
fi