diff options
Diffstat (limited to 'source3/configure')
| -rwxr-xr-x | source3/configure | 50 |
1 files changed, 9 insertions, 41 deletions
diff --git a/source3/configure b/source3/configure index fb22050466..1f0fed572a 100755 --- a/source3/configure +++ b/source3/configure @@ -862,7 +862,6 @@ Optional Packages: --with-smbmount Include smbmount (Linux only) support (default=no) --with-pam Include PAM support (default=no) --with-pam_smbpass Build a PAM module to allow other applications to use our smbpasswd file (default=no) - --with-sam Build new (experimental) SAM database (default=no) --with-ldapsam Include LDAP SAM 2.2 compatible configuration (default=no) --with-tdbsam Include experimental TDB SAM support (default=no) --with-nisplussam Include NISPLUS SAM support (default=no) @@ -11128,7 +11127,7 @@ _ACEOF fi ############################################### -# test for where we get yp_get_default_domain() from +# test for where we get get_yp_default_domain() from for ac_func in yp_get_default_domain do @@ -21526,7 +21525,7 @@ fi if test "x$no_mysql" = x ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - MODULE_MYSQL=bin/mysql.so + MODULE_MYSQL=bin/pdb_mysql.so else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -21826,7 +21825,7 @@ fi if test "x$no_xml" = x ; then echo "$as_me:$LINENO: result: yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&5 echo "${ECHO_T}yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)" >&6 - MODULE_XML=bin/xml.so + MODULE_XML=bin/pdb_xml.so else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -22317,36 +22316,6 @@ _ACEOF fi fi -# New experimental SAM system - -echo "$as_me:$LINENO: checking whether to build the new (experimental) SAM database" >&5 -echo $ECHO_N "checking whether to build the new (experimental) SAM database... $ECHO_C" >&6 - -# Check whether --with-sam or --without-sam was given. -if test "${with_sam+set}" = set; then - withval="$with_sam" - case "$withval" in - yes) - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -cat >>confdefs.h <<\_ACEOF -#define WITH_SAM 1 -_ACEOF - - ;; - *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - -fi; - - ######################################################################################## ## ## TESTS FOR SAM BACKENDS. KEEP THESE GROUPED TOGETHER @@ -23791,7 +23760,6 @@ else #include "confdefs.h" \ #include <sys/types.h> -#include <unistd.h> #include <sys/socket.h> #include <sys/uio.h> #ifdef F77_DUMMY_MAIN @@ -23804,17 +23772,17 @@ int main () { \ - int fromfd, tofd, ret, total=0; + int fromfd, tofd; off_t offset, nwritten; struct sf_hdtr hdr; struct iovec hdtrl; - hdr.headers = &hdtrl; - hdr.hdr_cnt = 1; - hdr.trailers = NULL; - hdr.trl_cnt = 0; + hdr->headers = &hdtrl; + hdr->hdr_cnt = 1; + hdr->trailers = NULL; + hdr->trl_cnt = 0; hdtrl.iov_base = NULL; hdtrl.iov_len = 0; - ret = sendfile(fromfd, tofd, offset, total, &hdr, &nwritten, 0); + int ret = sendfile(fromfd, tofd, offset, total, &hdr, &nwritten, 0); ; return 0; |