r50254 - in /trunk/libauthen-krb5-perl: Krb5.pm Makefile.PL

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Tue Jan  5 16:35:47 2010
New Revision: 50254

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50254
Log:
unapply patches, oops

Modified:
    trunk/libauthen-krb5-perl/Krb5.pm
    trunk/libauthen-krb5-perl/Makefile.PL

Modified: trunk/libauthen-krb5-perl/Krb5.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-perl/Krb5.pm?rev=50254&op=diff
==============================================================================
--- trunk/libauthen-krb5-perl/Krb5.pm (original)
+++ trunk/libauthen-krb5-perl/Krb5.pm Tue Jan  5 16:35:47 2010
@@ -599,8 +599,6 @@
 
 =back
 
-=back
-
 =head1 AUTHOR
 
 Jeff Horwitz (jeff at smashing.org)

Modified: trunk/libauthen-krb5-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-krb5-perl/Makefile.PL?rev=50254&op=diff
==============================================================================
--- trunk/libauthen-krb5-perl/Makefile.PL (original)
+++ trunk/libauthen-krb5-perl/Makefile.PL Tue Jan  5 16:35:47 2010
@@ -8,8 +8,7 @@
 # any extra libraries?
 # add -lresolv here if you get errors like the following (usually on linux):
 #  undefined symbol: __res_search
-# Only needed with static linking, so not needed on Debian.
-#my $KRB5_EXTRALIBS = '-lresolv';
+my $KRB5_EXTRALIBS = '-lresolv';
 
 # location of Kerberos 5 includes
 my $KRB5_INCDIR = '/usr/include';
@@ -31,14 +30,10 @@
 	$cryptolib = '-lcrypto';
 }
 
-# Don't add -L/usr/lib or -I/usr/include; they can cause problems.
-my $ldflags  = ($KRB5_LIBDIR eq '/usr/lib')     ? '' : "-L${KRB5_LIBDIR}";
-my $cppflags = ($KRB5_INCDIR eq '/usr/include') ? '' : "-I${KRB5_INCDIR}";
-
 WriteMakefile(
     'NAME'	=> 'Authen::Krb5',
     'VERSION_FROM' => 'Krb5.pm',
-    'LIBS'     => ["$ldflags -lkrb5 ${cryptolib} -lcom_err $KRB5_EXTRALIBS"],
+    'LIBS'	=> ["-L${KRB5_LIBDIR} -lkrb5 ${cryptolib} -lcom_err $KRB5_EXTRALIBS"],
     'DEFINE'	=> '',
-    'INC'      => "$cppflags $KRB5_EXTRAINCS"
+    'INC'	=> "-I${KRB5_INCDIR} $KRB5_EXTRAINCS"
 );