summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-07-15 13:10:20 +0300
committerunknown <monty@narttu.mysql.fi>2003-07-15 13:10:20 +0300
commit6159cd27bfe9d24e610c7a25f8e0d991abd9caff (patch)
treefa2301a17d499ad2f714aee503690422d6e8e086 /acinclude.m4
parentc36c37c33973bba01651b82ccd1a3fabbb7732a4 (diff)
downloadmariadb-git-6159cd27bfe9d24e610c7a25f8e0d991abd9caff.tar.gz
Portability fixes
acinclude.m4: Made test for compress more reliable (for Solaris) sql/item_strfunc.cc: Portability fix (for Linux Alpha)
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m413
1 files changed, 10 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index abeb2024f4a..f7d89ecf35a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -126,12 +126,19 @@ AC_DEFUN(MYSQL_CHECK_ZLIB_WITH_COMPRESS, [
save_LIBS="$LIBS"
LIBS="-l$1 $LIBS"
AC_CACHE_CHECK([if libz with compress], mysql_cv_compress,
-[AC_TRY_LINK([#include <zlib.h>
+[AC_TRY_RUN([#include <zlib.h>
#ifdef __cplusplus
extern "C"
#endif
-],
-[ return compress(0, (unsigned long*) 0, "", 0);
+int main(int argv, char **argc)
+{
+ return 0;
+}
+
+int link_test()
+{
+ return compress(0, (unsigned long*) 0, "", 0);
+}
], mysql_cv_compress=yes, mysql_cv_compress=no)])
if test "$mysql_cv_compress" = "yes"
then