diff options
| author | Timo Sirainen <cras@irssi.org> | 2001-01-04 18:35:26 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2001-01-04 18:35:26 +0000 |
| commit | d431bea4395035632d280cfa9b7250bf29fe40bc (patch) | |
| tree | a645d37670bc6d23b02ee40cf74e47f994901973 | |
| parent | 596ef586b2fc0fa6760178faaccd5d70de5c6617 (diff) | |
| download | irssi-d431bea4395035632d280cfa9b7250bf29fe40bc.zip | |
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
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | src/perl/Makefile.am | 3 |
3 files changed, 11 insertions, 5 deletions
@@ -10,7 +10,7 @@ config.sub configure configure.scan libtool -libtool-static +libtool-shared ltconfig ltmain.sh stamp-h diff --git a/configure.in b/configure.in index a9f80d86..b68bbb18 100644 --- a/configure.in +++ b/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) diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am index f1168d06..c97a4cc9 100644 --- a/src/perl/Makefile.am +++ b/src/perl/Makefile.am @@ -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) |