projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import upstream version 1.27
[debian/tar]
/
m4
/
mkfifo.m4
diff --git
a/m4/mkfifo.m4
b/m4/mkfifo.m4
index 8d1f634c20e911e57d8ac3712b668d05fc0e290a..e571c64e2563cea7ab778f56878b9b359a97f548 100644
(file)
--- a/
m4/mkfifo.m4
+++ b/
m4/mkfifo.m4
@@
-1,7
+1,7
@@
-# serial
1
+# serial
4
# See if we need to provide mkfifo replacement.
# See if we need to provide mkfifo replacement.
-dnl Copyright (C) 2009
, 2010
Free Software Foundation, Inc.
+dnl Copyright (C) 2009
-2013
Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@
-11,10
+11,10
@@
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_FUNC_MKFIFO],
[
AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
AC_DEFUN([gl_FUNC_MKFIFO],
[
AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
AC_CHECK_FUNCS_ONCE([mkfifo])
if test $ac_cv_func_mkfifo = no; then
HAVE_MKFIFO=0
AC_CHECK_FUNCS_ONCE([mkfifo])
if test $ac_cv_func_mkfifo = no; then
HAVE_MKFIFO=0
- AC_LIBOBJ([mkfifo])
else
dnl Check for Solaris 9 and FreeBSD bug with trailing slash.
AC_CHECK_FUNCS_ONCE([lstat])
else
dnl Check for Solaris 9 and FreeBSD bug with trailing slash.
AC_CHECK_FUNCS_ONCE([lstat])
@@
-27,19
+27,32
@@
AC_DEFUN([gl_FUNC_MKFIFO],
AC_RUN_IFELSE(
[AC_LANG_PROGRAM(
[[#include <sys/stat.h>
AC_RUN_IFELSE(
[AC_LANG_PROGRAM(
[[#include <sys/stat.h>
-]], [[if (!mkfifo ("conftest.tmp/", 0600)) return 1;
+ ]],
+ [[int result = 0;
+ if (!mkfifo ("conftest.tmp/", 0600))
+ result |= 1;
#if HAVE_LSTAT
#if HAVE_LSTAT
- if (!mkfifo ("conftest.lnk/", 0600)) return 2;
+ if (!mkfifo ("conftest.lnk/", 0600))
+ result |= 2;
#endif
#endif
+ return result;
]])],
[gl_cv_func_mkfifo_works=yes], [gl_cv_func_mkfifo_works=no],
]])],
[gl_cv_func_mkfifo_works=yes], [gl_cv_func_mkfifo_works=no],
- [gl_cv_func_mkfifo_works="guessing no"])
+ [case "$host_os" in
+ # Guess yes on glibc systems.
+ *-gnu*) gl_cv_func_mkfifo_works="guessing yes" ;;
+ # If we don't know, assume the worst.
+ *) gl_cv_func_mkfifo_works="guessing no" ;;
+ esac
+ ])
rm -f conftest.tmp conftest.lnk])
rm -f conftest.tmp conftest.lnk])
- if test "$gl_cv_func_mkfifo_works" != yes; then
- AC_DEFINE([MKFIFO_TRAILING_SLASH_BUG], [1], [Define to 1 if mkfifo
- does not reject trailing slash])
- REPLACE_MKFIFO=1
- AC_LIBOBJ([mkfifo])
- fi
+ case "$gl_cv_func_mkfifo_works" in
+ *yes) ;;
+ *)
+ AC_DEFINE([MKFIFO_TRAILING_SLASH_BUG], [1], [Define to 1 if mkfifo
+ does not reject trailing slash])
+ REPLACE_MKFIFO=1
+ ;;
+ esac
fi
])
fi
])