svn commit: samba r2567 - in branches/SAMBA_3_0: examples/auth examples/pdb source

[jerry at samba.org]

Author: jerry
Date: 2004-09-23 18:11:08 +0000 (Thu, 23 Sep 2004)
New Revision: 2567

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0&rev=2567&nolog=1

Log:
Patches from Lars Mueller <lmuelle at suse dot de>:

trivial fix for autoconf and autoheader versions with a
letter in the version string.  This happens in our current beta named
distribution tree.

trivial patch to fix the build with the upcoming libtool
version.  It will be mandatory to use --mode while using libtool.


Modified:
   branches/SAMBA_3_0/examples/auth/Makefile
   branches/SAMBA_3_0/examples/pdb/Makefile
   branches/SAMBA_3_0/source/autogen.sh


Changeset:
Modified: branches/SAMBA_3_0/examples/auth/Makefile
===================================================================
--- branches/SAMBA_3_0/examples/auth/Makefile	2004-09-23 15:21:02 UTC (rev 2566)
+++ branches/SAMBA_3_0/examples/auth/Makefile	2004-09-23 18:11:08 UTC (rev 2567)
@@ -18,10 +18,10 @@
 # Pattern rules
 
 %.so: %.lo
-	$(LIBTOOL) $(CC) -shared -o $@ $< $(LDFLAGS)
+	$(LIBTOOL) --mode=link $(CC) -shared -o $@ $< $(LDFLAGS)
 
 %.lo: %.c
-	$(LIBTOOL) $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 # Misc targets
 

Modified: branches/SAMBA_3_0/examples/pdb/Makefile
===================================================================
--- branches/SAMBA_3_0/examples/pdb/Makefile	2004-09-23 15:21:02 UTC (rev 2566)
+++ branches/SAMBA_3_0/examples/pdb/Makefile	2004-09-23 18:11:08 UTC (rev 2567)
@@ -18,10 +18,10 @@
 # Pattern rules
 
 %.so: %.lo
-	$(LIBTOOL) $(CC) -shared -o $@ $< $(LDFLAGS)
+	$(LIBTOOL) --mode=link $(CC) -shared -o $@ $< $(LDFLAGS)
 
 %.lo: %.c
-	$(LIBTOOL) $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
+	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 # Misc targets
 

Modified: branches/SAMBA_3_0/source/autogen.sh
===================================================================
--- branches/SAMBA_3_0/source/autogen.sh	2004-09-23 15:21:02 UTC (rev 2566)
+++ branches/SAMBA_3_0/source/autogen.sh	2004-09-23 18:11:08 UTC (rev 2567)
@@ -16,7 +16,7 @@
 ##
 for i in $TESTAUTOHEADER; do
 	if which $i > /dev/null 2>&1; then
-		if [ `$i --version | head -n 1 | cut -d.  -f 2` -ge 53 ]; then
+		if [ `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53 ]; then
 			AUTOHEADER=$i
 			AUTOHEADERFOUND="1"
 			break
@@ -30,7 +30,7 @@
 
 for i in $TESTAUTOCONF; do
 	if which $i > /dev/null 2>&1; then
-		if [ `$i --version | head -n 1 | cut -d.  -f 2` -ge 53 ]; then
+		if [ `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53 ]; then
 			AUTOCONF=$i
 			AUTOCONFFOUND="1"
 			break