Index: Makefile.PL
===================================================================
--- Makefile.PL	(révision 6530)
+++ Makefile.PL	(copie de travail)
@@ -4,17 +4,16 @@
 # the contents of the Makefile that is written.
 WriteMakefile(
     NAME              => 'XSParagraph',
-    VERSION_FROM      => 'lib/XSParagraph.pm', # finds $VERSION
+    VERSION_FROM      => 'XSParagraph.pm', # finds $VERSION
     PREREQ_PM         => {}, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
-      (ABSTRACT_FROM  => 'lib/XSParagraph.pm', # retrieve abstract from module
-       AUTHOR         => 'A. U. Thor <address@hidden>') : ()),
+      (AUTHOR         => 'Gavin Smith  <address@hidden>') : ()),
     LIBS              => [''], # e.g., '-lm'
     DEFINE            => '', # e.g., '-DHAVE_SOMETHING'
     INC               => '-I.', # e.g., '-I. -I/usr/include/other'
 	# Un-comment this if you add C files to link with later:
-    # OBJECT            => '$(O_FILES)', # link all the C files too
-    'MYEXTLIB' => 'mylib/libxspara.a',
+    OBJECT            => '$(O_FILES)', # link all the C files too
+    #'MYEXTLIB' => 'mylib/libxspara.a',
 );
 
 sub MY::postable {
Index: XSParagraph.pm
===================================================================
--- XSParagraph.pm	(révision 6530)
+++ XSParagraph.pm	(copie de travail)
@@ -105,6 +105,14 @@
   goto FALLBACK;
 }
 
+my $dlname = undef;
+if ($TEXINFO_XS eq 'module') {
+  $dlname = "XSParagraph.so";
+  push @DynaLoader::dl_library_path, "./blib/arch/auto/XSParagraph/";
+  $TEXINFO_XS = 'debug';
+  goto LOAD;
+}
+
 my ($libtool_dir, $libtool_archive) = _find_file("XSParagraph.la");
 if (!$libtool_archive) {
   _fatal "XSParagraph: couldn't find Libtool archive file";
@@ -119,7 +127,6 @@
 }
 
 # Look for the line in XSParagraph.la giving the name of the loadable object.
-my $dlname = undef;
 while (my $line = <$fh>) {
   if ($line =~ /^\s*dlname\s*=\s*'([^']+)'\s$/) {
     $dlname = $1;
@@ -135,6 +142,8 @@
 push @DynaLoader::dl_library_path, $libtool_dir;
 push @DynaLoader::dl_library_path, "$libtool_dir/.libs";
 
+LOAD:
+
 my $dlpath = DynaLoader::dl_findfile($dlname);
 if (!$dlpath) {
   _fatal "XSParagraph: couldn't find $dlname";
@@ -144,7 +153,7 @@
 #print STDERR "loadable object is at $dlpath\n";
 
 my $module = "Texinfo::Convert::XSParagraph::XSParagraph";
-our $VERSION = '6.0';
+our $VERSION = '6.0dev';
 
 # Following steps under "bootstrap" in "man DynaLoader".
 #bootstrap XSParagraph $VERSION;