[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-675-ga4cc3e2

[Michael Adam]

The branch, master has been updated
       via  a4cc3e253852794f477ef5d836537b50111d0e42 (commit)
       via  2dc8ce59b28d3a028551ac5087f31cf83d04e064 (commit)
      from  a087310b336bf1b6b2827b27d32071876c23f3a9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a4cc3e253852794f477ef5d836537b50111d0e42
Author: Michael Adam <ob...@samba.org>
Date:   Mon Mar 23 14:22:37 2009 +0100

    s3:build: prevent from setting "-O -g", check for $debug first.
    
    This makes configure actually behave as the comments describe.
    The reversal of order was introduced by mistake in
    90ea8ae9b1ed3b7ed1c93076517e026e629ea1aa
    
    Michael

commit 2dc8ce59b28d3a028551ac5087f31cf83d04e064
Author: Björn Jacke <b...@sernet.de>
Date:   Wed Mar 18 22:19:06 2009 +0100

    don't set -O twice
    
    Signed-off-by: Michael Adam <ob...@samba.org>

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

Summary of changes:
 source3/configure.in |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index cfc2473..5f1a5ef 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -152,13 +152,11 @@ AC_SUBST(NSCD_LIBS)
 # do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
 # if it has no value.  This prevent *very* large debug binaries from occurring
 # by default.
-if test "x$CFLAGS" = x; then
-  CFLAGS="-O"
-fi
 if test "x$debug" = "xyes" ; then
        CFLAGS="${CFLAGS} -g"
-else
-       CFLAGS="${CFLAGS} -O"
+fi
+if test "x$CFLAGS" = x; then
+  CFLAGS="-O"
 fi
 
 m4_include(../lib/socket_wrapper/config.m4)


-- 
Samba Shared Repository