mirror of
https://github.com/irssi/irssi.git
synced 2024-09-01 04:14:16 -04:00
Renamed libtool-static to libtool-shared. Generating it should now also
work properly with older libtool versions than 1.3.5. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1064 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
596ef586b2
commit
d431bea439
@ -10,7 +10,7 @@ config.sub
|
||||
configure
|
||||
configure.scan
|
||||
libtool
|
||||
libtool-static
|
||||
libtool-shared
|
||||
ltconfig
|
||||
ltmain.sh
|
||||
stamp-h
|
||||
|
11
configure.in
11
configure.in
@ -14,7 +14,7 @@ AM_PROG_LIBTOOL
|
||||
|
||||
dnl * ahem.. :) we don't want static libraries for modules
|
||||
if test "x$lt_target" = "x"; then
|
||||
if "x$target" = "x"; then
|
||||
if test "$target" = "NONE"; then
|
||||
lt_target="$host"
|
||||
else
|
||||
lt_target="$target"
|
||||
@ -26,7 +26,10 @@ if test "x$enable_static" = "xno"; then
|
||||
fi
|
||||
|
||||
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
||||
$libtool_flags --disable-static --output=libtool-static --no-verify $ac_aux_dir/ltmain.sh $lt_target \
|
||||
$libtool_flags --disable-static --output=libtool-shared --no-verify $ac_aux_dir/ltmain.sh $lt_target \
|
||||
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
|
||||
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
|
||||
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|
||||
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
|
||||
|
||||
AC_CHECK_HEADERS(string.h stdlib.h unistd.h dirent.h sys/ioctl.h libintl.h)
|
||||
@ -448,11 +451,11 @@ if test "$want_perl" != "no"; then
|
||||
PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
else
|
||||
dnl * build dynamic library of perl module,
|
||||
dnl * use libtool-static to prevent creating of
|
||||
dnl * use libtool-shared to prevent creating of
|
||||
dnl * libperl.a
|
||||
module_lib=libperl.la
|
||||
static_lib=
|
||||
PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool-static'
|
||||
PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool-shared'
|
||||
fi
|
||||
AC_SUBST(module_lib)
|
||||
AC_SUBST(static_lib)
|
||||
|
@ -94,4 +94,7 @@ all-local:
|
||||
install-exec-local:
|
||||
for dir in common irc; do cd $$dir && make install && cd ..; done
|
||||
|
||||
clean-generic:
|
||||
rm -f common/Irssi.c irc/Irc.c
|
||||
|
||||
libperl_la_LIBADD = $(PERL_LDFLAGS)
|
||||
|
Loading…
Reference in New Issue
Block a user