backout use of USE_INC_LIBTOOL_VER. libtool13 is marked as

DEPRECATED.  libtool15 is incompatible, and I couldn't find
how to build and install static libs by libtool15.

Suggensted by:	Angelo Turetta <aturetta@commit.it>
This commit is contained in:
Hajimu UMEMOTO 2005-02-26 20:23:15 +00:00
parent ef649b0c5e
commit acd5ef69f9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=129849
2 changed files with 33 additions and 1 deletions

View file

@ -41,7 +41,6 @@ MAN3= sasl.3 sasl_authorize_t.3 sasl_auxprop.3 \
MAN8= sasldblistusers2.8 saslpasswd2.8
USE_OPENSSL= yes
USE_INC_LIBTOOL_VER= 13
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \

View file

@ -0,0 +1,33 @@
Index: config/ltmain.sh
diff -u config/ltmain.sh.orig config/ltmain.sh
--- config/ltmain.sh.orig Wed Jul 2 22:29:00 2003
+++ config/ltmain.sh Wed Jul 16 02:57:20 2003
@@ -1901,7 +1901,7 @@
deplib_matches=`eval \\$echo \"$library_names_spec\"`
set dummy $deplib_matches
deplib_match=$2
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "X$ldd_output" : "X.*$deplib_match"` -ne 0 ; then
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
@@ -1931,7 +1931,7 @@
deplib_matches=`eval \\$echo \"$library_names_spec\"`
set dummy $deplib_matches
deplib_match=$2
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "X$ldd_output" : "X.*$deplib_match"` -ne 0 ; then
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
@@ -3396,8 +3396,8 @@
# Install the pseudo-library for information purposes.
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
+ #$show "$install_prog $instname $destdir/$name"
+ #$run eval "$install_prog $instname $destdir/$name" || exit $?
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"