Work around -rdynamic not handled by gcc2

Maybe a better test should be used.
This commit is contained in:
François Revol
2012-12-13 20:54:59 +00:00
parent 94eee370f4
commit b363b0e029

View File

@@ -1,5 +1,5 @@
diff --git a/configure b/configure
index d47cef7..f3291fd 100755
index d47cef7..2930e3a 100755
--- a/configure
+++ b/configure
@@ -1,9 +1,11 @@
@@ -403,7 +403,19 @@ index d47cef7..f3291fd 100755
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4791,7 +4770,7 @@ do
@@ -4228,7 +4207,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$GCC" = yes; then
- RDYNAMIC="-rdynamic"
+ case "$host_os" in
+ haiku*) RDYNAMIC="-Wl,-export-dynamic" ;;
+ *) RDYNAMIC="-rdynamic" ;;
+ esac
fi
ac_ext=c
@@ -4791,7 +4773,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -412,7 +424,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4834,7 +4813,7 @@ do
@@ -4834,7 +4816,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -421,7 +433,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4998,7 +4977,7 @@ do
@@ -4998,7 +4980,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -430,7 +442,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5041,7 +5020,7 @@ do
@@ -5041,7 +5023,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -439,7 +451,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5188,6 +5167,7 @@ fi
@@ -5188,6 +5170,7 @@ fi
@@ -447,7 +459,7 @@ index d47cef7..f3291fd 100755
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -5210,7 +5190,7 @@ do
@@ -5210,7 +5193,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -456,7 +468,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5253,7 +5233,7 @@ do
@@ -5253,7 +5236,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -465,7 +477,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5311,19 +5291,25 @@ if test "${enable_quota+set}" = set; then :
@@ -5311,19 +5294,25 @@ if test "${enable_quota+set}" = set; then :
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support" >&5
$as_echo "Disabling quota support" >&6; }
@@ -495,7 +507,7 @@ index d47cef7..f3291fd 100755
LIBQUOTA='$(LIB)/libquota'$LIB_EXT
DEPLIBQUOTA=$LIBQUOTA
STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT
@@ -5331,6 +5317,9 @@ DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA
@@ -5331,6 +5320,9 @@ DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA
PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT
DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA
@@ -505,7 +517,7 @@ index d47cef7..f3291fd 100755
@@ -5739,7 +5728,7 @@ case $as_dir/ in #((
@@ -5739,7 +5731,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -514,7 +526,7 @@ index d47cef7..f3291fd 100755
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -5912,7 +5901,7 @@ do
@@ -5912,7 +5904,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -523,7 +535,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6120,7 +6109,7 @@ do
@@ -6120,7 +6112,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -532,7 +544,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6160,7 +6149,7 @@ do
@@ -6160,7 +6152,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -541,7 +553,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -6255,7 +6244,7 @@ do
@@ -6255,7 +6247,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -550,7 +562,7 @@ index d47cef7..f3291fd 100755
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -6321,7 +6310,7 @@ do
@@ -6321,7 +6313,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -559,7 +571,7 @@ index d47cef7..f3291fd 100755
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -6492,11 +6481,11 @@ else
@@ -6492,11 +6484,11 @@ else
int
main ()
{
@@ -574,7 +586,7 @@ index d47cef7..f3291fd 100755
/* SunOS 4.1.1 cc rejects this. */
char const *const *pcpcc;
char **ppc;
@@ -6513,9 +6502,8 @@ main ()
@@ -6513,9 +6505,8 @@ main ()
++pcpcc;
ppc = (char**) pcpcc;
pcpcc = (char const *const *) ppc;
@@ -586,7 +598,7 @@ index d47cef7..f3291fd 100755
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
@@ -6531,10 +6519,10 @@ main ()
@@ -6531,10 +6522,10 @@ main ()
iptr p = 0;
++p;
}
@@ -600,7 +612,7 @@ index d47cef7..f3291fd 100755
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
@@ -7144,20 +7132,23 @@ else
@@ -7144,20 +7135,23 @@ else
/* end confdefs.h. */
$ac_includes_default
int
@@ -633,7 +645,7 @@ index d47cef7..f3291fd 100755
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
@@ -8803,7 +8794,7 @@ do
@@ -8803,7 +8797,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -642,7 +654,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_INTLBISON="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9608,7 +9599,7 @@ do
@@ -9608,7 +9602,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -651,7 +663,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9660,7 +9651,7 @@ do
@@ -9660,7 +9654,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -660,7 +672,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9701,7 +9692,7 @@ do
@@ -9701,7 +9695,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -669,7 +681,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9742,7 +9733,7 @@ do
@@ -9742,7 +9736,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -678,7 +690,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9783,7 +9774,7 @@ do
@@ -9783,7 +9777,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -687,7 +699,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9824,7 +9815,7 @@ do
@@ -9824,7 +9818,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -696,7 +708,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9867,7 +9858,7 @@ do
@@ -9867,7 +9861,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -705,7 +717,7 @@ index d47cef7..f3291fd 100755
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -9933,7 +9924,7 @@ do
@@ -9933,7 +9927,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -714,7 +726,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9974,7 +9965,7 @@ do
@@ -9974,7 +9968,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -723,7 +735,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10015,7 +10006,7 @@ do
@@ -10015,7 +10009,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -732,7 +744,7 @@ index d47cef7..f3291fd 100755
ac_cv_path_LDCONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10055,7 +10046,7 @@ do
@@ -10055,7 +10049,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -741,7 +753,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_AR="${ac_tool_prefix}ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10095,7 +10086,7 @@ do
@@ -10095,7 +10089,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -750,7 +762,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_ac_ct_AR="ar"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10147,7 +10138,7 @@ do
@@ -10147,7 +10141,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -759,7 +771,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10187,7 +10178,7 @@ do
@@ -10187,7 +10181,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -768,7 +780,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10239,7 +10230,7 @@ do
@@ -10239,7 +10233,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -777,7 +789,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10279,7 +10270,7 @@ do
@@ -10279,7 +10273,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -786,7 +798,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10330,7 +10321,7 @@ do
@@ -10330,7 +10324,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -795,7 +807,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_MAKEINFO="makeinfo"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -10390,7 +10381,7 @@ do
@@ -10390,7 +10384,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -804,7 +816,7 @@ index d47cef7..f3291fd 100755
ac_cv_prog_BUILD_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -11051,7 +11042,7 @@ if test "$ac_res" != no; then :
@@ -11051,7 +11045,7 @@ if test "$ac_res" != no; then :
fi
fi
@@ -813,7 +825,7 @@ index d47cef7..f3291fd 100755
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -11102,6 +11093,47 @@ fi
@@ -11102,6 +11096,47 @@ fi
$as_echo "$ac_cv_lib_socket_socket" >&6; }
if test "x$ac_cv_lib_socket_socket" = xyes; then :
SOCKET_LIB=-lsocket
@@ -861,7 +873,7 @@ index d47cef7..f3291fd 100755
fi
@@ -11321,6 +11353,18 @@ $as_echo "...and mandir defaults to /usr/share/man" >&6; }
@@ -11321,6 +11356,18 @@ $as_echo "...and mandir defaults to /usr/share/man" >&6; }
fi
fi
;;
@@ -880,7 +892,7 @@ index d47cef7..f3291fd 100755
esac
if test "$root_prefix" = NONE ; then
if test "$prefix" = NONE ; then
@@ -11875,16 +11919,16 @@ if (echo >conf$$.file) 2>/dev/null; then
@@ -11875,16 +11922,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
@@ -901,7 +913,7 @@ index d47cef7..f3291fd 100755
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -11944,16 +11988,28 @@ else
@@ -11944,16 +11991,28 @@ else
as_mkdir_p=false
fi
@@ -940,7 +952,7 @@ index d47cef7..f3291fd 100755
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -11975,7 +12031,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -11975,7 +12034,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by $as_me, which was
@@ -949,7 +961,7 @@ index d47cef7..f3291fd 100755
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -12041,10 +12097,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -12041,10 +12100,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
config.status
@@ -962,7 +974,7 @@ index d47cef7..f3291fd 100755
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -12134,7 +12190,7 @@ fi
@@ -12134,7 +12193,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
@@ -972,10 +984,22 @@ index d47cef7..f3291fd 100755
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
diff --git a/configure.in b/configure.in
index 0b96b8d..b33b494 100644
index 0b96b8d..cb1d0a2 100644
--- a/configure.in
+++ b/configure.in
@@ -565,20 +565,28 @@ AC_SUBST(BLKID_CMT)
@@ -96,7 +96,10 @@ AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead]))
dnl
AC_PROG_CC
if test "$GCC" = yes; then
- RDYNAMIC="-rdynamic"
+ case "$host_os" in
+ haiku*) RDYNAMIC="-Wl,-export-dynamic" ;;
+ *) RDYNAMIC="-rdynamic" ;;
+ esac
AC_SUBST(RDYNAMIC)
fi
AC_PROG_CPP
@@ -565,20 +568,28 @@ AC_SUBST(BLKID_CMT)
dnl
dnl handle --enable-quota
dnl
@@ -1007,7 +1031,7 @@ index 0b96b8d..b33b494 100644
dnl
dnl Define stuff expected for quota library
dnl
@@ -588,6 +596,7 @@ STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT
@@ -588,6 +599,7 @@ STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT
DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA
PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT
DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA
@@ -1015,7 +1039,7 @@ index 0b96b8d..b33b494 100644
AC_SUBST(LIBQUOTA)
AC_SUBST(DEPLIBQUOTA)
AC_SUBST(STATIC_LIBQUOTA)
@@ -1051,6 +1060,7 @@ AC_CHECK_FUNCS(m4_flatten([
@@ -1051,6 +1063,7 @@ AC_CHECK_FUNCS(m4_flatten([
backtrace
blkid_probe_get_topology
chflags
@@ -1023,7 +1047,7 @@ index 0b96b8d..b33b494 100644
fallocate
fallocate64
fchown
@@ -1094,9 +1104,10 @@ AC_CHECK_FUNCS(m4_flatten([
@@ -1094,9 +1107,10 @@ AC_CHECK_FUNCS(m4_flatten([
dnl
dnl Check to see if -lsocket is required (solaris) to make something
dnl that uses socket() to compile; this is needed for the UUID library
@@ -1035,7 +1059,7 @@ index 0b96b8d..b33b494 100644
AC_SUBST(SOCKET_LIB)
dnl
dnl See if optreset exists
@@ -1187,6 +1198,16 @@ linux* | gnu* | k*bsd*-gnu)
@@ -1187,6 +1201,16 @@ linux* | gnu* | k*bsd*-gnu)
fi
fi
;;