summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2006-10-12 01:05:16 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2006-10-12 01:05:16 +0000
commit6d34310b426ee61bfedea28b7060ba5f57e56dbd (patch)
tree51505bd139acd2d1968ae5a07f7531ed325f83e9
parent2db06dbf189cfd4e852b93db120cafaf717b0784 (diff)
* configure.in: use AC_TRY_COMPILE for dirfd instead of AC_TRY_RUN
-rw-r--r--ChangeLog4
-rw-r--r--configure.in23
2 files changed, 15 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 090b37ff..615be307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2006-10-11 John (J5) Palmieri <johnp@redhat.com>
+ * configure.in: use AC_TRY_COMPILE for dirfd instead of AC_TRY_RUN
+
+2006-10-11 John (J5) Palmieri <johnp@redhat.com>
+
* test/name-test/Makefile.am: don't link against both libdbus and
libdbus-convenience
diff --git a/configure.in b/configure.in
index 509fe2d1..2af29b3c 100644
--- a/configure.in
+++ b/configure.in
@@ -512,20 +512,19 @@ AC_CHECK_LIB(nsl,gethostbyname)
AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist fpathconf)
-AC_CACHE_CHECK([for dirfd],
- ac_cv_func_dirfd,
- [AC_TRY_RUN([
+AC_MSG_CHECKING(for dirfd)
+AC_TRY_COMPILE([
#include <sys/types.h>
#include <dirent.h>
-int main () {
- DIR *dirp;
- dirp = opendir(".");
- dirfd(dirp);
- closedir(dirp);
-}],
- ac_cv_func_dirfd=yes,
- ac_cv_func_dirfd=no)])
-if test "$ac_cv_func_dirfd" = yes; then
+],[
+DIR *dirp;
+dirp = opendir(".");
+dirfd(dirp);
+closedir(dirp);
+],
+dbus_have_dirfd=yes, dbus_have_dirfd=no)
+AC_MSG_RESULT($dbus_have_dirfd)
+if test "$dbus_have_dirfd" = yes; then
AC_DEFINE(HAVE_DIRFD,1,[Have dirfd function])
fi