[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  6e7d39f... s3: Another non-gnumake fix
      from  7eff96c... s3: Factor out compiler-independent defines

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


- Log -----------------------------------------------------------------
commit 6e7d39f4dd29d090244a51df9f59a42d7cb060d5
Author: Volker Lendecke <vl at samba.org>
Date:   Sun May 23 11:44:30 2010 +0200

    s3: Another non-gnumake fix
    
    AC_OUTPUT_COMMANDS must be called before AC_OUTPUT and
    $MAKEFILE is not defined in ./config.status

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

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


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 885b086..8edb86a 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6759,6 +6759,13 @@ AC_SUBST(SMBD_LIBS)
 CFLAGS="${CFLAGS} \$(FLAGS)"
 CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
 
+# If we had to expand the includes, make tsure the output file is moved back
+AC_OUTPUT_COMMANDS([
+if test -f Makefile-noincludes -a ! -f Makefile -a ! -h Makefile ; then
+	ln -s Makefile-noincludes Makefile
+fi
+])
+
 AC_SUBST(MAKEFILE)
 if test x$samba_cv_gnu_make = xyes; then
 	MAKEFILE=Makefile
@@ -6779,12 +6786,6 @@ AC_OUTPUT($MAKEFILE
 	  pkgconfig/smbsharemodes.pc
 	  ../examples/libsmbclient/Makefile.internal
 	  )
-dnl If we had to expand the includes, make tsure the output file is moved back
-AC_OUTPUT_COMMANDS([
-if test x$MAKEFILE != Makefile; then
-	mv $MAKEFILE Makefile
-fi
-])
 
 #################################################
 # Print very concise instructions on building/use


-- 
Samba Shared Repository