diff options
| author | Gerald Carter <jerry@samba.org> | 2004-09-23 18:11:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:46 -0500 |
| commit | 80d591f8cc62d513eb99112e6533b93ee901d27d (patch) | |
| tree | 68ce59d0de89fe0afb359be79c73de77997d6d98 | |
| parent | d3b2921a8fd86beb77eae45ef9cf1a846a93b199 (diff) | |
| download | samba-80d591f8cc62d513eb99112e6533b93ee901d27d.tar.gz samba-80d591f8cc62d513eb99112e6533b93ee901d27d.tar.xz samba-80d591f8cc62d513eb99112e6533b93ee901d27d.zip | |
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.
| -rw-r--r-- | examples/auth/Makefile | 4 | ||||
| -rw-r--r-- | examples/pdb/Makefile | 4 | ||||
| -rwxr-xr-x | source/autogen.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/auth/Makefile b/examples/auth/Makefile index dac28fdd40a..21d18de0758 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 a53cd5d5e2d..5c0eb6fc808 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/source/autogen.sh b/source/autogen.sh index 922cad8e613..e8160d21731 100755 --- 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 |