From 55d1d78a97a3ed6fb87d107c99a4b52e297167c1 Mon Sep 17 00:00:00 2001 From: Simon Zheng Date: Wed, 11 Jan 2006 04:33:40 +0000 Subject: Add the macro MOZILLA_NSS_LIB_DIR to store mozilla nss library path. 2006-01-11 Simon Zheng * configure.in: Add the macro MOZILLA_NSS_LIB_DIR to store mozilla nss library path. svn path=/trunk/; revision=31129 --- ChangeLog | 5 +++++ configure.in | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 88671a548a..14d9604020 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-09 Simon Zheng + + * configure.in: Add the macro MOZILLA_NSS_LIB_DIR to store mozilla + nss library path. + 2006-01-07 Tor Lillqvist * server.mk: Add whitespace before all line continuation diff --git a/configure.in b/configure.in index 85a968e3af..81ee5eddeb 100644 --- a/configure.in +++ b/configure.in @@ -755,6 +755,7 @@ dnl If the user specifies --with-foo or --enable-nss=static, then we have to do mozilla_nss="mozilla-nss" AC_DEFINE(HAVE_NSS,1,[Define if you have NSS]) AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library]) + AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,`$PKG_CONFIG --variable=libdir mozilla-nss`,[Define to the full path of mozilla nss library]) MANUAL_NSPR_CFLAGS="" MANUAL_NSPR_LIBS="" MANUAL_NSS_CFLAGS="" @@ -899,6 +900,7 @@ dnl If the user specifies --with-foo or --enable-nss=static, then we have to do if test "$moz_nss_libs" != no; then AC_DEFINE(HAVE_NSS) AC_DEFINE(HAVE_SSL) + AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"$with_nss_libs", [Define to the full path of mozilla nss library]) if test "$enable_nss" = "static"; then msg_ssl="yes (Mozilla NSS:static)" else -- cgit v1.2.3