~ubuntu-branches/ubuntu/hardy/mysql-dfsg-5.0/hardy-updates

« back to all changes in this revision

Viewing changes to config/ac-macros/zlib.m4

• browse files at revision 24
• compare with another revision
• download diff
• download tarball
• view history from revision 24

Show diffs side-by-side

added

removed

config/ac-macros/zlib.m4

2

2

 

3

3

AC_DEFUN([MYSQL_USE_BUNDLED_ZLIB], [

4

4

ZLIB_INCLUDES="-I\$(top_srcdir)/zlib"

5

 

ZLIB_LIBS="\$(top_builddir)/zlib/libz.la"

 

5

ZLIB_LIBS="\$(top_builddir)/zlib/libzlt.la"

6

6

dnl Omit -L$pkglibdir as it's always in the list of mysql_config deps.

7

7

ZLIB_DEPS="-lz"

8

8

zlib_dir="zlib"

10

10

mysql_cv_compress="yes"

11

11

])

12

12

 

13

 

dnl Auxiliary macro to check for zlib at given path

 

13

dnl Auxiliary macro to check for zlib at given path.

 

14

dnl We are strict with the server, as "archive" engine

 

15

dnl needs zlibCompileFlags(), but for client only we

 

16

dnl are less strict, and take the zlib we find.

14

17

 

15

18

AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [

16

19

save_CPPFLAGS="$CPPFLAGS"

17

20

save_LIBS="$LIBS"

18

21

CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS"

19

22

LIBS="$LIBS $ZLIB_LIBS"

 

23

if test X"$with_server" = Xno

 

24

then

 

25

  zlibsym=zlibVersion

 

26

else

 

27

  zlibsym=zlibCompileFlags

 

28

fi

20

29

AC_CACHE_VAL([mysql_cv_compress],

21

30

  [AC_TRY_LINK([#include <zlib.h>],

22

 

    [return zlibCompileFlags();],

 

31

    [return $zlibsym();],

23

32

    [mysql_cv_compress="yes"

24

33

    AC_MSG_RESULT([ok])],

25

34

    [mysql_cv_compress="no"])

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1