diff options
| author | unknown <joreland@mysql.com> | 2004-09-01 04:55:16 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-09-01 04:55:16 +0200 |
| commit | 069c47d260a8ace235841a98877f47ae85a8f237 (patch) | |
| tree | 9ee4f88ee6169712ed0f5725e4a71d48dcf79eaf /acinclude.m4 | |
| parent | 15135482adf5a4e556e25576e4b1f408e6343e79 (diff) | |
| parent | 775c057ef4445f787bf07e0a99ecb8075672f9cd (diff) | |
| download | mariadb-git-069c47d260a8ace235841a98877f47ae85a8f237.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-ndb
acinclude.m4:
Auto merged
configure.in:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index cf9c8c0e3c5..dff3b22ecec 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -665,6 +665,41 @@ AC_DEFINE(STRUCT_DIRENT_HAS_D_INO, [1], fi ]) +AC_DEFUN(MYSQL_STRUCT_DIRENT_D_NAMLEN, +[AC_REQUIRE([AC_HEADER_DIRENT]) +AC_MSG_CHECKING(if struct dirent has a d_namlen member) +AC_CACHE_VAL(mysql_cv_dirent_has_dnamlen, +[AC_TRY_COMPILE([ +#include <stdio.h> +#include <sys/types.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif /* HAVE_UNISTD_H */ +#if defined(HAVE_DIRENT_H) +# include <dirent.h> +#else +# define dirent direct +# ifdef HAVE_SYS_NDIR_H +# include <sys/ndir.h> +# endif /* SYSNDIR */ +# ifdef HAVE_SYS_DIR_H +# include <sys/dir.h> +# endif /* SYSDIR */ +# ifdef HAVE_NDIR_H +# include <ndir.h> +# endif +#endif /* HAVE_DIRENT_H */ +],[ +struct dirent d; int z; z = (int)d.d_namlen; +], mysql_cv_dirent_has_dnamlen=yes, mysql_cv_dirent_has_dnamlen=no)]) +AC_MSG_RESULT($mysql_cv_dirent_has_dnamlen) +if test "$mysql_cv_dirent_has_dnamlen" = "yes"; then +AC_DEFINE(STRUCT_DIRENT_HAS_D_NAMLEN, [1], + [d_namlen member present in struct dirent]) +fi +]) + + AC_DEFUN(MYSQL_TYPE_SIGHANDLER, [AC_MSG_CHECKING([whether signal handlers are of type void]) AC_CACHE_VAL(mysql_cv_void_sighandler, |