From d92beac5608716f2afe21dc1155f614dc7b2d55c Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 15 Mar 2001 01:25:51 +0000
Subject: [PATCH] * samba/configure.in: Use AC_CHECK_TOOL to find AR. *
 samba/Makefile.in: Remove useless rules, including defunct dependency
 tracking. Create libsamba.a from the object files.

---
 vfs/ChangeLog          |  6 +++++
 vfs/samba/Makefile.in  | 54 +++++++-----------------------------------
 vfs/samba/configure.in |  1 +
 3 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 45cb49fea..7d14eb0e0 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-14  Pavel Roskin  <proski@gnu.org>
+
+	* samba/configure.in: Use AC_CHECK_TOOL to find AR.
+	* samba/Makefile.in: Remove useless rules, including defunct
+	dependency tracking. Create libsamba.a from the object files.
+
 2001-03-07  Pavel Roskin  <proski@gnu.org>
 
 	* cpio.c (cpio_skip_padding): Warning fix.
diff --git a/vfs/samba/Makefile.in b/vfs/samba/Makefile.in
index 4ad0acbc0..ad71a8b67 100644
--- a/vfs/samba/Makefile.in
+++ b/vfs/samba/Makefile.in
@@ -12,13 +12,14 @@ CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
 LDFLAGS=@LDFLAGS@
 AWK=@AWK@
+AR=@AR@
 
 INSTALLCMD=@INSTALL@
 
 VPATH=@srcdir@
 srcdir=@srcdir@
 builddir=@builddir@
-SHELL=/bin/sh
+SHELL=@SHELL@
 
 BASEDIR= @prefix@
 BINDIR = @bindir@
@@ -109,21 +110,11 @@ SAMBAFILES=			\
 	libsmb/nterr.o 	\
 	libsmb/smberr.o
 
-LIB_OBJ = lib/charcnv.o lib/charset.o lib/debug.o lib/fault.o \
-          lib/getsmbpass.o lib/interface.o lib/kanji.o lib/md4.o \
-          lib/netmask.o lib/pidfile.o lib/replace.o \
-          lib/signal.o lib/slprintf.o lib/system.o lib/doscalls.o lib/time.o \
-	  lib/ufc.o lib/genrand.o lib/username.o lib/access.o lib/smbrun.o \
-	  lib/bitmap.o lib/crc32.o lib/snprintf.o \
-	  lib/util_str.o lib/util_sid.o \
-	  lib/util_unistr.o lib/util_file.o \
-	  lib/util.o lib/util_sock.o lib/util_sec.o smbd/ssl.o
-
 ######################################################################
 # now the rules...
 ######################################################################
 
-all : CHECK $(SAMBAFILES)
+all : CHECK libsamba.a
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -139,27 +130,16 @@ MAKEDIR = || exec false; \
 	  mkdir "$$dir" || \
 	  exec false; fi || exec false
 
-# the lines below containing `@MAINT@' are for atomatic dependency tracking
-# they will only work with GNU make, gcc and --enable-maintainer-mode
-# without --enable-maintainer-mode, they do nothing
-.c.o: @MAINT@ .deps/.dummy
+libsamba.a: $(SAMBAFILES)
+	$(AR) cr libsamba.a $(SAMBAFILES)
+
+.c.o:
 	@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
 	 dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
-@MAINT@	@if (: >> .deps/$@ || : > .deps/$@) >/dev/null 2>&1; then :; \
-@MAINT@	 else dir=.deps/`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` \
-@MAINT@	      $(MAKEDIR); fi; rm -f .deps/$@ .deps/$@d
 	@echo Compiling $*.c
 	@$(CC) -I. -I$(srcdir) $(FLAGS) -c $< \
-	  -o $@ @MAINT@ -Wp,-MD,.deps/$@
+	  -o $@
 @BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
-@MAINT@	@sed 's|^'`echo $@ | sed 's,.*/,,'`':|$@:|' \
-@MAINT@	  <.deps/$@ >.deps/$@d && \
-@MAINT@	rm -f .deps/$@ && : >.deps/.stamp
-
-bin/.dummy:
-	@if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \
-	  dir=bin $(MAKEDIR); fi
-	@: >> $@ || : > $@ # what a fancy emoticon!
 
 install:
 
@@ -175,13 +155,12 @@ ctags:
 	ctags `find . -name "*.[ch]"`
 
 realclean: clean
-	-rm -f config.log bin/.dummy
+	-rm -f config.log
 	-rmdir bin
 
 distclean: realclean
 	-rm -f include/config.h include/stamp-h Makefile
 	-rm -f config.status config.cache so_locations
-	-rm -rf .deps
 
 #
 # This target is for documenation updators. It regenerates
@@ -229,18 +208,3 @@ $(srcdir)/include/config.h.in: $(srcdir)/include/stamp-h.in
 $(srcdir)/include/stamp-h.in: @MAINT@ $(srcdir)/acconfig.h $(srcdir)/configure.in
 	cd $(srcdir) && $(AUTOHEADER)
 	@date -u > $@
-
-# automatic dependency tracking rules
-.deps/.dummy:
-	@if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \
-	  dir=.deps $(MAKEDIR); fi
-	@: >> $@ || : > $@ # what a fancy emoticon!
-
-.deps/.stamp: .deps/.dummy
-	@:
-
-.deps/depend: .deps/.stamp
-	@echo Updating dependencies
-	@: | cat `find .deps -type f -name \*d` >$@ 2>/dev/null || true
-
-@MAINT@-include .deps/depend
diff --git a/vfs/samba/configure.in b/vfs/samba/configure.in
index a43bcdb18..f5c7eb8e5 100644
--- a/vfs/samba/configure.in
+++ b/vfs/samba/configure.in
@@ -20,6 +20,7 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_AWK
+AC_CHECK_TOOL(AR, ar, ar)
 
 dnl Check if C compiler understands -c and -o at the same time
 AC_PROG_CC_C_O