[gentoo-commits] gentoo-x86 commit in net-irc/epic4/files: epic4-2.10.1-perl.patch epic4-2.10.1-make-recursion.patch

[gentoo-commits] gentoo-x86 commit in net-irc/epic4/files: epic4-2.10.1-perl.patch epic4-2.10.1-make-recursion.patch

[Nathan Phillip Brink (binki)]

binki       11/07/01 02:54:40

  Added:                epic4-2.10.1-perl.patch
                        epic4-2.10.1-make-recursion.patch
  Log:
  Bump to epic4-2.10.1, with gentoo-prefix support and EAPI=4 and some build fixes.
  
  (Portage version: 2.2.0_alpha41-r1/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-irc/epic4/files/epic4-2.10.1-perl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/epic4/files/epic4-2.10.1-perl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/epic4/files/epic4-2.10.1-perl.patch?rev=1.1&content-type=text/plain

Index: epic4-2.10.1-perl.patch
===================================================================
From: Nathan Phillip Brink <binki@gentoo.org>
Subject: Fix broken perl detection somewhat.

--- a/configure.in
+++ b/configure.in
@@ -636,25 +636,27 @@
 dnl
 
 AC_MSG_CHECKING(whether to support Perl)
-AC_ARG_WITH(perl,
-[  --with-perl[=PATH]       Compile with perl support.],
-[ test -z "$withval" && withval=yes ],
-)
-test "xno" != "x$withval" && for base in $withval /usr/local /usr /
-do
-	FOUND=
-	for ext in so a dll ; do
-		test -r $base/lib/libperl.$ext && FOUND=1
-		test -r $base/libperl.$ext && FOUND=1
-	done
-	test -n "$FOUND" || continue
-	AC_MSG_RESULT(yes)
-	LIBS="$LIBS `perl -MExtUtils::Embed -e ldopts`"
-	PERLDOTOH="perl.o"
-	AC_DEFINE(PERL)
-	break
-done
-test -z "$PERLDOTOH" && AC_MSG_RESULT(no)
+AC_ARG_WITH([perl],
+	[AS_HELP_STRING([--with-perl[=PATH]], [Compile with perl support.])],
+	[],
+	[with_perl=maybe])
+AS_IF([test "xno" != "x$with_perl"],
+	[
+	PERL_LIBS="`perl -MExtUtils::Embed -e ldopts`"
+	AS_IF([test -n "$PERL_LIBS"],
+		[
+		AC_MSG_RESULT([yes])
+		LIBS="$LIBS $PERL_LIBS"
+		AC_DEFINE([PERL], [], [Define if perl support should be compiled])
+		PERLDOTOH="perl.o"
+		],
+		[
+		AC_MSG_RESULT([no])
+		AS_IF([test "x$with_perl" != "xmaybe"],
+			[AC_MSG_ERROR([You specified --with-perl, but I was unable to find libperl])])
+		])
+	])
+
 withval=''
 
 dnl ----------------------------------------------------------

Diff finished.  Thu Jun 30 22:15:26 2011



1.1                  net-irc/epic4/files/epic4-2.10.1-make-recursion.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/epic4/files/epic4-2.10.1-make-recursion.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/epic4/files/epic4-2.10.1-make-recursion.patch?rev=1.1&content-type=text/plain

Index: epic4-2.10.1-make-recursion.patch
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
@@ -210,6 +210,6 @@
 	$(RM) Makefile source/Makefile include/sig.inc config.status config.cache config.log include/defs.h source/info.c.sh
 
 depend:
-	(cd source;make depend)
+	(cd source;$(MAKE) depend)
 
 # This is the end of the file.