[Pkg-mysql-commits] r1778 - mysql-dfsg-5.1/branches/unstable/debian/patches

[Norbert Tretkowski]

Author: nobse
Date: 2009-11-20 12:41:53 +0000 (Fri, 20 Nov 2009)
New Revision: 1778

Modified:
   mysql-dfsg-5.1/branches/unstable/debian/patches/10_readline_build_fix.dpatch
Log:
Update patch

Modified: mysql-dfsg-5.1/branches/unstable/debian/patches/10_readline_build_fix.dpatch
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/10_readline_build_fix.dpatch	2009-11-20 12:35:44 UTC (rev 1777)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/10_readline_build_fix.dpatch	2009-11-20 12:41:53 UTC (rev 1778)
@@ -5,8 +5,21 @@
 ## DP: http://bugs.mysql.com/bug.php?id=35250
 
 @DPATCH@
---- mysql-dfsg-5.1-5.1.41/configure.in.orig        2009-11-20 13:32:35.000000000 +0100
-+++ mysql-dfsg-5.1-5.1.41/configure.in     2009-11-20 13:32:51.000000000 +0100
+diff -Nur mysql-dfsg-5.1-5.1.41.orig/configure mysql-dfsg-5.1-5.1.41/configure
+--- mysql-dfsg-5.1-5.1.41.orig/configure        2009-11-04 19:37:28.000000000 +0100
++++ mysql-dfsg-5.1-5.1.41/configure     2009-11-20 13:39:48.000000000 +0100
+@@ -48782,7 +48782,7 @@
+     fi
+ 
+     # if there is no readline, but we want to build with readline, we fail
+-    if test "$want_to_use_readline" = "yes" && test ! -d "./cmd-line-utils/readline"
++    if test "$want_to_use_readline" = "yes" && test ! -d "$srcdir/cmd-line-utils/readline"
+     then
+        { { $as_echo "$as_me:$LINENO: error: This commercially licensed MySQL source package can't
+              be built with libreadline. Please use --with-libedit to use
+diff -Nur mysql-dfsg-5.1-5.1.41.orig/configure.in mysql-dfsg-5.1-5.1.41/configure.in
+--- mysql-dfsg-5.1-5.1.41.orig/configure.in     2009-11-04 19:28:09.000000000 +0100
++++ mysql-dfsg-5.1-5.1.41/configure.in  2009-11-20 13:39:14.000000000 +0100
 @@ -2691,7 +2691,7 @@
      fi