Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

typo staticly → statically #864

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -2286,7 +2286,7 @@

2002-07-06 Rob Siemborski <[email protected]>
* 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

Expand Down
2 changes: 1 addition & 1 deletion contrib/stripplus_canonuser.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion doc/legacy/advanced.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h3>Using Cyrus SASL as a static library</h3>
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.<P>

However, if you are sure you wish to use a static version of Cyrus SASL,
Expand Down
2 changes: 1 addition & 1 deletion docsrc/sasl/advanced.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions lib/dlopen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion m4/plain.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion m4/sasl2.m4
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ AC_ARG_WITH(sasl,

AC_ARG_WITH(staticsasl,
[AC_HELP_STRING([--with-staticsasl=DIR],
[Compile with staticly linked libsasl2 in <DIR>])],
[Compile with statically linked libsasl2 in <DIR>])],
[with_staticsasl="$withval";
if test $with_staticsasl != "no"; then
using_static_sasl="static"
Expand Down
2 changes: 1 addition & 1 deletion m4/sasldb.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down