You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
102 lines
4.1 KiB
102 lines
4.1 KiB
18 years ago
|
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# T2 SDE: package/.../evolution/seamonkey.patch
|
||
|
|
# Copyright (C) 2006 The T2 SDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- T2-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
--- evolution-2.6.0/configure 2006-03-13 10:08:20.000000000 +0100
|
||
|
|
+++ evolution-2.6.0-T2/configure 2006-04-01 23:11:01.000000000 +0200
|
||
|
|
@@ -28777,7 +28777,7 @@ if test "x${enable_nss}" = "xyes" || tes
|
||
|
|
check_manually="no"
|
||
|
|
fi
|
||
|
|
|
||
|
|
- if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists mozilla-nss`; then
|
||
|
|
+ if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists seamonkey-nss`; then
|
||
|
|
|
||
|
|
pkg_failed=no
|
||
|
|
echo "$as_me:$LINENO: checking for NSS_CFLAGS" >&5
|
||
|
|
@@ -28788,12 +28788,12 @@ else
|
||
|
|
if test "x$ac_cv_env_NSS_CFLAGS_set" = "xset"; then
|
||
|
|
pkg_cv_NSS_CFLAGS=$ac_cv_env_NSS_CFLAGS_value
|
||
|
|
elif test -n "$PKG_CONFIG"; then
|
||
|
|
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"mozilla-nss\" >/dev/null 2>&1") >&5
|
||
|
|
- ($PKG_CONFIG --exists "mozilla-nss" >/dev/null 2>&1) 2>&5
|
||
|
|
+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"seamonkey-nss\" >/dev/null 2>&1") >&5
|
||
|
|
+ ($PKG_CONFIG --exists "seamonkey-nss" >/dev/null 2>&1) 2>&5
|
||
|
|
ac_status=$?
|
||
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
|
|
(exit $ac_status); }; then
|
||
|
|
- pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nss" 2>/dev/null`
|
||
|
|
+ pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-nss" 2>/dev/null`
|
||
|
|
else
|
||
|
|
pkg_failed=yes
|
||
|
|
fi
|
||
|
|
@@ -28811,12 +28811,12 @@ else
|
||
|
|
if test "x$ac_cv_env_NSS_LIBS_set" = "xset"; then
|
||
|
|
pkg_cv_NSS_LIBS=$ac_cv_env_NSS_LIBS_value
|
||
|
|
elif test -n "$PKG_CONFIG"; then
|
||
|
|
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"mozilla-nss\" >/dev/null 2>&1") >&5
|
||
|
|
- ($PKG_CONFIG --exists "mozilla-nss" >/dev/null 2>&1) 2>&5
|
||
|
|
+ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"seamonkey-nss\" >/dev/null 2>&1") >&5
|
||
|
|
+ ($PKG_CONFIG --exists "seamonkey-nss" >/dev/null 2>&1) 2>&5
|
||
|
|
ac_status=$?
|
||
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
|
|
(exit $ac_status); }; then
|
||
|
|
- pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nss" 2>/dev/null`
|
||
|
|
+ pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "seamonkey-nss" 2>/dev/null`
|
||
|
|
else
|
||
|
|
pkg_failed=yes
|
||
|
|
fi
|
||
|
|
@@ -28828,18 +28828,18 @@ echo "$as_me:$LINENO: result: $pkg_cv_NS
|
||
|
|
echo "${ECHO_T}$pkg_cv_NSS_LIBS" >&6
|
||
|
|
|
||
|
|
if test $pkg_failed = yes; then
|
||
|
|
- NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nss"`
|
||
|
|
+ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "seamonkey-nss"`
|
||
|
|
# Put the nasty error message in config.log where it belongs
|
||
|
|
echo "$NSS_PKG_ERRORS" 1>&5
|
||
|
|
|
||
|
|
- { { echo "$as_me:$LINENO: error: Package requirements (mozilla-nss) were not met.
|
||
|
|
+ { { echo "$as_me:$LINENO: error: Package requirements (seamonkey-nss) were not met.
|
||
|
|
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||
|
|
installed software in a non-standard prefix.
|
||
|
|
|
||
|
|
Alternatively you may set the NSS_CFLAGS and NSS_LIBS environment variables
|
||
|
|
to avoid the need to call pkg-config. See the pkg-config man page for
|
||
|
|
more details." >&5
|
||
|
|
-echo "$as_me: error: Package requirements (mozilla-nss) were not met.
|
||
|
|
+echo "$as_me: error: Package requirements (seamonkey-nss) were not met.
|
||
|
|
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||
|
|
installed software in a non-standard prefix.
|
||
|
|
|
||
|
|
@@ -28884,8 +28884,8 @@ _ACEOF
|
||
|
|
|
||
|
|
msg_smime="yes (Mozilla NSS)"
|
||
|
|
fi
|
||
|
|
- mozilla_nspr="mozilla-nspr"
|
||
|
|
- mozilla_nss="mozilla-nss"
|
||
|
|
+ mozilla_nspr="seamonkey-nspr"
|
||
|
|
+ mozilla_nss="seamonkey-nss"
|
||
|
|
|
||
|
|
cat >>confdefs.h <<\_ACEOF
|
||
|
|
#define HAVE_NSS 1
|
||
|
|
@@ -28898,7 +28898,7 @@ _ACEOF
|
||
|
|
|
||
|
|
|
||
|
|
cat >>confdefs.h <<_ACEOF
|
||
|
|
-#define MOZILLA_NSS_LIB_DIR "`$PKG_CONFIG --variable=libdir mozilla-nss`"
|
||
|
|
+#define MOZILLA_NSS_LIB_DIR "`$PKG_CONFIG --variable=libdir seamonkey-nss`"
|
||
|
|
_ACEOF
|
||
|
|
|
||
|
|
MANUAL_NSPR_CFLAGS=""
|