mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
fix linking of k5crypto library on openbsd
(This used to be commit 2667dea146)
This commit is contained in:
Andrew Tridgell
parent
7acc2b977c
commit
9a2ce008e9
236
source3/configure
vendored
236
source3/configure
vendored
@ -11208,7 +11208,7 @@ if test "${with_krb5+set}" = set; then
|
||||
#define KRB5_AUTH 1
|
||||
EOF
|
||||
|
||||
LIBS="$LIBS -lkrb5 -lk5crypto -lcom_err"
|
||||
LIBS="$LIBS -lkrb5"
|
||||
CFLAGS="$CFLAGS -I$withval/include"
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
cat >> confdefs.h <<\EOF
|
||||
@ -11267,7 +11267,7 @@ LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
LIBS="$LIBS -lkrb5 -lk5crypto -lcom_err";
|
||||
LIBS="$LIBS -lkrb5";
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_KRB5 1
|
||||
EOF
|
||||
@ -11278,11 +11278,107 @@ fi
|
||||
|
||||
fi
|
||||
|
||||
##################################################################
|
||||
# we might need the k5crypto and com_err libraries on some systems
|
||||
echo $ac_n "checking for krb5_encrypt_data in -lk5crypto""... $ac_c" 1>&6
|
||||
echo "configure:11285: checking for krb5_encrypt_data in -lk5crypto" >&5
|
||||
ac_lib_var=`echo k5crypto'_'krb5_encrypt_data | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lk5crypto $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11293 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char krb5_encrypt_data();
|
||||
|
||||
int main() {
|
||||
krb5_encrypt_data()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_lib=HAVE_LIB`echo k5crypto | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
||||
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
|
||||
LIBS="-lk5crypto $LIBS"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for _et_list in -lcom_err""... $ac_c" 1>&6
|
||||
echo "configure:11332: checking for _et_list in -lcom_err" >&5
|
||||
ac_lib_var=`echo com_err'_'_et_list | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lcom_err $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11340 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char _et_list();
|
||||
|
||||
int main() {
|
||||
_et_list()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_lib=HAVE_LIB`echo com_err | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
||||
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
|
||||
LIBS="-lcom_err $LIBS"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
|
||||
#################################################
|
||||
# check for automount support
|
||||
echo $ac_n "checking whether to use AUTOMOUNT""... $ac_c" 1>&6
|
||||
echo "configure:11286: checking whether to use AUTOMOUNT" >&5
|
||||
echo "configure:11382: checking whether to use AUTOMOUNT" >&5
|
||||
# Check whether --with-automount or --without-automount was given.
|
||||
if test "${with_automount+set}" = set; then
|
||||
withval="$with_automount"
|
||||
@ -11307,7 +11403,7 @@ fi
|
||||
#################################################
|
||||
# check for smbmount support
|
||||
echo $ac_n "checking whether to use SMBMOUNT""... $ac_c" 1>&6
|
||||
echo "configure:11311: checking whether to use SMBMOUNT" >&5
|
||||
echo "configure:11407: checking whether to use SMBMOUNT" >&5
|
||||
# Check whether --with-smbmount or --without-smbmount was given.
|
||||
if test "${with_smbmount+set}" = set; then
|
||||
withval="$with_smbmount"
|
||||
@ -11344,7 +11440,7 @@ fi
|
||||
# check for a PAM password database
|
||||
with_pam_for_crypt=no
|
||||
echo $ac_n "checking whether to use PAM password database""... $ac_c" 1>&6
|
||||
echo "configure:11348: checking whether to use PAM password database" >&5
|
||||
echo "configure:11444: checking whether to use PAM password database" >&5
|
||||
# Check whether --with-pam or --without-pam was given.
|
||||
if test "${with_pam+set}" = set; then
|
||||
withval="$with_pam"
|
||||
@ -11370,7 +11466,7 @@ fi
|
||||
|
||||
# we can't build a pam module if we don't have pam.
|
||||
echo $ac_n "checking for pam_get_data in -lpam""... $ac_c" 1>&6
|
||||
echo "configure:11374: checking for pam_get_data in -lpam" >&5
|
||||
echo "configure:11470: checking for pam_get_data in -lpam" >&5
|
||||
ac_lib_var=`echo pam'_'pam_get_data | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -11378,7 +11474,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpam $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11382 "configure"
|
||||
#line 11478 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -11389,7 +11485,7 @@ int main() {
|
||||
pam_get_data()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -11416,7 +11512,7 @@ fi
|
||||
#################################################
|
||||
# check for pam_smbpass support
|
||||
echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6
|
||||
echo "configure:11420: checking whether to use pam_smbpass" >&5
|
||||
echo "configure:11516: checking whether to use pam_smbpass" >&5
|
||||
# Check whether --with-pam_smbpass or --without-pam_smbpass was given.
|
||||
if test "${with_pam_smbpass+set}" = set; then
|
||||
withval="$with_pam_smbpass"
|
||||
@ -11454,12 +11550,12 @@ if test $with_pam_for_crypt = no; then
|
||||
for ac_func in crypt
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:11458: checking for $ac_func" >&5
|
||||
echo "configure:11554: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11463 "configure"
|
||||
#line 11559 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -11482,7 +11578,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
@ -11508,7 +11604,7 @@ done
|
||||
|
||||
if test x"$ac_cv_func_crypt" = x"no"; then
|
||||
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
|
||||
echo "configure:11512: checking for crypt in -lcrypt" >&5
|
||||
echo "configure:11608: checking for crypt in -lcrypt" >&5
|
||||
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -11516,7 +11612,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lcrypt $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11520 "configure"
|
||||
#line 11616 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -11527,7 +11623,7 @@ int main() {
|
||||
crypt()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -11562,7 +11658,7 @@ fi
|
||||
##
|
||||
if test $with_pam_for_crypt = no; then
|
||||
echo $ac_n "checking for a crypt that needs truncated salt""... $ac_c" 1>&6
|
||||
echo "configure:11566: checking for a crypt that needs truncated salt" >&5
|
||||
echo "configure:11662: checking for a crypt that needs truncated salt" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_HAVE_TRUNCATED_SALT'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -11571,11 +11667,11 @@ if test "$cross_compiling" = yes; then
|
||||
samba_cv_HAVE_TRUNCATED_SALT=cross
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11575 "configure"
|
||||
#line 11671 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "${srcdir-.}/tests/crypttest.c"
|
||||
EOF
|
||||
if { (eval echo configure:11579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:11675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
samba_cv_HAVE_TRUNCATED_SALT=no
|
||||
else
|
||||
@ -11613,7 +11709,7 @@ with_smbpasswd_sam=yes
|
||||
#################################################
|
||||
# check for a TDB password database
|
||||
echo $ac_n "checking whether to use TDB SAM database""... $ac_c" 1>&6
|
||||
echo "configure:11617: checking whether to use TDB SAM database" >&5
|
||||
echo "configure:11713: checking whether to use TDB SAM database" >&5
|
||||
# Check whether --with-tdbsam or --without-tdbsam was given.
|
||||
if test "${with_tdbsam+set}" = set; then
|
||||
withval="$with_tdbsam"
|
||||
@ -11639,7 +11735,7 @@ fi
|
||||
#################################################
|
||||
# check for a LDAP password database
|
||||
echo $ac_n "checking whether to use LDAP SAM database""... $ac_c" 1>&6
|
||||
echo "configure:11643: checking whether to use LDAP SAM database" >&5
|
||||
echo "configure:11739: checking whether to use LDAP SAM database" >&5
|
||||
# Check whether --with-ldapsam or --without-ldapsam was given.
|
||||
if test "${with_ldapsam+set}" = set; then
|
||||
withval="$with_ldapsam"
|
||||
@ -11666,7 +11762,7 @@ fi
|
||||
#################################################
|
||||
# check for a NISPLUS password database
|
||||
echo $ac_n "checking whether to use NISPLUS SAM database""... $ac_c" 1>&6
|
||||
echo "configure:11670: checking whether to use NISPLUS SAM database" >&5
|
||||
echo "configure:11766: checking whether to use NISPLUS SAM database" >&5
|
||||
# Check whether --with-nisplussam or --without-nisplussam was given.
|
||||
if test "${with_nisplussam+set}" = set; then
|
||||
withval="$with_nisplussam"
|
||||
@ -11694,7 +11790,7 @@ fi
|
||||
# smbpasswd SAM is only used if another format
|
||||
# has not been defined
|
||||
echo $ac_n "checking whether to use traditional smbpasswd file""... $ac_c" 1>&6
|
||||
echo "configure:11698: checking whether to use traditional smbpasswd file" >&5
|
||||
echo "configure:11794: checking whether to use traditional smbpasswd file" >&5
|
||||
if test $with_smbpasswd_sam = yes; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
cat >> confdefs.h <<\EOF
|
||||
@ -11714,7 +11810,7 @@ fi
|
||||
#################################################
|
||||
# check for a NISPLUS_HOME support
|
||||
echo $ac_n "checking whether to use NISPLUS_HOME""... $ac_c" 1>&6
|
||||
echo "configure:11718: checking whether to use NISPLUS_HOME" >&5
|
||||
echo "configure:11814: checking whether to use NISPLUS_HOME" >&5
|
||||
# Check whether --with-nisplus-home or --without-nisplus-home was given.
|
||||
if test "${with_nisplus_home+set}" = set; then
|
||||
withval="$with_nisplus_home"
|
||||
@ -11739,7 +11835,7 @@ fi
|
||||
#################################################
|
||||
# check for the secure socket layer
|
||||
echo $ac_n "checking whether to use SSL""... $ac_c" 1>&6
|
||||
echo "configure:11743: checking whether to use SSL" >&5
|
||||
echo "configure:11839: checking whether to use SSL" >&5
|
||||
# Check whether --with-ssl or --without-ssl was given.
|
||||
if test "${with_ssl+set}" = set; then
|
||||
withval="$with_ssl"
|
||||
@ -11813,7 +11909,7 @@ fi
|
||||
#################################################
|
||||
# check for syslog logging
|
||||
echo $ac_n "checking whether to use syslog logging""... $ac_c" 1>&6
|
||||
echo "configure:11817: checking whether to use syslog logging" >&5
|
||||
echo "configure:11913: checking whether to use syslog logging" >&5
|
||||
# Check whether --with-syslog or --without-syslog was given.
|
||||
if test "${with_syslog+set}" = set; then
|
||||
withval="$with_syslog"
|
||||
@ -11838,7 +11934,7 @@ fi
|
||||
#################################################
|
||||
# check for a shared memory profiling support
|
||||
echo $ac_n "checking whether to use profiling""... $ac_c" 1>&6
|
||||
echo "configure:11842: checking whether to use profiling" >&5
|
||||
echo "configure:11938: checking whether to use profiling" >&5
|
||||
# Check whether --with-profiling-data or --without-profiling-data was given.
|
||||
if test "${with_profiling_data+set}" = set; then
|
||||
withval="$with_profiling_data"
|
||||
@ -11866,7 +11962,7 @@ fi
|
||||
QUOTAOBJS=smbd/noquotas.o
|
||||
|
||||
echo $ac_n "checking whether to support disk-quotas""... $ac_c" 1>&6
|
||||
echo "configure:11870: checking whether to support disk-quotas" >&5
|
||||
echo "configure:11966: checking whether to support disk-quotas" >&5
|
||||
# Check whether --with-quotas or --without-quotas was given.
|
||||
if test "${with_quotas+set}" = set; then
|
||||
withval="$with_quotas"
|
||||
@ -11877,13 +11973,13 @@ if test "${with_quotas+set}" = set; then
|
||||
*linux*)
|
||||
# Check for kernel 2.4.x quota braindamage...
|
||||
echo $ac_n "checking for linux 2.4.x quota braindamage..""... $ac_c" 1>&6
|
||||
echo "configure:11881: checking for linux 2.4.x quota braindamage.." >&5
|
||||
echo "configure:11977: checking for linux 2.4.x quota braindamage.." >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_linux_2_4_quota_braindamage'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11887 "configure"
|
||||
#line 11983 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -11895,7 +11991,7 @@ int main() {
|
||||
struct mem_dqblk D;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
samba_cv_linux_2_4_quota_braindamage=yes
|
||||
else
|
||||
@ -11944,7 +12040,7 @@ fi
|
||||
# check for experimental utmp accounting
|
||||
|
||||
echo $ac_n "checking whether to support utmp accounting""... $ac_c" 1>&6
|
||||
echo "configure:11948: checking whether to support utmp accounting" >&5
|
||||
echo "configure:12044: checking whether to support utmp accounting" >&5
|
||||
# Check whether --with-utmp or --without-utmp was given.
|
||||
if test "${with_utmp+set}" = set; then
|
||||
withval="$with_utmp"
|
||||
@ -12044,7 +12140,7 @@ fi
|
||||
#################################################
|
||||
# choose native language(s) of man pages
|
||||
echo $ac_n "checking chosen man pages' language(s)""... $ac_c" 1>&6
|
||||
echo "configure:12048: checking chosen man pages' language(s)" >&5
|
||||
echo "configure:12144: checking chosen man pages' language(s)" >&5
|
||||
# Check whether --with-manpages-langs or --without-manpages-langs was given.
|
||||
if test "${with_manpages_langs+set}" = set; then
|
||||
withval="$with_manpages_langs"
|
||||
@ -12072,14 +12168,14 @@ fi
|
||||
#################################################
|
||||
# these tests are taken from the GNU fileutils package
|
||||
echo "checking how to get filesystem space usage" 1>&6
|
||||
echo "configure:12076: checking how to get filesystem space usage" >&5
|
||||
echo "configure:12172: checking how to get filesystem space usage" >&5
|
||||
space=no
|
||||
|
||||
# Test for statvfs64.
|
||||
if test $space = no; then
|
||||
# SVR4
|
||||
echo $ac_n "checking statvfs64 function (SVR4)""... $ac_c" 1>&6
|
||||
echo "configure:12083: checking statvfs64 function (SVR4)" >&5
|
||||
echo "configure:12179: checking statvfs64 function (SVR4)" >&5
|
||||
if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs64'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12087,7 +12183,7 @@ else
|
||||
fu_cv_sys_stat_statvfs64=cross
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12091 "configure"
|
||||
#line 12187 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if defined(HAVE_UNISTD_H)
|
||||
@ -12101,7 +12197,7 @@ else
|
||||
exit (statvfs64 (".", &fsd));
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:12105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
fu_cv_sys_stat_statvfs64=yes
|
||||
else
|
||||
@ -12134,12 +12230,12 @@ fi
|
||||
if test $space = no; then
|
||||
# SVR4
|
||||
echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6
|
||||
echo "configure:12138: checking statvfs function (SVR4)" >&5
|
||||
echo "configure:12234: checking statvfs function (SVR4)" >&5
|
||||
if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12143 "configure"
|
||||
#line 12239 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/statvfs.h>
|
||||
@ -12147,7 +12243,7 @@ int main() {
|
||||
struct statvfs fsd; statvfs (0, &fsd);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
fu_cv_sys_stat_statvfs=yes
|
||||
else
|
||||
@ -12172,7 +12268,7 @@ fi
|
||||
if test $space = no; then
|
||||
# DEC Alpha running OSF/1
|
||||
echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6
|
||||
echo "configure:12176: checking for 3-argument statfs function (DEC OSF/1)" >&5
|
||||
echo "configure:12272: checking for 3-argument statfs function (DEC OSF/1)" >&5
|
||||
if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12180,7 +12276,7 @@ else
|
||||
fu_cv_sys_stat_statfs3_osf1=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12184 "configure"
|
||||
#line 12280 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -12193,7 +12289,7 @@ else
|
||||
exit (statfs (".", &fsd, sizeof (struct statfs)));
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:12197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
fu_cv_sys_stat_statfs3_osf1=yes
|
||||
else
|
||||
@ -12220,7 +12316,7 @@ fi
|
||||
if test $space = no; then
|
||||
# AIX
|
||||
echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6
|
||||
echo "configure:12224: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
|
||||
echo "configure:12320: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
|
||||
if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12228,7 +12324,7 @@ else
|
||||
fu_cv_sys_stat_statfs2_bsize=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12232 "configure"
|
||||
#line 12328 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#ifdef HAVE_SYS_PARAM_H
|
||||
@ -12247,7 +12343,7 @@ else
|
||||
exit (statfs (".", &fsd));
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:12251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
fu_cv_sys_stat_statfs2_bsize=yes
|
||||
else
|
||||
@ -12274,7 +12370,7 @@ fi
|
||||
if test $space = no; then
|
||||
# SVR3
|
||||
echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6
|
||||
echo "configure:12278: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
|
||||
echo "configure:12374: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
|
||||
if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12282,7 +12378,7 @@ else
|
||||
fu_cv_sys_stat_statfs4=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12286 "configure"
|
||||
#line 12382 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/statfs.h>
|
||||
@ -12292,7 +12388,7 @@ else
|
||||
exit (statfs (".", &fsd, sizeof fsd, 0));
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:12296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
fu_cv_sys_stat_statfs4=yes
|
||||
else
|
||||
@ -12319,7 +12415,7 @@ fi
|
||||
if test $space = no; then
|
||||
# 4.4BSD and NetBSD
|
||||
echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6
|
||||
echo "configure:12323: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
|
||||
echo "configure:12419: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
|
||||
if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12327,7 +12423,7 @@ else
|
||||
fu_cv_sys_stat_statfs2_fsize=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12331 "configure"
|
||||
#line 12427 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#ifdef HAVE_SYS_PARAM_H
|
||||
@ -12343,7 +12439,7 @@ else
|
||||
exit (statfs (".", &fsd));
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:12347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
fu_cv_sys_stat_statfs2_fsize=yes
|
||||
else
|
||||
@ -12370,7 +12466,7 @@ fi
|
||||
if test $space = no; then
|
||||
# Ultrix
|
||||
echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6
|
||||
echo "configure:12374: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
|
||||
echo "configure:12470: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
|
||||
if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
@ -12378,7 +12474,7 @@ else
|
||||
fu_cv_sys_stat_fs_data=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12382 "configure"
|
||||
#line 12478 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#ifdef HAVE_SYS_PARAM_H
|
||||
@ -12398,7 +12494,7 @@ else
|
||||
exit (statfs (".", &fsd) != 1);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:12402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
fu_cv_sys_stat_fs_data=yes
|
||||
else
|
||||
@ -12431,9 +12527,9 @@ fi
|
||||
# file support.
|
||||
#
|
||||
echo $ac_n "checking if large file support can be enabled""... $ac_c" 1>&6
|
||||
echo "configure:12435: checking if large file support can be enabled" >&5
|
||||
echo "configure:12531: checking if large file support can be enabled" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12437 "configure"
|
||||
#line 12533 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
|
||||
@ -12446,7 +12542,7 @@ int main() {
|
||||
int i
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:12546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes
|
||||
else
|
||||
@ -12511,7 +12607,7 @@ fi
|
||||
# check for ACL support
|
||||
|
||||
echo $ac_n "checking whether to support ACLs""... $ac_c" 1>&6
|
||||
echo "configure:12515: checking whether to support ACLs" >&5
|
||||
echo "configure:12611: checking whether to support ACLs" >&5
|
||||
# Check whether --with-acl-support or --without-acl-support was given.
|
||||
if test "${with_acl_support+set}" = set; then
|
||||
withval="$with_acl_support"
|
||||
@ -12557,7 +12653,7 @@ EOF
|
||||
;;
|
||||
*)
|
||||
echo $ac_n "checking for acl_get_file in -lacl""... $ac_c" 1>&6
|
||||
echo "configure:12561: checking for acl_get_file in -lacl" >&5
|
||||
echo "configure:12657: checking for acl_get_file in -lacl" >&5
|
||||
ac_lib_var=`echo acl'_'acl_get_file | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -12565,7 +12661,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lacl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12569 "configure"
|
||||
#line 12665 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
@ -12576,7 +12672,7 @@ int main() {
|
||||
acl_get_file()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
@ -12604,13 +12700,13 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for ACL support""... $ac_c" 1>&6
|
||||
echo "configure:12608: checking for ACL support" >&5
|
||||
echo "configure:12704: checking for ACL support" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_HAVE_POSIX_ACLS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12614 "configure"
|
||||
#line 12710 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/acl.h>
|
||||
@ -12618,7 +12714,7 @@ int main() {
|
||||
acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
samba_cv_HAVE_POSIX_ACLS=yes
|
||||
else
|
||||
@ -12638,13 +12734,13 @@ echo "$ac_t""$samba_cv_HAVE_POSIX_ACLS" 1>&6
|
||||
EOF
|
||||
|
||||
echo $ac_n "checking for acl_get_perm_np""... $ac_c" 1>&6
|
||||
echo "configure:12642: checking for acl_get_perm_np" >&5
|
||||
echo "configure:12738: checking for acl_get_perm_np" >&5
|
||||
if eval "test \"`echo '$''{'samba_cv_HAVE_ACL_GET_PERM_NP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12648 "configure"
|
||||
#line 12744 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/acl.h>
|
||||
@ -12652,7 +12748,7 @@ int main() {
|
||||
acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
samba_cv_HAVE_ACL_GET_PERM_NP=yes
|
||||
else
|
||||
@ -12699,7 +12795,7 @@ fi
|
||||
# (WINBIND_STARGETS) and shared libraries (WINBIND_LTARGETS).
|
||||
|
||||
echo $ac_n "checking whether to build winbind""... $ac_c" 1>&6
|
||||
echo "configure:12703: checking whether to build winbind" >&5
|
||||
echo "configure:12799: checking whether to build winbind" >&5
|
||||
|
||||
# Initially, the value of $host_os decides whether winbind is supported
|
||||
|
||||
@ -12778,11 +12874,11 @@ if test "$cross_compiling" = yes; then
|
||||
:
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12782 "configure"
|
||||
#line 12878 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "${srcdir-.}/tests/summary.c"
|
||||
EOF
|
||||
if { (eval echo configure:12786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
echo "configure OK";
|
||||
else
|
||||
|
||||
@ -1611,7 +1611,7 @@ AC_ARG_WITH(krb5,
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(KRB5_AUTH)
|
||||
LIBS="$LIBS -lkrb5 -lk5crypto -lcom_err"
|
||||
LIBS="$LIBS -lkrb5"
|
||||
CFLAGS="$CFLAGS -I$withval/include"
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
AC_DEFINE(HAVE_KRB5)
|
||||
@ -1626,10 +1626,14 @@ AC_ARG_WITH(krb5,
|
||||
########################################################
|
||||
# now see if we can find the krb5 libs in standard paths
|
||||
if test x$have_krb5 != xyes; then
|
||||
AC_CHECK_LIB(krb5, krb5_mk_req_extended, [LIBS="$LIBS -lkrb5 -lk5crypto -lcom_err";
|
||||
AC_CHECK_LIB(krb5, krb5_mk_req_extended, [LIBS="$LIBS -lkrb5";
|
||||
AC_DEFINE(HAVE_KRB5)])
|
||||
fi
|
||||
|
||||
##################################################################
|
||||
# we might need the k5crypto and com_err libraries on some systems
|
||||
AC_CHECK_LIB(k5crypto, krb5_encrypt_data)
|
||||
AC_CHECK_LIB(com_err, _et_list)
|
||||
|
||||
#################################################
|
||||
# check for automount support
|
||||
|
||||
Loading…
Reference in New Issue
Block a user