- merged upstream

Changed files:
    drizzle-ncurses.patch -> 1.3
    drizzle-readline-ac-cache.patch -> 1.2
    drizzle-zlibs.patch -> 1.2

diff --git a/drizzle-ncurses.patch b/drizzle-ncurses.patch
deleted file mode 100644 (file)
index 04f11dd..0000000
--- a/drizzle-ncurses.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- drizzle/configure.ac~      2008-12-02 01:00:23.000000000 +0200
-+++ drizzle/configure.ac       2008-12-02 02:33:32.150538753 +0200
-@@ -602,7 +602,12 @@
- #--------------------------------------------------------------------
- 
- 
--SEARCH_FOR_LIB(ncurses, tgetent, ncurses/ncurses.h, AC_MSG_ERROR(Couldn't find ncurses)) 
-+SEARCH_FOR_LIB(ncurses, tgetent, ncurses/ncurses.h, [
-+      SEARCH_FOR_LIB(tinfo, tgetent, ncurses/ncurses.h,
-+              AC_MSG_ERROR([Couldn't find ncurses])
-+      )
-+      ]
-+)
- 
- #--------------------------------------------------------------------
- # Check for libreadline or compatible (libedit on Mac OS X)
---- drizzle/m4/search_for_lib.m4~      2008-12-01 23:04:08.000000000 +0200
-+++ drizzle/m4/search_for_lib.m4       2008-12-02 02:33:04.107962733 +0200
-@@ -73,7 +73,7 @@
-   ])
-   AS_IF([test AS_VAR_GET([have_lib]) = no],[
-     AC_MSG_WARN([$3 or lib$1.a not found. Try installing $1 developement packages])
--    [$4]
-+    $4
-   ])
-   AC_SUBST(libs_var)
-   AC_SUBST(cflags_var)

diff --git a/drizzle-readline-ac-cache.patch b/drizzle-readline-ac-cache.patch
deleted file mode 100644 (file)
index 7748439..0000000
--- a/drizzle-readline-ac-cache.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- drizzle/m4/readline.m4~    2008-12-01 23:04:06.000000000 +0200
-+++ drizzle/m4/readline.m4     2008-12-02 00:15:21.314639769 +0200
-@@ -33,12 +33,14 @@
-           ],
-           [
-               mysql_cv_new_rl_interface=yes
--                AC_DEFINE_UNQUOTED([USE_NEW_READLINE_INTERFACE], [1],
--                                   [used new readline interface (are rl_completion_func_t and rl_compentry_func_t defined)])
-           ],
-           [mysql_cv_new_rl_interface=no]
-         )
-     )
-+    if test "$mysql_cv_new_rl_interface" = "yes"; then
-+              AC_DEFINE_UNQUOTED([USE_NEW_READLINE_INTERFACE], [1],
-+              [used new readline interface (are rl_completion_func_t and rl_compentry_func_t defined)])
-+    fi
-   CFLAGS="${save_CFLAGS}"
- ])
- 

diff --git a/drizzle-zlibs.patch b/drizzle-zlibs.patch
deleted file mode 100644 (file)
index 3218f98..0000000
--- a/drizzle-zlibs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- drizzle/libdrizzle/Makefile.am~    2008-12-02 00:39:19.000000000 +0200
-+++ drizzle/libdrizzle/Makefile.am     2008-12-02 00:39:23.930741523 +0200
-@@ -57,7 +57,7 @@
-                       viosocket.c
- 
- libdrizzle_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ @LD_VERSION_SCRIPT@
--libdrizzle_la_LIBS = ${Z_LIBS}
-+libdrizzle_la_LIBADD = $(Z_LIBS)
- 
- DEFS =                        -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-                       -DDATADIR="\"$(MYSQLDATAdir)\"" \