aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in13
2 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f8e69e86a5..786a8071b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-09 Chris Toshok <toshok@ximian.com>
+
+ * configure.in: add the nspr includes to the list of includes used
+ to test for NSS headers, and don't assume -lpthread in the
+ nss/nspr libs - use PTHREAD_LIB.
+
2001-05-09 Iain Holmes <iain@ximian.com>
* tools/killev: Added rdf-summary killing stuff from R Burton
diff --git a/configure.in b/configure.in
index 9d838e4475..3e82309a08 100644
--- a/configure.in
+++ b/configure.in
@@ -546,7 +546,7 @@ if test "x${with_nspr_libs}" != "xno" -a "x${have_nspr_includes}" != "xno"; then
CFLAGS_save="$CFLAGS"
LDFLAGS_save="$LDFLAGS"
- nsprlibs="-lnspr4 -lplc4 -lplds4 -lpthread"
+ nsprlibs="-lnspr4 -lplc4 -lplds4 $PTHREAD_LIB"
AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs,
[
CFLAGS="$CFLAGS $NSPR_CFLAGS"
@@ -580,8 +580,13 @@ if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then
AC_MSG_CHECKING(for Mozilla nss3 includes in $with_nss_includes)
AC_MSG_RESULT("")
-
- CPPFLAGS="$CPPFLAGS -I$with_nss_includes"
+
+ if test "x${with_nspr_includes}" != "x"; then
+ CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes"
+ else
+ CPPFLAGS="$CPPFLAGS -I$with_nss_includes"
+ fi
+
AC_CHECK_HEADERS(nss.h ssl.h smime.h, [ moz_nspr_includes="yes" ])
CPPFLAGS="$CPPFLAGS_save"
@@ -603,7 +608,7 @@ msg_nss="no"
if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then
LDFLAGS_save="$LDFLAGS"
- nsprlibs="-lnspr4 -lplc4 -lplds4 -lpthread"
+ nsprlibs="-lnspr4 -lplc4 -lplds4 $PTHREAD_LIB"
nsslibs="-lnss3 -lnssckbi -lssl3 -lsmime3"
AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
[