diff --git a/ChangeLog b/ChangeLog index 6a547fa8..b8fc33cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2286,7 +2286,7 @@ 2002-07-06 Rob Siemborski * plugins/mysql.c: Further memory management cleanup. (never - strdup the options, and therefore don't free staticly allocated + strdup the options, and therefore don't free statically allocated strings) * man/sasl_getopt_t.3: Clarify semantics of memory management diff --git a/contrib/stripplus_canonuser.patch b/contrib/stripplus_canonuser.patch index a3bc9f45..9ef00c95 100644 --- a/contrib/stripplus_canonuser.patch +++ b/contrib/stripplus_canonuser.patch @@ -20,7 +20,7 @@ diff -u -r1.192 configure.in + SASL_MECHS="$SASL_MECHS libstripplus.la" + if test "$enable_static" = yes; then + SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/stripplus.o" -+ AC_DEFINE(STATIC_STRIPPLUS, [], [Link STRIPPLUS Staticly]) ++ AC_DEFINE(STATIC_STRIPPLUS, [], [Link STRIPPLUS Statically]) + fi +else + AC_MSG_RESULT(disabled) diff --git a/doc/legacy/advanced.html b/doc/legacy/advanced.html index da924549..e280acfe 100644 --- a/doc/legacy/advanced.html +++ b/doc/legacy/advanced.html @@ -18,7 +18,7 @@

Using Cyrus SASL as a static library

that even currently-running applications will see for each new connection. That is, if you choose to use the static version of the library, not only will you need to recompile the library each time you add a mechanism (provided -the mechanisms even support being compiled staticly), but you will need to +the mechanisms even support being compiled statically), but you will need to recompile every application that uses Cyrus SASL as well.

However, if you are sure you wish to use a static version of Cyrus SASL, diff --git a/docsrc/sasl/advanced.rst b/docsrc/sasl/advanced.rst index ea054e55..36d90205 100644 --- a/docsrc/sasl/advanced.rst +++ b/docsrc/sasl/advanced.rst @@ -22,7 +22,7 @@ the flexibility of the DSOs that allow one to simply drop in a new mechanism that even currently-running applications will see for each new connection. That is, if you choose to use the static version of the library, not only will you need to recompile the library each time you add a mechanism (provided -the mechanisms even support being compiled staticly), but you will need to +the mechanisms even support being compiled statically), but you will need to recompile every application that uses Cyrus SASL as well. However, if you are sure you wish to use a static version of Cyrus SASL, diff --git a/lib/dlopen.c b/lib/dlopen.c index af8b384f..62b05878 100644 --- a/lib/dlopen.c +++ b/lib/dlopen.c @@ -465,8 +465,8 @@ int _sasl_load_plugins(const add_plugin_list_t *entrypoints, /* only do the following if: * * we support dlopen() - * AND we are not staticly compiled - * OR we are staticly compiled and TRY_DLOPEN_WHEN_STATIC is defined + * AND we are not statically compiled + * OR we are statically compiled and TRY_DLOPEN_WHEN_STATIC is defined */ #if defined(DO_DLOPEN) && (defined(PIC) || (!defined(PIC) && defined(TRY_DLOPEN_WHEN_STATIC))) /* get the path to the plugins */ diff --git a/m4/plain.m4 b/m4/plain.m4 index 0e32e7f4..d9e52d17 100644 --- a/m4/plain.m4 +++ b/m4/plain.m4 @@ -14,7 +14,7 @@ dnl PLAIN if test "$enable_static" = yes; then SASL_STATIC_OBJS="$SASL_STATIC_OBJS plain.o" SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/plain.c" - AC_DEFINE(STATIC_PLAIN,[],[Link PLAIN Staticly]) + AC_DEFINE(STATIC_PLAIN,[],[Link PLAIN Statically]) fi else AC_MSG_RESULT(disabled) diff --git a/m4/sasl2.m4 b/m4/sasl2.m4 index 816c3ba1..03b21ecd 100644 --- a/m4/sasl2.m4 +++ b/m4/sasl2.m4 @@ -391,7 +391,7 @@ AC_ARG_WITH(sasl, AC_ARG_WITH(staticsasl, [AC_HELP_STRING([--with-staticsasl=DIR], - [Compile with staticly linked libsasl2 in

])], + [Compile with statically linked libsasl2 in ])], [with_staticsasl="$withval"; if test $with_staticsasl != "no"; then using_static_sasl="static" diff --git a/m4/sasldb.m4 b/m4/sasldb.m4 index 46a16ef0..3c7eccc8 100644 --- a/m4/sasldb.m4 +++ b/m4/sasldb.m4 @@ -125,7 +125,7 @@ if test "$enable_static" = yes; then if test "$dblib" != "none"; then SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRCS" SASL_STATIC_OBJS="$SASL_STATIC_OBJS sasldb.o $SASL_DB_BACKEND_STATIC" - AC_DEFINE(STATIC_SASLDB,[],[Link SASLdb Staticly]) + AC_DEFINE(STATIC_SASLDB,[],[Link SASLdb Statically]) else SASL_STATIC_OBJS="$SASL_STATIC_OBJS $SASL_DB_BACKEND_STATIC" SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRCS"