summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-07-16 14:32:11 +0300
committermonty@hundin.mysql.fi <>2001-07-16 14:32:11 +0300
commit02f72a801b2f29d5c604da72bfcf53c61706ce6f (patch)
treead7a40ead386b20a0963be591f095aecd6d3f4f5
parent83d5333ffb270f9d935e2f04f83e24b7ed846766 (diff)
downloadmariadb-git-02f72a801b2f29d5c604da72bfcf53c61706ce6f.tar.gz
Changed GPL license example to make it more clear
-rw-r--r--Docs/manual.texi13
-rw-r--r--configure.in2
2 files changed, 9 insertions, 6 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 45ace36a255..48e5597489e 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -3574,11 +3574,14 @@ A license is required if:
@itemize @minus
@item
-You link a part of the of @strong{MySQL} that has a GPL Copyright to a
-program that is not free software (embedded usage of the @strong{MySQL}
-server). In this case your application would also become GPL through the
-clause in the GPL license that acts as a virus. By licensing @strong{MySQL}
-from us under a commercial license you will avoid this problem.
+You link a program, that is not free software, with code from the
+@strong{MySQL} server or clients that has the GPL copyright. This
+happens for example when you use @strong{MySQL} as an embedded server
+in your applications or when you add not free extensions to the
+@strong{MySQL} server. In this case your application/code would also
+become GPL through the GPL license that acts as a virus. By licensing
+@strong{MySQL} server from @strong{MySQL AB} under a commercial
+license you will avoid this problem.
@item
You have a commercial application that ONLY works with @strong{MySQL}
diff --git a/configure.in b/configure.in
index 97452c52719..20c419c7328 100644
--- a/configure.in
+++ b/configure.in
@@ -2056,7 +2056,7 @@ EOF
then
MT_LD_ADD="$OVERRIDE_MT_LD_ADD"
else
- MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread.a"
+ MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
fi
AC_SUBST(MT_LD_ADD)
echo ""