summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/auth/Makefile4
-rw-r--r--examples/pdb/Makefile4
-rwxr-xr-xsource3/autogen.sh4
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/auth/Makefile b/examples/auth/Makefile
index dac28fdd40..21d18de075 100644
--- a/examples/auth/Makefile
+++ b/examples/auth/Makefile
@@ -18,10 +18,10 @@ default: $(AUTH_OBJS)
# 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
diff --git a/examples/pdb/Makefile b/examples/pdb/Makefile
index a53cd5d5e2..5c0eb6fc80 100644
--- a/examples/pdb/Makefile
+++ b/examples/pdb/Makefile
@@ -18,10 +18,10 @@ default: $(PDB_OBJS)
# 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
diff --git a/source3/autogen.sh b/source3/autogen.sh
index 922cad8e61..e8160d2173 100755
--- a/source3/autogen.sh
+++ b/source3/autogen.sh
@@ -16,7 +16,7 @@ AUTOCONFFOUND="0"
##
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 @@ done
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