Fix build without libtool

* libmu_sieve/load.c [!HAVE_LIBLTDL] (mu_sieve_unload_ext): Dummy function.
[!HAVE_LIBLTDL] (mu_sieve_load_ext, mu_i_sv_load_add_dir): Set errno. Fix
return value.
* mu-aux/gylwrap (yysym): Add more symbols
(dumpme): Skip old contents of the BOOTSTRAP section up to
the next POD keyword.
* mu/libexec/Makefile.am (MUTOOL_LIBRARIES_TAIL): Fix ordering
of libraries.

3 files changed, 43 insertions, 6 deletions

diff --git a/libmu_sieve/load.c b/libmu_sieve/load.c
index 9914b133e..89bf87632 100644
--- a/libmu_sieve/load.c
+++ b/libmu_sieve/load.c
@@ -150,13 +150,20 @@ mu_i_sv_load_add_dir (mu_sieve_machine_t mach, const char *name)
 void *
 mu_sieve_load_ext (mu_sieve_machine_t mach, const char *name)
 {
-  return 1;
+  errno = ENOSYS;
+  return NULL;
+}
+
+void
+mu_sieve_unload_ext (void *data)
+{
 }
 
 int
 mu_i_sv_load_add_dir (mu_sieve_machine_t mach, const char *name)
 {
-  return NULL;
+  errno = ENOSYS;
+  return 1;
 }
 
 #endif /* HAVE_LIBLTDL */
diff --git a/mu-aux/gylwrap b/mu-aux/gylwrap
index 61f7c2554..990ae0fdd 100755
--- a/mu-aux/gylwrap
+++ b/mu-aux/gylwrap
@@ -167,9 +167,16 @@ This version of gylwrap was bootstrapped as follows:
           --yysym=yyleng --yysym=yylex --yysym=yylineno\
           --yysym=yyout --yysym=yyrestart --yysym=yytext\
           --yysym=yywrap --yysym=yyalloc --yysym=yyrealloc\
-          --yysym=yyfree
+          --yysym=yyfree --yysym=yy_scan_buffer\
+          --yysym=yy_scan_bytes --yysym=yy_scan_string\
+          --yysym=yyget_debug --yysym=yyget_in\
+          --yysym=yyget_leng --yysym=yyget_lineno\
+          --yysym=yyget_out --yysym=yyget_text\
+          --yysym=yylex_destroy --yysym=yypop_buffer_state\
+          --yysym=yypush_buffer_state --yysym=yyset_debug\
+          --yysym=yyset_in --yysym=yyset_lineno\
+          --yysym=yyset_out
 
-    
 =cut    
 
 # List of symbols suitable for prefix replacements.  See the
@@ -234,6 +241,22 @@ my @yysym = qw(
      yyalloc
      yyrealloc
      yyfree
+     yy_scan_buffer
+     yy_scan_bytes
+     yy_scan_string
+     yyget_debug
+     yyget_in
+     yyget_leng
+     yyget_lineno
+     yyget_out
+     yyget_text
+     yylex_destroy
+     yypop_buffer_state
+     yypush_buffer_state
+     yyset_debug
+     yyset_in
+     yyset_lineno
+     yyset_out
 );
 
 my @addsym;
@@ -242,7 +265,7 @@ our $VERSION = '1.01';
 
 # If prefix replacement is requested, the list above is assembled into
 # a single regular expression, stored here.
-my $yyrx = q{(?:_(?:(?:crea|dele)te_buffer|fl(?:ex_debug|ush_buffer)|init_buffer|load_buffer_state|switch_to_buffer|yy[sv])|a(?:ct|lloc)|ch(?:ar|(?:ec)?k)|d(?:e(?:bug|f(?:red)?)|goto)|e(?:rr(?:flag|or)|xca)|free|gindex|(?:le|i)n|l(?:e(?:ng|x)|hs|ineno|loc|val)|maxdepth|n(?:ame|errs)|(?:ou|pac)t|p(?:arse|go|[sv])|r(?:e(?:alloc|ds|start)|index|ule|[12])|s(?:index|tate)?|t(?:able|ext|mp|oks)|v(?:al)?|wrap)};
+my $yyrx = q{(?:_(?:(?:crea|dele)te_buffer|fl(?:ex_debug|ush_buffer)|init_buffer|load_buffer_state|s(?:can_(?:b(?:uffer|ytes)|string)|witch_to_buffer)|yy[sv])|a(?:ct|lloc)|ch(?:ar|(?:ec)?k)|d(?:e(?:bug|f(?:red)?)|goto)|e(?:rr(?:flag|or)|xca)|free|g(?:et_(?:debug|in|l(?:eng|ineno)|(?:ou|tex)t)|index)|(?:le|i)n|l(?:e(?:ng|x(?:_destroy)?)|hs|ineno|loc|val)|maxdepth|n(?:ame|errs)|(?:ou|pac)t|p(?:arse|go|op_buffer_state|ush_buffer_state|[sv])|r(?:e(?:alloc|ds|start)|index|ule|[12])|s(?:et_(?:debug|in|lineno|out)|index|tate)?|t(?:able|ext|mp|oks)|v(?:al)?|wrap)};
 
 # String to replace the "yy" prefix with.
 my $yyrepl;
@@ -355,8 +378,14 @@ sub dumpme {
     my ($out, $tempname) = tempfile(basename($outname) . ".XXXXXX",
 				    DIR => dirname($outname));
     push @yysym, @addsym;
+    my $skip;
     while (<$in>) {
 	chomp;
+	if ($skip) {
+	    next unless /^=/;
+	    $skip = 0;
+	}
+	
 	if (/^(my\s+\$yyrx)\s*(?=.*)?;\s*?/) {
 	    my $rx = mkrx;
 	    print $out "$1 = q{$rx};\n";
@@ -393,6 +422,7 @@ sub dumpme {
 		$len += length($opt);
 	    }
 	    print $out "\n\n";
+	    $skip = 1;
 	} else {
 	    print $out "$_\n";
 	}
diff --git a/mu/libexec/Makefile.am b/mu/libexec/Makefile.am
index b59dc1127..0b7ea6b46 100644
--- a/mu/libexec/Makefile.am
+++ b/mu/libexec/Makefile.am
@@ -119,8 +119,8 @@ mailutils_smtp_LDADD = \
  $(MUTOOL_LIBRARIES_TAIL)
 
 MUTOOL_LIBRARIES_TAIL = \
- ${MU_APP_LIBRARIES}\
  ./libmutool.a\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MAILUTILS}\
  @READLINE_LIBS@\
  @MU_COMMON_LIBRARIES@