[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  6b430b4... s3:build: remove redundant qnx block size definition (cherry picked from commit a2929a638fa6824e38beec7eaa78ac108c522f50)
       via  6ba6370... s3:build: fix shared library build on QNX
      from  e7e66fd... s3:auth: Fix typo in debug message.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 6b430b4fd88eb033098366f9a6b204c55ca7f79e
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Dec 3 00:12:53 2009 +0100

    s3:build: remove redundant qnx block size definition
    (cherry picked from commit a2929a638fa6824e38beec7eaa78ac108c522f50)
    
    Part of a fix for bug #6860.

commit 6ba6370c9f8d76a59b6a59f6e083c109eb5fba53
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Dec 3 00:02:44 2009 +0100

    s3:build: fix shared library build on QNX
    
    Fixes #6860. Thanks to Matt Kraai!
    (cherry picked from commit 1d013fd03295433698f2b301dbf8324a3db528eb)

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 705aa9b..1034509 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1524,9 +1524,10 @@ DSO_EXPORTS=""
 
   # and these are for particular systems
   case "$host_os" in
-		*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-			case "$host_os" in *linux*)
-				AC_DEFINE(LINUX,1,[Whether the host os is linux]) ;;
+		*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
+			case "$host_os" in
+				*linux*) AC_DEFINE(LINUX,1,[Whether the host os is linux]) ;;
+				*qnx*) AC_DEFINE(QNX,1,[Whether the host os is qnx]) ;;
 			esac
 			BLDSHARED="true"
 			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
@@ -1640,9 +1641,6 @@ DSO_EXPORTS=""
 			AC_DEFINE(STAT_ST_BLOCKSIZE,8192,[The size of a block])
 			AC_DEFINE(POSIX_ACL_NEEDS_MASK,1,[Does a POSIX ACL need a mask element])
 			;;
-		*qnx*) AC_DEFINE(QNX,1,[Whether the host os is qnx])
-			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-			;;
 		*osf*) AC_DEFINE(OSF1,1,[Whether the host os is osf1])
 			BLDSHARED="true"
 			LDSHFLAGS="-shared"


-- 
Samba Shared Repository