Cosmetic fixups for large file support message.

(This used to be commit 671be482212634b9c1de40891032180fbc1d49ba)

2 files changed, 18 insertions, 22 deletions

diff --git a/source3/configure b/source3/configure
index dd76db650f..8248a92944 100755
--- a/source3/configure
+++ b/source3/configure
@@ -923,7 +923,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -1820,7 +1820,7 @@ for ac_kw in inline __inline__ __inline; do
 #include "confdefs.h"
 
 int main() {
-} $ac_kw foo() {
+} int $ac_kw foo() {
 ; return 0; }
 EOF
 if { (eval echo configure:1827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -2961,7 +2961,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x = {0,0};
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -3036,7 +3036,7 @@ for ac_kw in inline __inline__ __inline; do
 #include "confdefs.h"
 
 int main() {
-} $ac_kw foo() {
+} int $ac_kw foo() {
 ; return 0; }
 EOF
 if { (eval echo configure:3043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -11392,8 +11392,8 @@ fi
 # If we don't have all of these then disable large
 # file support.
 #
-echo $ac_n "checking checking if large file support can be enabled""... $ac_c" 1>&6
-echo "configure:11397: checking checking if large file support can be enabled" >&5
+echo $ac_n "checking if large file support can be enabled""... $ac_c" 1>&6
+echo "configure:11397: checking if large file support can be enabled" >&5
 cat > conftest.$ac_ext <<EOF
 #line 11399 "configure"
 #include "confdefs.h"
@@ -11419,14 +11419,12 @@ else
 fi
 rm -f conftest*
 if test x"$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" = x"yes"; then
-    echo "$ac_t""yes" 1>&6
     cat >> confdefs.h <<\EOF
 #define HAVE_EXPLICIT_LARGEFILE_SUPPORT 1
 EOF
 
-else
-    echo "$ac_t""no" 1>&6
 fi
+echo "$ac_t""$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" 1>&6
 
 # Check whether --with-spinlocks or --without-spinlocks was given.
 if test "${with_spinlocks+set}" = set; then
@@ -11475,7 +11473,7 @@ fi
 # check for POSIX ACL support
 
 echo $ac_n "checking whether to support POSIX ACLs""... $ac_c" 1>&6
-echo "configure:11479: checking whether to support POSIX ACLs" >&5
+echo "configure:11477: checking whether to support POSIX ACLs" >&5
 # Check whether --with-posix-acls or --without-posix-acls was given.
 if test "${with_posix_acls+set}" = set; then
   withval="$with_posix_acls"
@@ -11483,7 +11481,7 @@ if test "${with_posix_acls+set}" = set; then
   yes)
 
 	echo $ac_n "checking for acl_get_file in -lacl""... $ac_c" 1>&6
-echo "configure:11487: checking for acl_get_file in -lacl" >&5
+echo "configure:11485: 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
@@ -11491,7 +11489,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lacl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11495 "configure"
+#line 11493 "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
@@ -11502,7 +11500,7 @@ int main() {
 acl_get_file()
 ; return 0; }
 EOF
-if { (eval echo configure:11506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11504: \"$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
@@ -11530,13 +11528,13 @@ else
 fi
 
 echo $ac_n "checking for POSIX ACL support""... $ac_c" 1>&6
-echo "configure:11534: checking for POSIX ACL support" >&5
+echo "configure:11532: checking for POSIX 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 11540 "configure"
+#line 11538 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/acl.h>
@@ -11544,7 +11542,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:11548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   samba_cv_HAVE_POSIX_ACLS=yes
 else
@@ -11580,11 +11578,11 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 11584 "configure"
+#line 11582 "configure"
 #include "confdefs.h"
 #include "${srcdir-.}/tests/summary.c"
 EOF
-if { (eval echo configure:11588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "configure OK";
 else
diff --git a/source3/configure.in b/source3/configure.in
index 4b6119c9ef..c11268f343 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1885,7 +1885,7 @@ fi
 # If we don't have all of these then disable large
 # file support.
 #
-AC_MSG_CHECKING([checking if large file support can be enabled])
+AC_MSG_CHECKING([if large file support can be enabled])
 AC_TRY_COMPILE([
 #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
 #include <sys/types.h>
@@ -1896,11 +1896,9 @@ __COMPILE_ERROR_
 [int i],
 samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes,samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=no)
 if test x"$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" = x"yes"; then
-    AC_MSG_RESULT(yes)
     AC_DEFINE(HAVE_EXPLICIT_LARGEFILE_SUPPORT)
-else
-    AC_MSG_RESULT(no)
 fi
+AC_MSG_RESULT([$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT])
 
 AC_ARG_WITH(spinlocks, [  --with-spinlocks        use spin locks instead of fcntl locks ])
 if test "x$with_spinlocks" = "xyes"; then