Explicitly check for readdir64

Author: RichieB2B

ChangeLog

@@ -1,3 +1,6 @@
+2006-02-08	Richard van den Berg  <[email protected]>
+	* Explicitly check for readdir64, by Virolainen Pablo <[email protected]>
+
 2006-01-30	Richard van den Berg  <[email protected]>
 	* Released version 0.11-rc3
 	* Changed version to post-0.11-rc3

acinclude.m4

@@ -43,7 +43,7 @@ readdir_r((DIR *) NULL, (struct dirent *) NULL, (struct dirent **) NULL); ],
 aide_cv_readdir_r=POSIX, aide_cv_readdir_r=other))
 if test "$aide_cv_readdir_r" = "POSIX"
 then
-	AC_DEFINE(HAVE_READDIR_R,,[ ])
+	AC_DEFINE(HAVE_READDIR_R,1,[Define to 1 if you have the `readdir_r' function.])
 fi
 ])
 

configure.in

@@ -344,15 +344,19 @@ AC_CHECK_FUNC(lstat64,
 	AC_DEFINE(_LARGEFILE64_SOURCE,1,[Additional functionality from LFS])
 	AC_DEFINE(_FILE_OFFSET_BITS,64,[Select 64 bits filesystem interface])
 	AIDE_LSTAT_FUNC="lstat64"
+	compoptionstring="${compoptionstring}WITH_LSTAT64\\n"
 	AIDE_STAT_FUNC="stat64"
 	AIDE_FSTAT_FUNC="fstat64"
 	AIDE_STAT_TYPE="stat64"
 	AIDE_OFF_TYPE="off64_t"
 	AIDE_BLKCNT_TYPE="blkcnt64_t"
-	AIDE_READDIR_FUNC="readdir64"
-	AIDE_READDIR_R_FUNC="readdir64_r"
-	compoptionstring="${compoptionstring}WITH_LSTAT64\\n"
-	compoptionstring="${compoptionstring}WITH_READDIR64\\n",
+	[AC_CHECK_FUNC(readdir64,
+		AIDE_READDIR_FUNC="readdir64"
+		compoptionstring="${compoptionstring}WITH_READDIR64\\n",
+		AIDE_READDIR_FUNC="readdir")]
+	[AC_CHECK_FUNC(readdir64_r,
+		AIDE_READDIR_R_FUNC="readdir64_r",
+		AIDE_READDIR_R_FUNC="readdir_r")],
 	AIDE_LSTAT_FUNC="lstat"
 	AIDE_STAT_FUNC="stat"
 	AIDE_FSTAT_FUNC="fstat"