Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 325625

Browse Source 
This fix allows the trunk ldap c sdk build to be used to build the mozilla client.  I was able to use this to build the mozilla 1_8 branch of thunderbird on Fedora Core 4.  Addressbook and typedown addressing work fine.
The gist of the fix is to completely ignore svrcore if not specified, and to imply --with-nspr if --with-mozilla is specified.  If not specified, the client build uses $(DIST)/include/nspr and $(DIST)/lib for the locations of the NSPR files.
This commit is contained in:
richm%stanfordalumni.org 2006-02-10 23:08:16 +00:00
parent a80b85f74a
commit c1d09252d4
7 changed files with 936 additions and 1172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
directory/c-sdk/build.mk
View File

@ -175,7 +175,12 @@ DYNAMICNSPR = -l$(PLCBASE) -l$(PLDSBASE) -l$(NSPRBASE)
endif
# use the NSPRLINK macro in other makefiles to define the linker command line
# the mozilla client build likes to set the makefile macro directly
ifdef LIBS_ALREADY_SET
NSPRLINK = $(NSPR_LIBS)
else
NSPRLINK = $(NSPR_LIBS) $(DYNAMICNSPR)
endif
# why the redundant definitions? apparently, all of these basename/libname macros are so that
# the ldapsdk can create a package containing all of the nspr shared libs/dlls - I don't think

2
directory/c-sdk/config/autoconf.mk.in
View File

@ -139,6 +139,8 @@ ifdef OBJECT_MODE
export OBJECT_MODE
endif
LIBS_ALREADY_SET=@LIBS_ALREADY_SET@
# ldap-specific code (up to here, all the code came from
# mozilla/nsprpub/config/autoconf.mk.in)
#

42
directory/c-sdk/config/autoconf/nspr.m4
View File

@ -53,7 +53,7 @@ AC_ARG_WITH(nspr-exec-prefix,
NSPR_CFLAGS=`$PKG_CONFIG --cflags-only-I mozilla-nspr`
NSPR_LIBS=`$PKG_CONFIG --libs-only-L mozilla-nspr`
else
AC_MSG_ERROR([system NSPR not found])
AC_MSG_CHECKING([system NSPR not found])
no_nspr="yes"
fi
else
@ -88,28 +88,36 @@ AC_ARG_WITH(nspr-exec-prefix,
dnl AM_PATH_INTREE_NSPR([ROOTPATH, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for in-tree NSPR, and define NSPR_CFLAGS and NSPR_LIBS
dnl First look for path/*.OBJ/include, then look for path/include
dnl Use the cut in case there is more than one path that matches *.OBJ - just
dnl take the first one
AC_DEFUN(AM_PATH_INTREE_NSPR,
[
nsprpath=`echo $1/*.OBJ | cut -f1 -d' '`
savedir=`pwd`
cd $nsprpath
abs_nsprpath=`pwd`
cd $savedir
if test -f "$abs_nsprpath/include/nspr.h" ; then
NSPR_CFLAGS="-I$abs_nsprpath/include"
fi
if test -d "$abs_nsprpath/lib" ; then
NSPR_LIBS="-L$abs_nsprpath/lib"
fi
AC_MSG_CHECKING(checking for in-tree NSPR from $1)
for nsprpath in "$1" "$1"/*.OBJ ; do
savedir=`pwd`
cd $nsprpath
abs_nsprpath=`pwd`
cd $savedir
if test -f "$abs_nsprpath/include/nspr/nspr.h" ; then
NSPR_CFLAGS="-I$abs_nsprpath/include/nspr"
elif test -f "$abs_nsprpath/include/nspr.h" ; then
NSPR_CFLAGS="-I$abs_nsprpath/include"
fi
if test -d "$abs_nsprpath/lib" ; then
NSPR_LIBS="-L$abs_nsprpath/lib"
fi
if test -n "$NSPR_CFLAGS" -a -n "$NSPR_LIBS" ; then
break
fi
done
if test -n "$NSPR_CFLAGS" -a -n "$NSPR_LIBS" ; then
AC_MSG_CHECKING(using in-tree NSPR from $nsprpath)
AC_SUBST(NSPR_CFLAGS)
AC_SUBST(NSPR_LIBS)
AC_MSG_RESULT(yes)
else
AC_MSG_CHECKING(could not find in-tree NSPR in $nsprpath)
AC_MSG_RESULT(no)
fi
fi
])
dnl AM_PATH_GIVEN_NSPR(no args)
@ -123,7 +131,11 @@ AC_DEFUN(AM_PATH_GIVEN_NSPR,
AC_ARG_WITH(nspr, [ --with-nspr=PATH Netscape Portable Runtime (NSPR) directory],
[
if test "$withval" = "no" ; then
AC_MSG_RESULT(no)
no_nspr="yes"
elif test "$withval" = "yes" ; then
AC_MSG_RESULT(yes)
no_nspr="no"
elif test -e "$withval"/include/nspr.h -a -d "$withval"/lib
then
AC_MSG_RESULT([using $withval])

4
directory/c-sdk/config/autoconf/nss.m4
View File

@ -140,8 +140,10 @@ AC_DEFUN(AM_PATH_GIVEN_NSS,
NSS_CFLAGS="-I$withval/include"
NSS_LIBS="-L$withval/lib"
else
AC_MSG_RESULT(no)
USE_NSS=
fi])
fi],
AC_MSG_RESULT(no))
# check for --with-nss-inc
AC_MSG_CHECKING(for --with-nss-inc)

125
directory/c-sdk/config/autoconf/svrcore.m4
View File

@ -7,30 +7,35 @@ dnl AM_PATH_INTREE_SVRCORE([ROOTPATH, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]
dnl Test for in-tree SVRCORE, and define SVRCORE_CFLAGS and SVRCORE_LIBS
AC_DEFUN(AM_PATH_INTREE_SVRCORE,
[
svrcorelibpath=`echo $1/*.OBJ/lib | cut -f1 -d' '`
savedir=`pwd`
cd $svrcorelibpath
abs_svrcorelibpath=`pwd`
cd $savedir
svrcoreincpath=$1/public/svrcore
savedir=`pwd`
cd $svrcoreincpath
abs_svrcoreincpath=`pwd`
cd $savedir
if test -f "$abs_svrcoreincpath/svrcore.h" ; then
SVRCORE_CFLAGS="-I$abs_svrcoreincpath"
fi
if test -d "$abs_svrcorelibpath" ; then
SVRCORE_LIBS="-L$abs_svrcorelibpath"
fi
if test -n "$SVRCORE_CFLAGS" -a -n "$SVRCORE_LIBS" ; then
AC_MSG_CHECKING(using in-tree SVRCORE from $svrcoreincpath $svrcorelibpath)
AC_SUBST(SVRCORE_CFLAGS)
AC_SUBST(SVRCORE_LIBS)
AC_MSG_RESULT(yes)
else
AC_MSG_CHECKING(could not find in-tree SVRCORE in $1)
AC_MSG_RESULT(no)
if test -n "$HAVE_SVRCORE" ; then
svrcorelibpath=`echo $1/*.OBJ/lib | cut -f1 -d' '`
savedir=`pwd`
cd $svrcorelibpath
abs_svrcorelibpath=`pwd`
cd $savedir
svrcoreincpath=$1/public/svrcore
savedir=`pwd`
cd $svrcoreincpath
abs_svrcoreincpath=`pwd`
cd $savedir
if test -f "$abs_svrcoreincpath/svrcore.h" ; then
SVRCORE_CFLAGS="-I$abs_svrcoreincpath"
fi
if test -d "$abs_svrcorelibpath" ; then
SVRCORE_LIBS="-L$abs_svrcorelibpath -lsvrcore"
fi
if test -n "$SVRCORE_CFLAGS" -a -n "$SVRCORE_LIBS" ; then
AC_MSG_CHECKING(using in-tree SVRCORE from $svrcoreincpath $svrcorelibpath)
AC_SUBST(SVRCORE_CFLAGS)
AC_SUBST(SVRCORE_LIBS)
AC_MSG_RESULT(yes)
elif test -n "$HAVE_SVRCORE" ; then
AC_MSG_CHECKING(could not find in-tree SVRCORE in $1)
AC_MSG_RESULT(no)
else
# If user didn't ask for it, don't complain (really!)
AC_MSG_RESULT(no)
fi
fi
])
@ -44,21 +49,19 @@ AC_DEFUN(AM_PATH_GIVEN_SVRCORE,
AC_ARG_WITH(svrcore,
[[ --with-svrcore[=PATH] Use svrcore - optional PATH is path to svrcore lib and include dirs]],
[ if test "$withval" = "yes"; then
HAVE_SVRCORE=1
AC_MSG_RESULT(yes)
elif test -d "$withval" -a -d "$withval/lib" -a -f "$withval/include/svrcore.h" ; then
elif test -n "$withval" -a -d "$withval" -a -d "$withval/lib" -a -f "$withval/include/svrcore.h" ; then
HAVE_SVRCORE=1
AC_MSG_RESULT([using $withval])
SVRCORE_CFLAGS="-I$withval/include"
SVRCORE_LIB_PATH="-L$withval/lib"
else
HAVE_SVRCORE=
fi], HAVE_SVRCORE=)
# check for --with-svrcore-inc
AC_MSG_CHECKING(for --with-svrcore-inc)
AC_ARG_WITH(svrcore-inc, [ --with-svrcore-inc=PATH svrcore include file directory],
[
if test -e "$withval"/svrcore.h
if test -n "$withval" -a -e "$withval"/svrcore.h
then
AC_MSG_RESULT([using $withval])
SVRCORE_CFLAGS="-I$withval"
@ -67,13 +70,12 @@ AC_DEFUN(AM_PATH_GIVEN_SVRCORE,
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
)
# check for --with-svrcore-lib
AC_MSG_CHECKING(for --with-svrcore-lib)
AC_ARG_WITH(svrcore-lib, [ --with-svrcore-lib=PATH svrcore library directory],
[
if test -d "$withval"
if test -n "$withval" -a -d "$withval"
then
AC_MSG_RESULT([using $withval])
SVRCORE_LIBS="-L$withval"
@ -82,12 +84,13 @@ AC_DEFUN(AM_PATH_GIVEN_SVRCORE,
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
)
dnl if test -n "$SVRCORE_CFLAGS" -a -n "$SVRCORE_LIBS" ; then
dnl AC_SUBST(SVRCORE_CFLAGS)
dnl AC_SUBST(SVRCORE_LIBS)
dnl fi
if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS" ; then
AC_MSG_RESULT(no)
else
HAVE_SVRCORE=1
fi
])
dnl AM_PATH_SVRCORE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
@ -95,30 +98,32 @@ dnl Test for system SVRCORE, and define SVRCORE_CFLAGS and SVRCORE_LIBS
AC_DEFUN(AM_PATH_SVRCORE,
[dnl
no_svrcore=""
AC_MSG_CHECKING(Trying pkg-config svrcore)
AC_PATH_PROG(PKG_CONFIG, pkg-config)
if test -n "$PKG_CONFIG"; then
if $PKG_CONFIG --exists svrcore; then
AC_MSG_CHECKING(using SVRCORE from package svrcore)
SVRCORE_CFLAGS=`$PKG_CONFIG --cflags-only-I svrcore`
SVRCORE_LIBS=`$PKG_CONFIG --libs-only-L svrcore`
if test -n "$HAVE_SVRCORE" ; then
no_svrcore=""
AC_MSG_CHECKING(Trying pkg-config svrcore)
AC_PATH_PROG(PKG_CONFIG, pkg-config)
if test -n "$PKG_CONFIG"; then
if $PKG_CONFIG --exists svrcore; then
AC_MSG_CHECKING(using SVRCORE from package svrcore)
SVRCORE_CFLAGS=`$PKG_CONFIG --cflags-only-I svrcore`
SVRCORE_LIBS=`$PKG_CONFIG --libs-only-L svrcore`
else
# AC_MSG_NOTICE([system SVRCORE not found])
no_svrcore="yes"
fi
else
AC_MSG_ERROR([system SVRCORE not found])
no_svrcore="yes"
no_svrcore="yes"
fi
else
no_svrcore="yes"
if test -z "$no_svrcore"; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
fi
AC_SUBST(SVRCORE_CFLAGS)
AC_SUBST(SVRCORE_LIBS)
fi
if test -z "$no_svrcore"; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
fi
AC_SUBST(SVRCORE_CFLAGS)
AC_SUBST(SVRCORE_LIBS)
])

1688
directory/c-sdk/configure vendored
View File

File diff suppressed because it is too large Load Diff

242
directory/c-sdk/configure.in
View File

@ -199,15 +199,19 @@ AC_ARG_ENABLE(64bit,
[ --enable-64bit Enable 64-bit support (on certain platforms)],
[ if test "$enableval" = "yes"; then
USE_64=1 ; export USE_64
elif test "$enableval" = "no"; then
USE_64=
else
# if the user specified nothing, just guess based on machine type
fi ],
[
dnl if the user specified nothing, just guess based on machine type
arch=`uname -m`
case $arch in
x86_64|ppc64|ia64|s390x) USE_64=1 ; export USE_64 ;;
sun4u) instr_set=`optisa \`isalist\``
case $instr_set in
sparcv9*) USE_64=1 ; export USE_64 ;;
esac
;;
esac
fi ])
])
AC_ARG_ENABLE(mdupdate,
[ --enable-mdupdate Enable use of certain compilers' mdupdate feature],
@ -215,85 +219,6 @@ AC_ARG_ENABLE(mdupdate,
USE_MDUPDATE=1
fi ])
dnl ========================================================
dnl = Use the NSPR copy in the system (assuming it exists)
dnl = rather than the one in the source tree (mozilla/nsprpub)
dnl ========================================================
AC_ARG_WITH(system-nspr,
[ --with-system-nspr Use system installed NSPR],
[ if test "$withval" = "yes"; then
_SYSTEM_NSPR=1
else
_SYSTEM_NSPR=
fi], _SYSTEM_NSPR= )
if test "$_WIN32_MSVC"; then
_SYSTEM_NSPR=
fi
# first, see if user has specified explicit NSPR include and lib paths
AM_PATH_GIVEN_NSPR()
# next, see if user explicitly said to use system nspr
if test -z "$no_nspr" -a -z "$NSPR_CFLAGS" -a -z "$NSPR_LIBS" ; then
if test -n "$_SYSTEM_NSPR"; then
AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=])
else
# see if we are being built in the same build tree as nspr
AM_PATH_INTREE_NSPR(../../dist)
# failing that, see if we can find nspr-config or pkg-config nspr
if test -z "$NSPR_CFLAGS" ; then
AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=])
fi
fi
fi
if test -n "$_SYSTEM_NSPR" -a -z "$MOZ_NATIVE_NSPR"; then
NSPR_CFLAGS='-I$(DIST)/include/nspr'
NSPR_LIBS='-L$(DIST)/lib '"-lplds$NSPR_VERSION -lplc$NSPR_VERSION -lnspr$NSPR_VERSION"
# explicitly set libs for Visual Age C++ for OS/2
if test "$VACPP" = "yes"; then
NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS''
elif test "$_WIN32_MSVC"; then
NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '
fi
fi
dnl ========================================================
dnl = Use the NSS copy in the system (assuming it exists)
dnl = rather than the one in the source tree (mozilla/security)
dnl ========================================================
AC_ARG_WITH(system-nss,
[ --with-system-nss Use system installed NSS],
[ if test "$withval" = "yes"; then
_SYSTEM_NSS=1
USE_NSS=1
else
_SYSTEM_NSS=
fi], _SYSTEM_NSS= )
if test "$_WIN32_MSVC"; then
_SYSTEM_NSS=
fi
# first, see if user has specified explicit NSS include and lib paths
AM_PATH_GIVEN_NSS()
# next, see if user explicitly said to use system nss
if test -n "$USE_NSS" -a -z "$NSS_CFLAGS" -a -z "$NSS_LIBS" ; then
if test -n "$_SYSTEM_NSS"; then
AM_PATH_NSS(3.9.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
else
# see if we are being built in the same build tree as nss
AM_PATH_INTREE_NSS(../../dist)
# failing that, see if we can find nss-config or pkg-config nss
if test -z "$NSS_CFLAGS" ; then
AM_PATH_NSS(3.9.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
fi
fi
fi
dnl ========================================================
dnl = svrcore gives the command line tools secure PIN management
dnl = for client cert based authentication
@ -309,29 +234,146 @@ AC_ARG_WITH(system-svrcore,
HAVE_SVRCORE=1
SVRCORE_LIBS=-lsvrcore
AC_SUBST(SVRCORE_LIBS)
dnl svrcore implies both nspr and nss
USE_NSS=1
no_nspr=no
else
_SYSTEM_SVRCORE=
fi], _SYSTEM_SVRCORE= )
# _SYSTEM_SVRCORE means /usr/lib and /usr/include so no need to add additional
# include or lib paths
dnl _SYSTEM_SVRCORE means /usr/lib and /usr/include so no need to add additional
dnl include or lib paths
if test -z "$_SYSTEM_SVRCORE" ; then
# first, see if user has specified explicit SVRCORE include and lib paths
dnl first, see if user has specified explicit SVRCORE include and lib paths
AM_PATH_GIVEN_SVRCORE()
# next, see if user explicitly said to use system svrcore
if test -z "$SVRCORE_CFLAGS" -a -z "$SVRCORE_LIBS" ; then
if test -n "$_SYSTEM_SVRCORE"; then
AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
else
# see if we are being built in the same build tree as svrcore
AM_PATH_INTREE_SVRCORE(../../dist)
# failing that, see if we can find svrcore-config or pkg-config svrcore
if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS"; then
dnl next, see if user explicitly said to use system svrcore
if test -n "$HAVE_SVRCORE" ; then
dnl svrcore implies both nspr and nss
USE_NSS=1
no_nspr=no
if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS" ; then
if test -n "$_SYSTEM_SVRCORE"; then
AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
else
dnl see if we are being built in the same build tree as svrcore
AM_PATH_INTREE_SVRCORE(../../dist)
dnl failing that, see if we can find svrcore-config or pkg-config svrcore
if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS"; then
AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
fi
fi
fi
fi
fi
fi
if test -n "$HAVE_SVRCORE" ; then
if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS"; then
AC_MSG_ERROR([--with-svrcore specified, but no svrcore could be found])
fi
fi
dnl ========================================================
dnl = Use the NSS copy in the system (assuming it exists)
dnl = rather than the one in the source tree (mozilla/security)
dnl ========================================================
AC_ARG_WITH(system-nss,
[ --with-system-nss Use system installed NSS],
[ if test "$withval" = "yes"; then
_SYSTEM_NSS=1
USE_NSS=1
dnl nss requires nspr
no_nspr=no
elif test "$withval" = "no" ; then
_SYSTEM_NSS=no
fi], _SYSTEM_NSS= )
if test "$_WIN32_MSVC"; then
_SYSTEM_NSS=
fi
dnl first, see if user has specified explicit NSPR include and lib paths,
dnl of if the user has explicitly disabled the use of nss
if test -z "$_SYSTEM_NSS" -o "$_SYSTEM_NSS" = "no" ; then
AM_PATH_GIVEN_NSS()
fi
dnl next, see if user explicitly said to use system nss
if test -n "$USE_NSS" -a -z "$NSS_CFLAGS" -a -z "$NSS_LIBS" ; then
dnl nss requires nspr
no_nspr=no
if test -z "$_SYSTEM_NSS" -o "$_SYSTEM_NSS" = "no" ; then
dnl see if we are being built in the same build tree as nss
AM_PATH_INTREE_NSS(../../dist)
fi
dnl failing that, see if we can find nss-config or pkg-config nss
if test -z "$NSS_CFLAGS" -a "$_SYSTEM_NSS" != "no" ; then
AM_PATH_NSS(3.9.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
fi
fi
dnl bomb out if nss not found
if test -n "$USE_NSS" -a -z "$NSS_CFLAGS" -a -z "$NSS_LIBS" ; then
AC_MSG_ERROR(Need to use NSS but no NSS was found)
fi
dnl ========================================================
dnl = Use the NSPR copy in the system (assuming it exists)
dnl = rather than the one in the source tree (mozilla/nsprpub)
dnl ========================================================
AC_ARG_WITH(system-nspr,
[ --with-system-nspr Use system installed NSPR],
[ if test "$withval" = "yes"; then
_SYSTEM_NSPR=1
no_nspr=no
elif test "$withval" = "no"; then
_SYSTEM_NSPR=no
fi], _SYSTEM_NSPR= )
if test "$_WIN32_MSVC"; then
_SYSTEM_NSPR=no
fi
dnl first, see if user has specified explicit NSPR include and lib paths,
dnl of if the user has explicitly disabled the use of nspr
if test -z "$_SYSTEM_NSPR" -o "$_SYSTEM_NSPR" = "no" ; then
AM_PATH_GIVEN_NSPR()
fi
dnl next, look for in-tree nspr if user did not specify explicit system nspr
if test "$no_nspr" == "no" -a -z "$NSPR_CFLAGS" -a -z "$NSPR_LIBS" ; then
if test -z "$_SYSTEM_NSPR" -o "$_SYSTEM_NSPR" = "no" ; then
dnl see if we are being built in the same build tree as nspr
AM_PATH_INTREE_NSPR(../../dist)
fi
dnl failing that, see if we can find nspr-config or pkg-config nspr
if test -z "$NSPR_CFLAGS" -a "$_SYSTEM_NSPR" != "no" ; then
AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=])
fi
fi
dnl if we are being built as part of the mozilla client, and we could not
dnl find NSPR by any other method, just default to the default values
dnl used by the client build - NOTE that this sets the libpaths and the
dnl library link commands directly, so we don't need to muck with any
dnl cygwin path conversion stuff. The client build also uses --with-dist-prefix
dnl which sets $(DIST) in the makefiles
if test -z "$NSPR_CFLAGS" -o -z "$NSPR_LIBS" ; then
if test -n "$MOZILLA_CLIENT" ; then
NSPR_CFLAGS='-I$(DIST)/include/nspr'
NSPR_LIBS='-L$(DIST)/lib '"-lplds$NSPR_VERSION -lplc$NSPR_VERSION -lnspr$NSPR_VERSION"
dnl explicitly set libs for Visual Age C++ for OS/2
if test "$VACPP" = "yes"; then
NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS''
elif test "$_WIN32_MSVC"; then
NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '
fi
SKIP_CYGWIN_FIXUP=1
LIBS_ALREADY_SET=1
AC_SUBST(LIBS_ALREADY_SET)
elif test "$no_nspr" = "no" ; then
AC_MSG_ERROR(Need to use NSPR but no NSPR was found)
fi
fi
dnl ========================================================
@ -349,12 +391,12 @@ case "$target" in
esac
if test -n "$_WIN32_MSVC" -a -n "$USE_WINDOWS_PATHS" ; then
if test -n "$NSPR_CFLAGS" ; then
if test -n "$NSPR_CFLAGS" -a -z "$SKIP_CYGWIN_FIXUP" ; then
path=`echo $NSPR_CFLAGS | sed -e 's/^-I//'`
path=`cygpath -m $path`
NSPR_CFLAGS="/I$path"
fi
if test -n "$NSPR_LIBS" ; then
if test -n "$NSPR_LIBS" -a -z "$SKIP_CYGWIN_FIXUP" ; then
path=`echo $NSPR_LIBS | sed -e 's/^-L//'`
path=`cygpath -m $path`
NSPR_LIBS="/LIBPATH:$path"
@ -508,7 +550,7 @@ else
DEFINES="$DEFINES -UDEBUG"
fi
# Use mozilla's nsinstall
dnl Use mozilla's nsinstall
if test -n "$MOZILLA_CLIENT"; then
NSINSTALL='$(dist_bindir)/nsinstall'
fi