diff options
| author | Raja R Harinath <harinath@src.gnome.org> | 1999-01-06 01:45:20 +0000 |
|---|---|---|
| committer | Raja R Harinath <harinath@src.gnome.org> | 1999-01-06 01:45:20 +0000 |
| commit | f8bd3f941886d669686d934e86d1ac880b9af150 (patch) | |
| tree | 6b8fa1737338c9d91da5f61a4279cb1d94eb8b1b | |
| parent | dab27d3876045f818ad3840a6bdc58f0a15294d8 (diff) | |
| download | gnome-common-f8bd3f941886d669686d934e86d1ac880b9af150.tar.gz | |
Include dirent.h before checking whether `scandir' needs to be declared.
* gnome-support.m4: Include dirent.h before checking whether
`scandir' needs to be declared.
* need-declaration.m4: Revert unlogged change.
svn path=/trunk/; revision=562
| -rw-r--r-- | macros/ChangeLog | 6 | ||||
| -rw-r--r-- | macros/gnome-support.m4 | 7 | ||||
| -rw-r--r-- | macros/need-declaration.m4 | 3 |
3 files changed, 12 insertions, 4 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index c7061e9..dce3d40 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 4123449..2c1d049 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 eea5bcd..d5b7bc6 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")]) |