diff options
| author | Emanuele Giaquinta <exg@irssi.org> | 2008-11-23 09:48:48 +0000 |
|---|---|---|
| committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2008-11-23 09:48:48 +0000 |
| commit | be57a4e3e1b22940741ba2ab3b6fd7082c1d21f3 (patch) | |
| tree | 9998f432f58933c691f9b3a2bb8d82a7e31d0e6b /configure.in | |
| parent | 51d9d6947d6c871782f432cd2c62575fd4596c4d (diff) | |
| download | irssi-be57a4e3e1b22940741ba2ab3b6fd7082c1d21f3.zip | |
Remove apparently useless indirection through stub libtool library
files for libperl.a and DynaLoader.a when building perl support as
module.
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4919 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/configure.in b/configure.in index d10d2c1d..6dedbf11 100644 --- a/configure.in +++ b/configure.in @@ -465,23 +465,6 @@ if test "$want_perl" != "no"; then perl_mod_error="Dynamic library dependencies don't work with modules" fi - if test "$want_perl" != "static"; then - dnl * dynaloader.a -> libperl_dynaloader.la - DYNALOADER_A=`echo $PERL_LDFLAGS | $perlpath -pe 's/^(.* )*([[^ ]]*DynaLoader\.a).*/\2/'` - fi - - dnl * don't check libperl.a if dynaloader.a wasn't found.. - if test -n "$DYNALOADER_A"; then - dnl * find either libperl.a or libperl.so - LIBPERL_A=`echo "$PERL_LDFLAGS -L/usr/lib"|$perlpath -e 'foreach (split(/ /, <STDIN>)) { if (/^-L(.*)/) { my $dir=$1; if (\`ls $dir/libperl.so* 2>/dev/null\`) { print "-lperl"; last; }; if (-e "$dir/libperl.a") { print "$dir/libperl.a"; last } } };'` - if test -z "$LIBPERL_A"; then - perl_mod_error="Didn't find location of -lperl" - DYNALOADER_A= - elif test "$LIBPERL_A" = "-lperl"; then - LIBPERL_A= - fi - fi - dnl * remove all database stuffs dnl * nsl is already in ldflags dnl * libc is of course linked without needing -lc @@ -517,20 +500,7 @@ if test "$want_perl" != "no"; then fi if test "x$want_perl" != "xno"; then - if test "x$want_perl" = "xstatic"; then - AC_MSG_RESULT(ok) - elif test -z "$DYNALOADER_A"; then - AC_MSG_RESULT([error parsing ldopts, building Perl into irssi binary instead of as module]) - want_perl=static - else - AC_MSG_RESULT(ok) - PERL_LDFLAGS=`echo $PERL_LDFLAGS | $perlpath -pe 's/^(.* )*[[^ ]]*DynaLoader\.a/\1libperl_dynaloader.la/'` - if test -n "$LIBPERL_A"; then - PERL_LDFLAGS=`echo $PERL_LDFLAGS | $sedpath -e 's/-lperl /libperl_orig.la /' -e 's/-lperl$/libperl_orig.la$/'` - fi - AC_SUBST(LIBPERL_A) - AC_SUBST(DYNALOADER_A) - fi + AC_MSG_RESULT(ok) if test "x$want_perl" = "xstatic"; then dnl * building with static perl support @@ -739,7 +709,7 @@ if test "x$old_dir" != "x$whole_dir"; then for i in $whole_dir/src/perl/common $whole_dir/src/perl/irc $whole_dir/src/perl/ui $whole_dir/src/perl/textui; do subdirfiles=`echo $subdirfiles $i/typemap $i/module.h $i/*.pm $i/*.xs` done - for file in $whole_dir/src/perl/module.h $whole_dir/src/perl/libperl_orig.la $whole_dir/src/perl/libperl_dynaloader.la $subdirfiles; do + for file in $whole_dir/src/perl/module.h $subdirfiles; do link=`echo $file|$sedpath "s?$whole_dir/??"` rm -f $link $LN_S $file $link |