Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit dddd95a

Browse files
committed
Check both -lrt and -lposix4 for fdatasync, to cover all Solaris versions.
1 parent 21a7fa8 commit dddd95a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

configure

+2-2
Original file line numberDiff line numberDiff line change
@@ -4407,7 +4407,7 @@ else
44074407
cat conftest.$ac_ext >&5
44084408
fi
44094409
rm -f conftest*
4410-
test "$ac_cv_search_fdatasync" = "no" && for i in rt; do
4410+
test "$ac_cv_search_fdatasync" = "no" && for i in rt posix4; do
44114411
LIBS="-l$i $ac_func_search_save_LIBS"
44124412
cat > conftest.$ac_ext <<EOF
44134413
#line 4414 "configure"
@@ -8051,7 +8051,7 @@ EOF
80518051

80528052
else
80538053
echo "$ac_t""no" 1>&6
8054-
{ echo "configure: error: atexi() nor on_exit() found" 1>&2; exit 1; }
8054+
{ echo "configure: error: neither atexit() nor on_exit() found" 1>&2; exit 1; }
80558055
fi
80568056
done
80578057

configure.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ AC_EGREP_HEADER(z_streamp, zlib.h, [
751751
AC_CHECK_LIB(z, inflate)
752752
])
753753
# Solaris:
754-
AC_SEARCH_LIBS(fdatasync, rt)
754+
AC_SEARCH_LIBS(fdatasync, [rt posix4])
755755

756756
if test "$with_krb4" = yes ; then
757757
AC_CHECK_LIB(des, [des_encrypt], [], [AC_MSG_ERROR([library 'des' is required for Kerberos 4])])
@@ -1161,7 +1161,7 @@ AC_CHECK_FUNC(atexit,
11611161
[AC_DEFINE(HAVE_ATEXIT)],
11621162
[AC_CHECK_FUNCS(on_exit,
11631163
[AC_DEFINE(HAVE_ON_EXIT)],
1164-
[AC_MSG_ERROR([atexi() nor on_exit() found])])])
1164+
[AC_MSG_ERROR([neither atexit() nor on_exit() found])])])
11651165

11661166
dnl Need a #define for the size of Datum (unsigned long)
11671167

0 commit comments

Comments
 (0)