svn commit: samba r2568 - in trunk: examples/auth examples/pdb
source
jerry at samba.org
jerry at samba.org
Thu Sep 23 18:13:31 GMT 2004
Author: jerry
Date: 2004-09-23 18:13:31 +0000 (Thu, 23 Sep 2004)
New Revision: 2568
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk&rev=2568&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:
trunk/examples/auth/Makefile
trunk/examples/pdb/Makefile
trunk/source/autogen.sh
Changeset:
Modified: trunk/examples/auth/Makefile
===================================================================
--- trunk/examples/auth/Makefile 2004-09-23 18:11:08 UTC (rev 2567)
+++ trunk/examples/auth/Makefile 2004-09-23 18:13:31 UTC (rev 2568)
@@ -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: trunk/examples/pdb/Makefile
===================================================================
--- trunk/examples/pdb/Makefile 2004-09-23 18:11:08 UTC (rev 2567)
+++ trunk/examples/pdb/Makefile 2004-09-23 18:13:31 UTC (rev 2568)
@@ -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: trunk/source/autogen.sh
===================================================================
--- trunk/source/autogen.sh 2004-09-23 18:11:08 UTC (rev 2567)
+++ trunk/source/autogen.sh 2004-09-23 18:13:31 UTC (rev 2568)
@@ -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
More information about the samba-cvs
mailing list