Changeset 1141
- Timestamp:
- 11/12/06 14:42:44
- Files:
-
- trunk/configure.ac (modified) (1 diff)
- trunk/libtinymail-camel/camel-lite/configure.ac (modified) (2 diffs)
- trunk/m4/moz.m4 (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/configure.ac
r1090 r1141 274 274 dnl ### libtinymailui-mozembed, a library that wraps the gtkmozembed widget ## 275 275 if test x$build_mozembed = xtrue; then 276 extraplatpkgs="firefox-nspr firefox-nss firefox-xpcom firefox-gtkmozembed" 276 AC_TNY_MOZ_CHECK 277 extraplatpkgs="$mozilla_nspr $mozilla_nss $mozilla_xpcom $mozilla_gtkmozembed" 277 278 extratnypkgs="$extratnypkgs $extraplatpkgs" 278 279 PKG_CHECK_MODULES(LIBTINYMAILUI_MOZEMBED, $extraplatpkgs glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 $extragtkpkgs) trunk/libtinymail-camel/camel-lite/configure.ac
r1127 r1141 2 2 AC_CONFIG_SRCDIR(camel/camel-object.c) 3 3 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) 4 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS") 4 5 AC_CONFIG_MACRO_DIR([../../m4]) 6 AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I ../../m4") 7 5 8 AC_CONFIG_HEADERS(config.h) 6 9 … … 201 204 msg_ssl="no" 202 205 msg_smime="no" 203 mozilla_nspr_pcs=""204 205 AC_MSG_CHECKING(Mozilla NSPR pkg-config module name)206 mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr xulrunner-nspr"207 for pc in $mozilla_nspr_pcs; do208 if $PKG_CONFIG --exists $pc; then209 AC_MSG_RESULT($pc)210 mozilla_nspr=$pc211 break;212 fi213 done214 215 AC_MSG_CHECKING(Mozilla NSS pkg-config module name)216 mozilla_nss_pcs="nss mozilla-nss firefox-nss xulrunner-nss"217 for pc in $mozilla_nss_pcs; do218 if $PKG_CONFIG --exists $pc; then219 AC_MSG_RESULT($pc)220 mozilla_nss=$pc221 break;222 fi223 done224 225 206 SSL_LIBS="" 226 207 227 if test -n "$mozilla_nspr" -a -n "$mozilla_nss"; then 208 AC_TNY_MOZ_CHECK 209 210 if test x"$mozilla_nspr" != "xno" -a x"$mozilla_nss" != "xno"; then 228 211 msg_ssl="yes (Mozilla NSS)" 229 212 msg_smime="yes (Mozilla NSS)"
