MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:kent Date:April 1 2006 1:50am
Subject:bk commit into 5.0 tree (kent:1.2130) BUG#18369
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2130 06/04/01 03:49:14 kent@stripped +1 -0
  zlib.m4:
    Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
    and search the given include directory first (bug#18369)

  config/ac-macros/zlib.m4
    1.7 06/04/01 03:46:55 kent@stripped +3 -3
    Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
    and search the given include directory first (bug#18369)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-4d4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-new

--- 1.6/config/ac-macros/zlib.m4	2006-03-31 01:02:43 +02:00
+++ 1.7/config/ac-macros/zlib.m4	2006-04-01 03:46:55 +02:00
@@ -13,9 +13,9 @@
 dnl Auxiliary macro to check for zlib at given path
 
 AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [
-save_INCLUDES="$INCLUDES"
+save_CPPFLAGS="$CPPFLAGS"
 save_LIBS="$LIBS"
-INCLUDES="$INCLUDES $ZLIB_INCLUDES"
+CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS"
 LIBS="$LIBS $ZLIB_LIBS"
 AC_CACHE_VAL([mysql_cv_compress],
   [AC_TRY_LINK([#include <zlib.h>],
@@ -24,7 +24,7 @@
     AC_MSG_RESULT([ok])],
     [mysql_cv_compress="no"])
   ])
-INCLUDES="$save_INCLUDES"
+CPPFLAGS="$save_CPPFLAGS"
 LIBS="$save_LIBS"
 ])
 
Thread
bk commit into 5.0 tree (kent:1.2130) BUG#18369kent1 Apr