aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog6
-rw-r--r--macros/gnome-support.m47
-rw-r--r--macros/need-declaration.m43
3 files changed, 12 insertions, 4 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index c7061e9310..dce3d40b0e 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,9 @@
+1999-01-05 Raja R Harinath <harinath@cs.umn.edu>
+
+ * gnome-support.m4: Include dirent.h before checking whether
+ `scandir' needs to be declared.
+ * need-declaration.m4: Revert unlogged change.
+
1998-12-22 Jeff Garzik <jgarzik@pobox.com>
* gnome.m4: Added and exported GNOME_APPLET_LIBS.
diff --git a/macros/gnome-support.m4 b/macros/gnome-support.m4
index 4123449483..2c1d049842 100644
--- a/macros/gnome-support.m4
+++ b/macros/gnome-support.m4
@@ -50,7 +50,12 @@ AC_DEFUN([GNOME_SUPPORT_CHECKS],[
# see if we need to declare some functions. Solaris is notorious for
# putting functions into the `libc' but not listing them in the headers
AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h dirent.h)
- GCC_NEED_DECLARATIONS(gethostname setreuid setregid getpagesize scandir)
+ GCC_NEED_DECLARATIONS(gethostname setreuid setregid getpagesize)
+ GCC_NEED_DECLARATION(scandir,[
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+])
# Turn our LIBOBJS into libtool objects. This is gross, but it
# requires changes to autoconf before it goes away.
diff --git a/macros/need-declaration.m4 b/macros/need-declaration.m4
index eea5bcd640..d5b7bc66d5 100644
--- a/macros/need-declaration.m4
+++ b/macros/need-declaration.m4
@@ -18,9 +18,6 @@ AC_CACHE_VAL(gcc_cv_decl_needed_$1,
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
$2],
[char *(*pfn) = (char *(*)) $1],
eval "gcc_cv_decl_needed_$1=no", eval "gcc_cv_decl_needed_$1=yes")])