diff options
| author | cvs2svn Import User <samba-bugs@samba.org> | 2003-07-11 14:23:46 +0000 |
|---|---|---|
| committer | cvs2svn Import User <samba-bugs@samba.org> | 2003-07-11 14:23:46 +0000 |
| commit | 68a826033569bf38c8710152f30ae1e9112829b8 (patch) | |
| tree | 87e4b86d666c46277b7c04721ec84feb922f40fa | |
| parent | 3fbef9f51c5b3741c53752834352db04e1c2660d (diff) | |
| parent | 142c54ca924bd854e7d840c2a67692c9f61ee396 (diff) | |
| download | samba-68a826033569bf38c8710152f30ae1e9112829b8.tar.gz | |
This commit was manufactured by cvs2svn to create tagsamba-misc-tags/HEAD_PRE_3_0_0_BETA_3_MERGE
'HEAD_PRE_3_0_0_BETA_3_MERGE'.
| -rw-r--r-- | source/Makefile.in | 11 | ||||
| -rwxr-xr-x | source/autogen.sh | 6 | ||||
| -rw-r--r-- | source/configure.in | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/source/Makefile.in b/source/Makefile.in index 5fa3018c696..c81fdd4a832 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -18,8 +18,8 @@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ EXEEXT=@EXEEXT@ LDFLAGS=@LDFLAGS@ -LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ @CFLAGS@ -WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ @CFLAGS@ +LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ +WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ AWK=@AWK@ DYNEXP=@DYNEXP@ PYTHON=@PYTHON@ @@ -626,7 +626,12 @@ NTLM_AUTH_OBJ = utils/ntlm_auth.o $(LIBNTLMSSP_OBJ) $(LIBSAMBA_OBJ) $(POPT_LIB_O ###################################################################### # now the rules... ###################################################################### -all : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(SHLIBS) \ +all: + @echo The Samba HEAD branch is deprecated pending the release of Samba 3.0 + @echo Please use the SAMBA_3_0 branch + @exit 1 + +all_real : SHOWFLAGS proto_exists $(SBIN_PROGS) $(BIN_PROGS) $(SHLIBS) \ $(MODULES) @EXTRA_ALL_TARGETS@ pam_smbpass : SHOWFLAGS bin/pam_smbpass.@SHLIBEXT@ diff --git a/source/autogen.sh b/source/autogen.sh index 2d91173f4a8..056c0e6133b 100755 --- a/source/autogen.sh +++ b/source/autogen.sh @@ -1,5 +1,11 @@ #!/bin/sh +echo The Samba HEAD branch is deprecated pending the release of Samba 3.0 +echo Please use the SAMBA_3_0 branch +echo to update to SAMBA_3_0 use this command: +echo " cvs -z3 update -r SAMBA_3_0 -dP" +exit 1 + # Run this script to build samba from CVS. ## insert all possible names (only works with diff --git a/source/configure.in b/source/configure.in index 93cbb0a871b..533757aab83 100644 --- a/source/configure.in +++ b/source/configure.in @@ -910,7 +910,7 @@ BLDSHARED="false" HOST_OS="$host_os" LDSHFLAGS="-shared" SONAMEFLAG="#" -SHLD="\${CC}" +SHLD="\${CC} \${CFLAGS}" PICFLAG="" PICSUFFIX="po" POBAD_CC="#" |