aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

Yet another objdir fix. Changed the way how irssi figures out where irssi's

Browse Source 
perl libraries are installed - maybe this will finally stop those @INC
problems.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1895 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-10-22 20:34:05 +00:00 committed by cras
parent 550df27558
commit 857d2055b6
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
configure.in
View File

@ -99,10 +99,10 @@ AC_ARG_WITH(modules,
if test "x$prefix" != "xNONE"; then if test "x$prefix" != "xNONE"; then
prefix=`eval echo $prefix` prefix=`eval echo $prefix`
PERL_MM_PARAMS="PREFIX=$prefix" PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=$prefix"
PERL_USE_LIB="$prefix`$perlpath -e 'use Config; $dir = $Config{sitearchexp}; $prefix = $Config{siteprefixexp}; $dir =~ s/^$prefix//; print $dir;'`" perl_library_dir="PERL_USE_LIB"
perl_set_use_lib=yes
perl_library_dir="$PERL_USE_LIB"
perl_prefix_note=yes perl_prefix_note=yes
fi fi
@ -130,7 +130,8 @@ AC_ARG_WITH(perl-lib,
want_perl=yes want_perl=yes
perl_prefix_note=no perl_prefix_note=no
PERL_MM_PARAMS="INSTALLDIRS=perl LIB=$withval" PERL_MM_PARAMS="INSTALLDIRS=perl LIB=$withval"
PERL_USE_LIB="$withval" perl_library_dir="PERL_USE_LIB"
perl_set_use_lib=yes
fi, fi,
want_perl=yes) want_perl=yes)
@ -580,6 +581,16 @@ if test "$want_perl" != "no"; then
perl_static_fe_lib= perl_static_fe_lib=
PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool' PERL_LIBTOOL='$(SHELL) $(top_builddir)/libtool'
fi fi
# figure out the correct @INC path - we'll need to do this
# through MakeMaker since it's difficult to get it right
# otherwise.
if test "x$perl_set_use_lib" = "xyes"; then
perl -e 'use ExtUtils::MakeMaker; WriteMakefile("NAME" => "test", "MAKEFILE" => "Makefile.test");' $PERL_MM_PARAMS >/dev/null
PERL_USE_LIB=`perl -e 'open(F, "Makefile.test"); while (<F>) { chomp; if (/^(\w+) = (.*$)/) { $keys{$1} = $2; } }; $key = $keys{INSTALLARCHLIB}; while ($key =~ /\\$\((\w+)\)/) { $value = $keys{$1}; $key =~ s/\\$\($1\)/$value/; }; print $key;'`
rm -f Makefile.test
fi
AC_SUBST(perl_module_lib) AC_SUBST(perl_module_lib)
AC_SUBST(perl_static_lib) AC_SUBST(perl_static_lib)
AC_SUBST(perl_module_fe_lib) AC_SUBST(perl_module_fe_lib)
@ -762,7 +773,7 @@ if test "x$old_dir" != "x$whole_dir"; then
if test "x$want_perl" != "xno"; then if test "x$want_perl" != "xno"; then
subdirfiles="" subdirfiles=""
for i in $whole_dir/src/perl/common $whole_dir/src/perl/irc $whole_dir/src/perl/ui $whole_dir/src/perl/textui; do 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/*.xs` subdirfiles=`echo $subdirfiles $i/typemap $i/module.h $i/*.pm $i/*.xs`
done done
for file in $whole_dir/src/perl/*.[[ch]] $whole_dir/src/perl/libperl_orig.la $whole_dir/src/perl/libperl_dynaloader.la $subdirfiles; do for file in $whole_dir/src/perl/*.[[ch]] $whole_dir/src/perl/libperl_orig.la $whole_dir/src/perl/libperl_dynaloader.la $subdirfiles; do
link=`echo $file|$sedpath "s?$whole_dir/??"` link=`echo $file|$sedpath "s?$whole_dir/??"`
@ -806,6 +817,9 @@ if test "x$want_perl" != "xno" -a "x$perl_mod_error" != "x"; then
fi fi
if test "x$want_perl" != "xno"; then if test "x$want_perl" != "xno"; then
if test "$perl_library_dir" = "PERL_USE_LIB"; then
perl_library_dir=$PERL_USE_LIB
fi
if test -z "$perl_library_dir"; then if test -z "$perl_library_dir"; then
perl_library_dir="(site default - `$perlpath -e 'use Config; print $Config{sitearch}'`)" perl_library_dir="(site default - `$perlpath -e 'use Config; print $Config{sitearch}'`)"
fi fi