Use libtool from ports

This commit is contained in:
Andrey A. Chernov 2004-06-14 03:21:58 +00:00
parent 8c4e950162
commit 300967d7b7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=111426
4 changed files with 98 additions and 4 deletions

View file

@ -20,6 +20,7 @@ MAN5= indexer.conf.5
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+=--enable-phrase \

View file

@ -1,6 +1,32 @@
--- configure.orig Tue Jun 17 13:35:22 2003
+++ configure Fri May 21 12:30:40 2004
@@ -5826,8 +5826,8 @@
+++ configure Mon Jun 14 07:09:11 2004
@@ -3176,13 +3176,14 @@
fi
rm -f confcache
+lt_aux_dir=${prefix}/share/libtool13
# Actually configure libtool. ac_aux_dir is where install-sh is found.
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+${CONFIG_SHELL-/bin/sh} $lt_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $lt_aux_dir/ltmain.sh $lt_target \
|| { { echo "$as_me:$LINENO: error: libtool configure failed" >&5
echo "$as_me: error: libtool configure failed" >&2;}
{ (exit 1); exit 1; }; }
@@ -3207,7 +3208,7 @@
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$lt_aux_dir/ltconfig $lt_aux_dir/ltmain.sh"
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -5826,8 +5827,8 @@
echo "$as_me:$LINENO: result: enabled" >&5
echo "${ECHO_T}enabled" >&6
@ -11,3 +37,23 @@
else
echo "$as_me:$LINENO: result: disabled" >&5
echo "${ECHO_T}disabled" >&6
@@ -7553,8 +7554,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+${CONFIG_SHELL-/bin/sh} $lt_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $lt_aux_dir/ltmain.sh $lt_target \
|| { { echo "$as_me:$LINENO: error: libtool configure failed" >&5
echo "$as_me: error: libtool configure failed" >&2;}
{ (exit 1); exit 1; }; }
@@ -7579,7 +7580,7 @@
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$lt_aux_dir/ltconfig $lt_aux_dir/ltmain.sh"
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'

View file

@ -20,6 +20,7 @@ MAN5= indexer.conf.5
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+=--enable-phrase \

View file

@ -1,6 +1,32 @@
--- configure.orig Tue Jun 17 13:35:22 2003
+++ configure Fri May 21 12:30:40 2004
@@ -5826,8 +5826,8 @@
+++ configure Mon Jun 14 07:09:11 2004
@@ -3176,13 +3176,14 @@
fi
rm -f confcache
+lt_aux_dir=${prefix}/share/libtool13
# Actually configure libtool. ac_aux_dir is where install-sh is found.
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+${CONFIG_SHELL-/bin/sh} $lt_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $lt_aux_dir/ltmain.sh $lt_target \
|| { { echo "$as_me:$LINENO: error: libtool configure failed" >&5
echo "$as_me: error: libtool configure failed" >&2;}
{ (exit 1); exit 1; }; }
@@ -3207,7 +3208,7 @@
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$lt_aux_dir/ltconfig $lt_aux_dir/ltmain.sh"
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -5826,8 +5827,8 @@
echo "$as_me:$LINENO: result: enabled" >&5
echo "${ECHO_T}enabled" >&6
@ -11,3 +37,23 @@
else
echo "$as_me:$LINENO: result: disabled" >&5
echo "${ECHO_T}disabled" >&6
@@ -7553,8 +7554,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+${CONFIG_SHELL-/bin/sh} $lt_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $lt_aux_dir/ltmain.sh $lt_target \
|| { { echo "$as_me:$LINENO: error: libtool configure failed" >&5
echo "$as_me: error: libtool configure failed" >&2;}
{ (exit 1); exit 1; }; }
@@ -7579,7 +7580,7 @@
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$lt_aux_dir/ltconfig $lt_aux_dir/ltmain.sh"
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'