- adjusted kde-am patch to support also automake 1.12 through 1.14

[packages/arts.git] / arts-extension_loader.patch

diff --git a/arts-extension_loader.patch b/arts-extension_loader.patch
index 3824573e69505446ecae1140e6cf06991f42dda0..647ea5592012528e401d9db96ce3752f982e5567 100644 (file)
--- a/arts-extension_loader.patch
+++ b/arts-extension_loader.patch
@@ -35,7 +35,7 @@
 +                      i != boost::filesystem::directory_iterator(); ++i )
 +              {
 +                      boost::smatch m;
 +                      i != boost::filesystem::directory_iterator(); ++i )
 +              {
 +                      boost::smatch m;

-+                      if ( boost::regex_match( i->string(), m, re ) )
++                      if ( boost::regex_match( i->path().string(), m, re ) )

 +                              return m.str();
 +              }
 +              return ( p + ".la" );
 +                              return m.str();
 +              }
 +              return ( p + ".la" );


@@ -58,7 +58,7 @@
 +      {
 +              boost::filesystem::path p( filename );
 +              if ( p.has_root_directory() )
 +      {
 +              boost::filesystem::path p( filename );
 +              if ( p.has_root_directory() )

-+                      dlfilename = makeLibraryName( p.branch_path().string(), p.leaf() );
++                      dlfilename = makeLibraryName( p.branch_path().string(), p.filename().string() );

 +      }
 +      catch ( boost::filesystem::filesystem_error const& )
 +      {
 +      }
 +      catch ( boost::filesystem::filesystem_error const& )
 +      {