aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index af3798486b..beb65c8587 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-21 Jeffrey Stedfast <fejj@ximian.com>
+
+ * configure.in (have_nspr_libs): We need to link in more than just
+ libnspr4, we also need libpthread.
+ (have_nss_libs): Don't forget to add nsprlibs to the LDFLAGS.
+
2001-04-21 Duncan Mak <duncan@ximian.com>
* art/Makefile.am (images_DATA): Added in composer-message.png.
diff --git a/configure.in b/configure.in
index 5c524a5016..3417efbdab 100644
--- a/configure.in
+++ b/configure.in
@@ -551,7 +551,7 @@ if test "x${with_nspr_libs}" != "xno" -a "x${have_nspr_includes}" != "xno"; then
CFLAGS_save="$CFLAGS"
LDFLAGS_save="$LDFLAGS"
- nsprlibs="-lnspr4"
+ nsprlibs="-lnspr4 -lplc4 -lplds4 -lpthread"
AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs,
[
CFLAGS="$CFLAGS $NSPR_CFLAGS"
@@ -608,11 +608,11 @@ msg_nss="no"
if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then
LDFLAGS_save="$LDFLAGS"
- nsprlibs="-lnspr4"
+ nsprlibs="-lnspr4 -lplc4 -lplds4 -lpthread"
nsslibs="-lnss3 -lnssckbi -lssl3 -lsmime3"
AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
[
- LDFLAGS="$LDFLAGS -L$with_nss_libs $nsslibs"
+ LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")
LDFLAGS="$LDFLAGS_save"
])