[svn:modperl-modules] r284 - in Apache-Scoreboard-2.0/trunk: . Dummy

Author: MJH
Date: Mon Jan 21 11:21:52 2008
New Revision: 284

Modified:
   Apache-Scoreboard-2.0/trunk/Dummy/Makefile.PL
   Apache-Scoreboard-2.0/trunk/Makefile.PL

Log:
automate apr header location

Modified: Apache-Scoreboard-2.0/trunk/Dummy/Makefile.PL
==============================================================================
--- Apache-Scoreboard-2.0/trunk/Dummy/Makefile.PL	(original)
+++ Apache-Scoreboard-2.0/trunk/Dummy/Makefile.PL	Mon Jan 21 11:21:52 2008
@@ -18,7 +18,14 @@
 
 genxs();
 
-my $extra_inc = '-I/usr/include/apr-1';
+# get the apr header files, depending on where they are
+my $apr_config = `which apr-config 2>/dev/null` || `which apr-1-config 2>/dev/null`;
+chomp $apr_config;
+my $apr_inc = `$apr_config --includedir`;
+chomp $apr_inc;
+my $extra_inc;
+$extra_inc = "-I$apr_inc"       if ($apr_inc);
+
 ModPerl::MM::WriteMakefile(
     NAME	 => 'Apache::DummyScoreboard',
     VERSION_FROM => 'DummyScoreboard.pm',

Modified: Apache-Scoreboard-2.0/trunk/Makefile.PL
==============================================================================
--- Apache-Scoreboard-2.0/trunk/Makefile.PL	(original)
+++ Apache-Scoreboard-2.0/trunk/Makefile.PL	Mon Jan 21 11:21:52 2008
@@ -30,7 +30,14 @@
 Apache::TestMM::filter_args();
 Apache::TestMM::generate_script('t/TEST');
 
-my $extra_inc = '-I/usr/include/apr-1';
+# get the apr header files, depending on where they are
+my $apr_config = `which apr-config 2>/dev/null` || `which apr-1-config 2>/dev/null`;
+chomp $apr_config;
+my $apr_inc = `$apr_config --includedir`;
+chomp $apr_inc;
+my $extra_inc;
+$extra_inc = "-I$apr_inc"	if ($apr_inc);
+
 ModPerl::MM::WriteMakefile(
     NAME         => 'Apache::Scoreboard',
     VERSION_FROM => 'lib/Apache/Scoreboard.pm',