diff options
| -rw-r--r-- | autoconf/m4/func_mmap_file.m4 | 18 | ||||
| -rw-r--r-- | autoconf/m4/link_use_r.m4 | 4 |
2 files changed, 8 insertions, 14 deletions
diff --git a/autoconf/m4/func_mmap_file.m4 b/autoconf/m4/func_mmap_file.m4 index 96b5173..e607d0d 100644 --- a/autoconf/m4/func_mmap_file.m4 +++ b/autoconf/m4/func_mmap_file.m4 @@ -6,22 +6,18 @@ AC_DEFUN([AC_FUNC_MMAP_FILE], ac_cv_func_mmap_file, [ AC_LANG_PUSH([C]) AC_RUN_IFELSE([ -#ifdef HAVE_SYS_TYPES_H + AC_LANG_PROGRAM([[ #include <sys/types.h> -#endif - -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif - -#ifdef HAVE_FCNTL_H #include <fcntl.h> -#endif - +]],[[ int fd; int main () { - fd = creat ("foo",0777); fd = (int) mmap (0, 1, PROT_READ, MAP_SHARED, fd, 0); unlink ("foo"); return (fd != (int) MAP_FAILED);}], - ac_cv_func_mmap_file=yes, ac_cv_func_mmap_file=no, ac_cv_func_mmap_file=no) + fd = creat ("foo",0777); + fd = (int) mmap (0, 1, PROT_READ, MAP_SHARED, fd, 0); + unlink ("foo"); + return (fd != (int) MAP_FAILED);}]])], + [ac_cv_func_mmap_file=yes], [ac_cv_func_mmap_file=no],[]) AC_LANG_POP([C]) ]) if test "$ac_cv_func_mmap_file" = yes; then diff --git a/autoconf/m4/link_use_r.m4 b/autoconf/m4/link_use_r.m4 index 0949304..9bd648f 100644 --- a/autoconf/m4/link_use_r.m4 +++ b/autoconf/m4/link_use_r.m4 @@ -9,7 +9,7 @@ AC_DEFUN([AC_LINK_USE_R], AC_LANG_PUSH([C]) oldcflags="$CFLAGS" CFLAGS="$CFLAGS -Wl,-R." - AC_LINK_IFELSE([int main() { return 0; }],[ac_cv_link_use_r=yes],[ac_cv_link_use_r=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[int main() { return 0; }]])],[ac_cv_link_use_r=yes],[ac_cv_link_use_r=no]) CFLAGS="$oldcflags" AC_LANG_POP([C]) AC_MSG_RESULT($ac_cv_link_use_r) @@ -18,5 +18,3 @@ AC_DEFUN([AC_LINK_USE_R], AC_DEFINE([HAVE_LINK_R],[1],[Define if you can use -Wl,-R. to pass -R. to the linker, in order to add the current directory to the dynamic linker search path.]) fi ]) - - |