diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-10-17 13:17:45 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-26 14:13:09 +0100 |
commit | ac3dfbc4a44ef3a7aa72343dacfb37d45f1640a9 (patch) | |
tree | c51da1a227c8a9a430bef1bf0de295a03ec39d74 | |
parent | c984359e4ada98274854f1be1f45cea03490c698 (diff) | |
download | ptxdist-ac3dfbc4a44ef3a7aa72343dacfb37d45f1640a9.tar.gz ptxdist-ac3dfbc4a44ef3a7aa72343dacfb37d45f1640a9.tar.xz |
[samba] use automatic autogen instead of autogen patch
use own autogen.sh and call it from the right directory.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/samba-3.0.35/0008-configure-autoreconf-i-f-I-lib-replace.patch | 1396 | ||||
-rwxr-xr-x | patches/samba-3.0.35/autogen.sh | 4 | ||||
-rw-r--r-- | patches/samba-3.0.35/series | 1 |
3 files changed, 4 insertions, 1397 deletions
diff --git a/patches/samba-3.0.35/0008-configure-autoreconf-i-f-I-lib-replace.patch b/patches/samba-3.0.35/0008-configure-autoreconf-i-f-I-lib-replace.patch deleted file mode 100644 index 6857a9e56..000000000 --- a/patches/samba-3.0.35/0008-configure-autoreconf-i-f-I-lib-replace.patch +++ /dev/null @@ -1,1396 +0,0 @@ -From 559fef6746e085d3f80879f64c261e2e3eb64912 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Tue, 7 Jul 2009 18:02:43 +0200 -Subject: [PATCH 8/8] [configure] autoreconf -i -f -I lib/replace - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - source/configure | 1168 +++++++++++++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 1067 insertions(+), 101 deletions(-) - -diff --git a/source/configure b/source/configure -index 9e5558d..a7088d3 100755 ---- a/source/configure -+++ b/source/configure -@@ -11256,6 +11256,51 @@ else - fi - - -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+(void)sizeof(char[-1]) -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ { { $as_echo "$as_me:$LINENO: error: configure's compilation assert doesn't work with $CC" >&5 -+$as_echo "$as_me: error: configure's compilation assert doesn't work with $CC" >&2;} -+ { (exit 1); exit 1; }; } -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ - { $as_echo "$as_me:$LINENO: checking that the C compiler understands -Werror" >&5 - $as_echo_n "checking that the C compiler understands -Werror... " >&6; } - if test "${samba_cv_HAVE_Werror+set}" = set; then -@@ -11490,85 +11535,60 @@ fi - - { $as_echo "$as_me:$LINENO: checking that the C compiler understands negative enum values" >&5 - $as_echo_n "checking that the C compiler understands negative enum values... " >&6; } --if test "${SMB_BUILD_CC_NEGATIVE_ENUM_VALUES+set}" = set; then -+if test "${samba_cv_BUILD_CC_NEGATIVE_ENUM_VALUES+set}" = set; then - $as_echo_n "(cached) " >&6 - else - -- if test "$cross_compiling" = yes; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } --else -- cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - -- #include <stdio.h> -- enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF }; -- int main(void) { -- enum negative_values v1 = NEGATIVE_VALUE; -- unsigned v2 = NEGATIVE_VALUE; -- -- if (v1 != 0xFFFFFFFF) { -- printf("%u != 0xFFFFFFFF\n", v1); -- return 1; -- } -- if (v2 != 0xFFFFFFFF) { -- printf("%u != 0xFFFFFFFF\n", v2); -- return 1; -- } -+int -+main () -+{ - -- return 0; -- } -+ enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF }; -+ (void)sizeof(char[1-2*( (unsigned)NEGATIVE_VALUE != 0xFFFFFFFF)]); -+ (void)sizeof(char[1-2*((enum negative_values)NEGATIVE_VALUE != 0xFFFFFFFF)]); - -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ samba_cv_BUILD_CC_NEGATIVE_ENUM_VALUES=yes - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=no --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ samba_cv_BUILD_CC_NEGATIVE_ENUM_VALUES=no - fi - -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $SMB_BUILD_CC_NEGATIVE_ENUM_VALUES" >&5 --$as_echo "$SMB_BUILD_CC_NEGATIVE_ENUM_VALUES" >&6; } --if test x"$SMB_BUILD_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then -+{ $as_echo "$as_me:$LINENO: result: $samba_cv_BUILD_CC_NEGATIVE_ENUM_VALUES" >&5 -+$as_echo "$samba_cv_BUILD_CC_NEGATIVE_ENUM_VALUES" >&6; } -+if test x"$samba_cv_BUILD_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then - { $as_echo "$as_me:$LINENO: WARNING: using --unit-enums for pidl" >&5 - $as_echo "$as_me: WARNING: using --unit-enums for pidl" >&2;} - PIDL_ARGS="$PIDL_ARGS --uint-enums" -@@ -12206,10 +12226,14 @@ $as_echo "$SINIX_LFS_SUPPORT" >&6; } - *linux*) - { $as_echo "$as_me:$LINENO: checking for LFS support" >&5 - $as_echo_n "checking for LFS support... " >&6; } -+if test "${samba_cv_LINUX_LFS_SUPPORT+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ - old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS" - if test "$cross_compiling" = yes; then -- LINUX_LFS_SUPPORT=cross -+ samba_cv_LINUX_LFS_SUPPORT=cross - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -12277,14 +12301,14 @@ $as_echo "$ac_try_echo") >&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- LINUX_LFS_SUPPORT=yes -+ samba_cv_LINUX_LFS_SUPPORT=yes - else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) --LINUX_LFS_SUPPORT=no -+samba_cv_LINUX_LFS_SUPPORT=no - fi - rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -@@ -12292,7 +12316,10 @@ fi - - - CPPFLAGS="$old_CPPFLAGS" -- if test x$LINUX_LFS_SUPPORT = xyes ; then -+fi -+{ $as_echo "$as_me:$LINENO: result: $samba_cv_LINUX_LFS_SUPPORT" >&5 -+$as_echo "$samba_cv_LINUX_LFS_SUPPORT" >&6; } -+ if test x$samba_cv_LINUX_LFS_SUPPORT = xyes ; then - CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS" - - cat >>confdefs.h <<\_ACEOF -@@ -12310,8 +12337,6 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - fi -- { $as_echo "$as_me:$LINENO: result: $LINUX_LFS_SUPPORT" >&5 --$as_echo "$LINUX_LFS_SUPPORT" >&6; } - ;; - - # -@@ -37001,20 +37026,9 @@ case "$host_os" in - *linux*) - # glibc <= 2.3.2 has a broken getgrouplist - if test "$cross_compiling" = yes; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ linux_getgrouplist_ok=maybe - else - cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - - #include <unistd.h> - #include <sys/utsname.h> -@@ -37069,6 +37083,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$a - fi - - -+ - if test x"$linux_getgrouplist_ok" = x"yes"; then - - cat >>confdefs.h <<\_ACEOF -@@ -37076,6 +37091,13 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - fi -+ if test x"$linux_getgrouplist_ok" = x"maybe"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_GETGROUPLIST 1 -+_ACEOF -+ -+ fi - ;; - *) - -@@ -42998,23 +43020,308 @@ _ACEOF - fi - - --{ $as_echo "$as_me:$LINENO: checking for 64 bit time_t" >&5 --$as_echo_n "checking for 64 bit time_t... " >&6; } --if test "${samba_cv_SIZEOF_TIME_T+set}" = set; then -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:$LINENO: checking size of time_t" >&5 -+$as_echo_n "checking size of time_t... " >&6; } -+if test "${ac_cv_sizeof_time_t+set}" = set; then - $as_echo_n "(cached) " >&6 - else -+ if test "$cross_compiling" = yes; then -+ # Depending upon the size, compute the lo and hi bounds. -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) >= 0)]; -+test_array [0] = 0 - --if test "$cross_compiling" = yes; then -- samba_cv_SIZEOF_TIME_T=cross -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_lo=0 ac_mid=0 -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) <= $ac_mid)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=$ac_mid; break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_lo=`expr $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) < 0)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=-1 ac_mid=-1 -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) >= $ac_mid)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_lo=$ac_mid; break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_hi=`expr '(' $ac_mid ')' - 1` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done - else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_lo= ac_hi= -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+# Binary search between lo and hi bounds. -+while test "x$ac_lo" != "x$ac_hi"; do -+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <time.h> --main() { exit((sizeof(time_t) == 8) ? 0 : 1); } -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) <= $ac_mid)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=$ac_mid -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_lo=`expr '(' $ac_mid ')' + 1` -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+case $ac_lo in -+?*) ac_cv_sizeof_time_t=$ac_lo;; -+'') if test "$ac_cv_type_time_t" = yes; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (time_t) -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot compute sizeof (time_t) -+See \`config.log' for more details." >&2;} -+ { (exit 77); exit 77; }; }; } -+ else -+ ac_cv_sizeof_time_t=0 -+ fi ;; -+esac -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+static long int longval () { return (long int) (sizeof (time_t)); } -+static unsigned long int ulongval () { return (long int) (sizeof (time_t)); } -+#include <stdio.h> -+#include <stdlib.h> -+int -+main () -+{ -+ -+ FILE *f = fopen ("conftest.val", "w"); -+ if (! f) -+ return 1; -+ if (((long int) (sizeof (time_t))) < 0) -+ { -+ long int i = longval (); -+ if (i != ((long int) (sizeof (time_t)))) -+ return 1; -+ fprintf (f, "%ld", i); -+ } -+ else -+ { -+ unsigned long int i = ulongval (); -+ if (i != ((long int) (sizeof (time_t)))) -+ return 1; -+ fprintf (f, "%lu", i); -+ } -+ /* Do not output a trailing newline, as this causes \r\n confusion -+ on some platforms. */ -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} - _ACEOF - rm -f conftest$ac_exeext - if { (ac_try="$ac_link" -@@ -43038,20 +43345,51 @@ $as_echo "$ac_try_echo") >&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- samba_cv_SIZEOF_TIME_T=yes -+ ac_cv_sizeof_time_t=`cat conftest.val` - else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) --samba_cv_SIZEOF_TIME_T=no -+if test "$ac_cv_type_time_t" = yes; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (time_t) -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot compute sizeof (time_t) -+See \`config.log' for more details." >&2;} -+ { (exit 77); exit 77; }; }; } -+ else -+ ac_cv_sizeof_time_t=0 -+ fi - fi - rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+rm -f conftest.val -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_time_t" >&5 -+$as_echo "$ac_cv_sizeof_time_t" >&6; } -+ - - -+cat >>confdefs.h <<_ACEOF -+#define SIZEOF_TIME_T $ac_cv_sizeof_time_t -+_ACEOF -+ -+ -+{ $as_echo "$as_me:$LINENO: checking for 64 bit time_t" >&5 -+$as_echo_n "checking for 64 bit time_t... " >&6; } -+if test "${samba_cv_SIZEOF_TIME_T+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ -+if test $ac_cv_sizeof_time_t -eq 8; then -+ samba_cv_SIZEOF_TIME_T=yes -+else -+ samba_cv_SIZEOF_TIME_T=no -+fi - fi - { $as_echo "$as_me:$LINENO: result: $samba_cv_SIZEOF_TIME_T" >&5 - $as_echo "$samba_cv_SIZEOF_TIME_T" >&6; } -@@ -43063,24 +43401,309 @@ _ACEOF - - fi - --{ $as_echo "$as_me:$LINENO: checking for 64 bit off_t" >&5 --$as_echo_n "checking for 64 bit off_t... " >&6; } --if test "${samba_cv_SIZEOF_OFF_T+set}" = set; then -+ -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:$LINENO: checking size of off_t" >&5 -+$as_echo_n "checking size of off_t... " >&6; } -+if test "${ac_cv_sizeof_off_t+set}" = set; then - $as_echo_n "(cached) " >&6 - else -+ if test "$cross_compiling" = yes; then -+ # Depending upon the size, compute the lo and hi bounds. -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= 0)]; -+test_array [0] = 0 - --if test "$cross_compiling" = yes; then -- samba_cv_SIZEOF_OFF_T=cross -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_lo=0 ac_mid=0 -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=$ac_mid; break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_lo=`expr $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) < 0)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=-1 ac_mid=-1 -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= $ac_mid)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_lo=$ac_mid; break - else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_hi=`expr '(' $ac_mid ')' - 1` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_lo= ac_hi= -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+# Binary search between lo and hi bounds. -+while test "x$ac_lo" != "x$ac_hi"; do -+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=$ac_mid -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_lo=`expr '(' $ac_mid ')' + 1` -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+case $ac_lo in -+?*) ac_cv_sizeof_off_t=$ac_lo;; -+'') if test "$ac_cv_type_off_t" = yes; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t) -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot compute sizeof (off_t) -+See \`config.log' for more details." >&2;} -+ { (exit 77); exit 77; }; }; } -+ else -+ ac_cv_sizeof_off_t=0 -+ fi ;; -+esac -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+static long int longval () { return (long int) (sizeof (off_t)); } -+static unsigned long int ulongval () { return (long int) (sizeof (off_t)); } - #include <stdio.h> --#include <sys/stat.h> --main() { exit((sizeof(off_t) == 8) ? 0 : 1); } -+#include <stdlib.h> -+int -+main () -+{ -+ -+ FILE *f = fopen ("conftest.val", "w"); -+ if (! f) -+ return 1; -+ if (((long int) (sizeof (off_t))) < 0) -+ { -+ long int i = longval (); -+ if (i != ((long int) (sizeof (off_t)))) -+ return 1; -+ fprintf (f, "%ld", i); -+ } -+ else -+ { -+ unsigned long int i = ulongval (); -+ if (i != ((long int) (sizeof (off_t)))) -+ return 1; -+ fprintf (f, "%lu", i); -+ } -+ /* Do not output a trailing newline, as this causes \r\n confusion -+ on some platforms. */ -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} - _ACEOF - rm -f conftest$ac_exeext - if { (ac_try="$ac_link" -@@ -43104,20 +43727,52 @@ $as_echo "$ac_try_echo") >&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- samba_cv_SIZEOF_OFF_T=yes -+ ac_cv_sizeof_off_t=`cat conftest.val` - else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) --samba_cv_SIZEOF_OFF_T=no -+if test "$ac_cv_type_off_t" = yes; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t) -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot compute sizeof (off_t) -+See \`config.log' for more details." >&2;} -+ { (exit 77); exit 77; }; }; } -+ else -+ ac_cv_sizeof_off_t=0 -+ fi - fi - rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+rm -f conftest.val -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5 -+$as_echo "$ac_cv_sizeof_off_t" >&6; } -+ -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define SIZEOF_OFF_T $ac_cv_sizeof_off_t -+_ACEOF - - -+{ $as_echo "$as_me:$LINENO: checking for 64 bit off_t" >&5 -+$as_echo_n "checking for 64 bit off_t... " >&6; } -+if test "${samba_cv_SIZEOF_OFF_T+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ -+if test $ac_cv_sizeof_off_t -eq 8; then -+ samba_cv_SIZEOF_OFF_T=yes -+else -+ samba_cv_SIZEOF_OFF_T=no -+fi -+ - fi - { $as_echo "$as_me:$LINENO: result: $samba_cv_SIZEOF_OFF_T" >&5 - $as_echo "$samba_cv_SIZEOF_OFF_T" >&6; } -@@ -43339,28 +43994,308 @@ _ACEOF - - fi - --{ $as_echo "$as_me:$LINENO: checking for 64 bit dev_t" >&5 --$as_echo_n "checking for 64 bit dev_t... " >&6; } --if test "${samba_cv_SIZEOF_DEV_T+set}" = set; then -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:$LINENO: checking size of dev_t" >&5 -+$as_echo_n "checking size of dev_t... " >&6; } -+if test "${ac_cv_sizeof_dev_t+set}" = set; then - $as_echo_n "(cached) " >&6 - else -+ if test "$cross_compiling" = yes; then -+ # Depending upon the size, compute the lo and hi bounds. -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (dev_t))) >= 0)]; -+test_array [0] = 0 - --if test "$cross_compiling" = yes; then -- samba_cv_SIZEOF_DEV_T=cross -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_lo=0 ac_mid=0 -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (dev_t))) <= $ac_mid)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=$ac_mid; break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_lo=`expr $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (dev_t))) < 0)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=-1 ac_mid=-1 -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (dev_t))) >= $ac_mid)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_lo=$ac_mid; break - else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_hi=`expr '(' $ac_mid ')' - 1` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_lo= ac_hi= -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+# Binary search between lo and hi bounds. -+while test "x$ac_lo" != "x$ac_hi"; do -+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long int) (sizeof (dev_t))) <= $ac_mid)]; -+test_array [0] = 0 - --#if defined(HAVE_UNISTD_H) --#include <unistd.h> --#endif -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_hi=$ac_mid -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_lo=`expr '(' $ac_mid ')' + 1` -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+case $ac_lo in -+?*) ac_cv_sizeof_dev_t=$ac_lo;; -+'') if test "$ac_cv_type_dev_t" = yes; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (dev_t) -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot compute sizeof (dev_t) -+See \`config.log' for more details." >&2;} -+ { (exit 77); exit 77; }; }; } -+ else -+ ac_cv_sizeof_dev_t=0 -+ fi ;; -+esac -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+static long int longval () { return (long int) (sizeof (dev_t)); } -+static unsigned long int ulongval () { return (long int) (sizeof (dev_t)); } - #include <stdio.h> --#include <sys/stat.h> --main() { exit((sizeof(dev_t) == 8) ? 0 : 1); } -+#include <stdlib.h> -+int -+main () -+{ -+ -+ FILE *f = fopen ("conftest.val", "w"); -+ if (! f) -+ return 1; -+ if (((long int) (sizeof (dev_t))) < 0) -+ { -+ long int i = longval (); -+ if (i != ((long int) (sizeof (dev_t)))) -+ return 1; -+ fprintf (f, "%ld", i); -+ } -+ else -+ { -+ unsigned long int i = ulongval (); -+ if (i != ((long int) (sizeof (dev_t)))) -+ return 1; -+ fprintf (f, "%lu", i); -+ } -+ /* Do not output a trailing newline, as this causes \r\n confusion -+ on some platforms. */ -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} - _ACEOF - rm -f conftest$ac_exeext - if { (ac_try="$ac_link" -@@ -43384,20 +44319,51 @@ $as_echo "$ac_try_echo") >&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- samba_cv_SIZEOF_DEV_T=yes -+ ac_cv_sizeof_dev_t=`cat conftest.val` - else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) --samba_cv_SIZEOF_DEV_T=no -+if test "$ac_cv_type_dev_t" = yes; then -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (dev_t) -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: cannot compute sizeof (dev_t) -+See \`config.log' for more details." >&2;} -+ { (exit 77); exit 77; }; }; } -+ else -+ ac_cv_sizeof_dev_t=0 -+ fi - fi - rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+rm -f conftest.val -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_dev_t" >&5 -+$as_echo "$ac_cv_sizeof_dev_t" >&6; } -+ -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define SIZEOF_DEV_T $ac_cv_sizeof_dev_t -+_ACEOF - - -+{ $as_echo "$as_me:$LINENO: checking for 64 bit dev_t" >&5 -+$as_echo_n "checking for 64 bit dev_t... " >&6; } -+if test "${samba_cv_SIZEOF_DEV_T+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ -+if test $ac_cv_sizeof_dev_t -eq 8; then -+ samba_cv_SIZEOF_DEV_T=yes -+else -+ samba_cv_SIZEOF_DEV_T=no -+fi - fi - { $as_echo "$as_me:$LINENO: result: $samba_cv_SIZEOF_DEV_T" >&5 - $as_echo "$samba_cv_SIZEOF_DEV_T" >&6; } --- -1.6.3.3 - diff --git a/patches/samba-3.0.35/autogen.sh b/patches/samba-3.0.35/autogen.sh new file mode 100755 index 000000000..a1333120a --- /dev/null +++ b/patches/samba-3.0.35/autogen.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +cd source && ./autogen.sh + diff --git a/patches/samba-3.0.35/series b/patches/samba-3.0.35/series index d0d0a028e..5eb490721 100644 --- a/patches/samba-3.0.35/series +++ b/patches/samba-3.0.35/series @@ -5,4 +5,3 @@ 0005-configure.in-fix-time_t-detection.patch 0006-configure.in-fix-off_t-test.patch 0007-configure.in-fix-dev_t-test.patch -0008-configure-autoreconf-i-f-I-lib-replace.patch |