r2567: 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.

diff --git a/examples/auth/Makefile b/examples/auth/Makefile
index dac28fdd40a9bfe3a4c310d16a24d81b4eb46f0b..21d18de0758bab98495e802ee8b6b1019c5b070d 100644 (file)
--- 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 a53cd5d5e2d8061846f07feb1cdfc94d1736f054..5c0eb6fc8083bae5c0608157fd1617a72f3cae20 100644 (file)
--- 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/source/autogen.sh b/source/autogen.sh
index 922cad8e6139ec1f798fd83ded62bde117b379e4..e8160d2173149a9f8dc4988cea614b635f0c946a 100755 (executable)
--- a/source/autogen.sh
+++ b/source/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