From be57a4e3e1b22940741ba2ab3b6fd7082c1d21f3 Mon Sep 17 00:00:00 2001
From: Emanuele Giaquinta <exg@irssi.org>
Date: Sun, 23 Nov 2008 09:48:48 +0000
Subject: [PATCH] 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
---
 configure.in                   | 34 ++--------------------------------
 src/perl/Makefile.am           | 13 -------------
 src/perl/libperl_dynaloader.la | 25 -------------------------
 src/perl/libperl_orig.la       | 25 -------------------------
 4 files changed, 2 insertions(+), 95 deletions(-)
 delete mode 100644 src/perl/libperl_dynaloader.la
 delete mode 100644 src/perl/libperl_orig.la

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
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
index 0bf65f79..909f4a81 100644
--- a/src/perl/Makefile.am
+++ b/src/perl/Makefile.am
@@ -43,17 +43,6 @@ noinst_HEADERS = \
 	perl-signals.h \
 	perl-sources.h
 
-libperl_core_la_DEPENDENCIES = .libs/libperl_orig.a .libs/DynaLoader.a
-
-.libs/libperl_orig.a:
-	$(mkdir_p) .libs
-	rm -f .libs/libperl_orig.a
-	if [ x$(LIBPERL_A) = x ]; then touch .libs/libperl_orig.a; else $(LN_S) $(LIBPERL_A) .libs/libperl_orig.a; fi
-.libs/DynaLoader.a:
-	$(mkdir_p) .libs
-	rm -f .libs/DynaLoader.a
-	$(LN_S) $(DYNALOADER_A) .libs/DynaLoader.a
-
 libperl_core_la_SOURCES = \
 	$(perl_sources)
 
@@ -126,8 +115,6 @@ textui_sources = \
 	textui/module.h
 
 EXTRA_DIST = \
-	libperl_dynaloader.la \
-	libperl_orig.la \
 	get-signals.pl \
 	irssi-core.pl \
 	$(common_sources) \
diff --git a/src/perl/libperl_dynaloader.la b/src/perl/libperl_dynaloader.la
deleted file mode 100644
index 9117cdbd..00000000
--- a/src/perl/libperl_dynaloader.la
+++ /dev/null
@@ -1,25 +0,0 @@
-# libsilc.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.3.5 (1.385.2.206 2000/05/27 11:12:27)
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='DynaLoader.a'
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Version information for libsilc.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=no
-
-# Directory that this library needs to be installed in:
-libdir=''
diff --git a/src/perl/libperl_orig.la b/src/perl/libperl_orig.la
deleted file mode 100644
index c83ffc42..00000000
--- a/src/perl/libperl_orig.la
+++ /dev/null
@@ -1,25 +0,0 @@
-# libsilc.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.3.5 (1.385.2.206 2000/05/27 11:12:27)
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libperl_orig.a'
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Version information for libsilc.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=no
-
-# Directory that this library needs to be installed in:
-libdir=''