Merge with 5.2

1 files changed, 26 insertions, 3 deletions

diff --git a/configure.in b/configure.in
index 6b565f18610..e430e4f12f3 100644
--- a/configure.in
+++ b/configure.in
@@ -633,6 +633,14 @@ AC_ARG_WITH(other-libc,
 )
 AC_SUBST(NOINST_LDFLAGS)
 
+AC_ARG_ENABLE(distribution,
+    AC_HELP_STRING(
+        [--disable-distribution], 
+        [Allow linking with system GPLv3 libraries. It may result in a binary that can not be legally distributed.]),
+    [ enable_distribution=$enableval ],
+    [ enable_distribution=yes ]
+    )
+
 #
 # Check if we are using Linux and a glibc compiled with static nss
 # (this is true on the MySQL build machines to avoid NSS problems)
@@ -1575,7 +1583,7 @@ fi
 AC_MSG_CHECKING([for OpenSolaris Bug 6611808])
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Werror"
-AC_COMPILE_IFELSE([
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
   #include <pthread.h>
   void dummy() {}
   int main()
@@ -1584,7 +1592,7 @@ AC_COMPILE_IFELSE([
     pthread_once(&once_control, dummy);
     return 0;
   }
-], [
+])], [
   AC_DEFINE([PTHREAD_ONCE_INITIALIZER], [{PTHREAD_ONCE_INIT}],
             [See OpenSolaris Bug 6611808])
   AC_MSG_RESULT([yes])
@@ -2724,6 +2732,8 @@ case $SYSTEM_TYPE in
 	compile_libedit=yes
 	AC_DEFINE_UNQUOTED(HAVE_HIST_ENTRY, 1)
 	AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE, 1)
+        AC_MSG_CHECKING([for libedit/readline])
+        AC_MSG_RESULT([libedit bundled])
     elif test "$with_readline" = "yes"
     then
 	readline_topdir="cmd-line-utils"
@@ -2734,6 +2744,8 @@ case $SYSTEM_TYPE in
 	compile_readline=yes
 	want_to_use_readline="yes"
 	AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)
+        AC_MSG_CHECKING([for libedit/readline])
+        AC_MSG_RESULT([readline bundled])
     else
 	# Use system readline library
 	AC_LANG_SAVE
@@ -2748,12 +2760,16 @@ case $SYSTEM_TYPE in
 	    # this way we avoid linking commercial source with GPL readline
 	    readline_link="-lreadline"
 	    want_to_use_readline="yes"
+            AC_MSG_CHECKING([for libedit/readline])
+            AC_MSG_RESULT([readline system])
 	elif [test "$mysql_cv_libedit_interface" = "yes"]
 	then
 	    # Use libedit
 	    readline_link="-ledit"
+            AC_MSG_CHECKING([for libedit/readline])
+            AC_MSG_RESULT([libedit system])
 	else
-	   AC_MSG_ERROR([Could not find system readline or libedit libraries
+	   AC_MSG_ERROR([Could not find usable system readline or libedit libraries
 	      Use --with-readline or --with-libedit to use the bundled
 	      versions of libedit or readline])
 	fi
@@ -2998,6 +3014,13 @@ if test X"$with_plugin_ndbcluster" = Xyes ; then
   echo for more details.
 fi
 
+if test "$enable_distribution" = "warn"
+then
+  echo "You have linked MariaDB with GPLv3 libraries!"
+  echo "You may not distribute the resulting binary. If you do, you will "
+  echo "put yourself into a legal problem with Free Software Foundation."
+fi
+
 # The first line "Thank you ..." is checked in ./Do-compile to verify that configure
 # ended sucessfully - don't remove it.
 echo ""