aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2003-11-26 23:25:21 +0800
committerJP Rosevear <jpr@src.gnome.org>2003-11-26 23:25:21 +0800
commitaf146701dbcee3f46c894fe1e7d8b50b7c41391b (patch)
tree60d9b7046a3eb928d1f455cf4260c3ee4eb03e2d
parent465f5b39e617cf3ee36ede2191d906af7ee2604d (diff)
downloadgsoc2013-evolution-af146701dbcee3f46c894fe1e7d8b50b7c41391b.tar
gsoc2013-evolution-af146701dbcee3f46c894fe1e7d8b50b7c41391b.tar.gz
gsoc2013-evolution-af146701dbcee3f46c894fe1e7d8b50b7c41391b.tar.bz2
gsoc2013-evolution-af146701dbcee3f46c894fe1e7d8b50b7c41391b.tar.lz
gsoc2013-evolution-af146701dbcee3f46c894fe1e7d8b50b7c41391b.tar.xz
gsoc2013-evolution-af146701dbcee3f46c894fe1e7d8b50b7c41391b.tar.zst
gsoc2013-evolution-af146701dbcee3f46c894fe1e7d8b50b7c41391b.zip
make sure the mozilla .pc file exists before checking for it
2003-11-26 JP Rosevear <jpr@ximian.com> * configure.in: make sure the mozilla .pc file exists before checking for it svn path=/trunk/; revision=23488
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cf16580783..19b20c4fc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-26 JP Rosevear <jpr@ximian.com>
+
+ * configure.in: make sure the mozilla .pc file exists before
+ checking for it
+
2003-11-24 Rodrigo Moya <rodrigo@ximian.com>
* tools/killev.c (main): kill Evo 2.0's alarm daemon, not 1.4's.
diff --git a/configure.in b/configure.in
index 3fea9e31af..16aa6b98e9 100644
--- a/configure.in
+++ b/configure.in
@@ -632,7 +632,7 @@ dnl If the user specifies --with-foo or --enable-nss=static, then we have to do
check_manually="no"
fi
- if test "x${check_manually}" = "xno"; then
+ if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists mozilla`; then
PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes")
if test "x${have_nss}" = "xyes"; then
msg_ssl="yes (Mozilla NSS)"