Fixed message typo.

[captive.git] / autogen.pl

diff --git a/autogen.pl b/autogen.pl
index 8f69d12..556dcf0 100755 (executable)
--- a/autogen.pl
+++ b/autogen.pl
@@ -36,15 +36,33 @@ AutoGen->run(
                "ARGV"=>\@ARGV,
                "gtk-doc-dir"=>"./doc/apiref/",
                "clean"=>[qw(
-                               .include_test_false.c
+                               _include_test_false.c
                                .include_test_all.stamp
+                               *.pod.pl *.pod *.[0-9]
                                ./ChangeLog.bak
+                               ./debian/changelog
                                ./doc/*-pod.*
-                               ./doc/apiref/captive.types
+                               ./doc/apiref/gtk-doc.make
+                               ./doc/apiref/gtk-doc.make-captive
+                               ./fonts/fonts.conf
                                ./src/client/bug-replay/captive-bug-replay
                                ./src/client/cmdline/captive-cmdline
+                               ./src/client/lufs/mount.captive
+                               ./src/client/fuse/mount.captive
+                               ./src/client/fuse/captive
+                               ./src/client/fuse/captive-fusermount
                                ./src/client/sandbox-server/captive-sandbox-server
-                               ./src/client/libcaptive-gnomevfs/captive.conf
+                               ./src/client/gnomevfs/captive.conf
+                               ./src/install/fstab/captive-install-fstab
+                               ./src/install/acquire/captive-install-acquire
+                               ./src/install/acquire/ui-gnome-callbacks.[ch]
+                               ./src/install/acquire/ui-gnome-interface.[ch]
+                               ./src/install/acquire/ui-gnome-support.[ch]
+                               ./src/install/acquire/ui-gnome.glade.bak
+                               ./src/install/acquire/ui-gnome.gladep.bak
+                               ./src/install/acquire/gnome_vfs_read_entire_file.c
+                               ./src/libcaptive/cc/marshallers.[ch]
+                               ./src/libcaptive/client/marshallers.[ch]
                                ./src/libcaptive/ke/exports.c
                                ./src/libcaptive/reactos/*/*.[cS]
                                ./src/libcaptive/sandbox/sandbox-common.c
@@ -63,15 +81,26 @@ AutoGen->run(
                                ./src/TraceFS/TraceFS-W32/buildfre.err
                                )],
                "prep"=>sub {
-                               local *F;
-                               do { open F,$_ or confess "Open $_: $!"; } for ("libtoolize --version|");
-                               local $/;
-                               undef $/;
-                               my $libtoolize_out=<F>;
-                               close F;
-                               my $libtoolize_version=($libtoolize_out=~m#([\d.]+)#)[0];
-                               confess "libtoolize(1) version not found in its output" if !$libtoolize_version;
-                               do { confess "'libtool' package version $_ or higher required" if $libtoolize_version<$_; } for (1.5);
+                               # For conflicting object basenames in convenient libraries:
+                               AutoGen->checkcommandversion("libtoolize","1.5");
+                               # 1.5 for AM_PROG_AS.
+                               # 1.6 to prevent weird error wrt 'SANDBOX_IDL_SOURCES':
+                               AutoGen->checkcommandversion("automake","1.6");
+
+                               AutoGen::_system "gtkdocize --copy --docdir doc/apiref/";
+                               for my $fname ("doc/apiref/gtk-doc.make") {
+                                       my $gtk_doc_make=AutoGen::_readfile $fname;
+                                       for my $keyword (qw(EXTRA_DIST CLEANFILES)) {
+                                               $gtk_doc_make=~s/^$keyword =/$keyword +=/m or confess "$keyword not found in $fname";
+                                               }
+                                       $gtk_doc_make=~s/^(dist-hook): dist-check-gtkdoc (dist-hook-local)$/$1: $2\n\nDISABLED_$&/m;
+                                       AutoGen::_writefile "$fname-captive",$gtk_doc_make;
+                                       }
+                               for my $dir ("./src/install/acquire/cabextract") {
+                                       if (!-f "$dir/cabextract.c" || -f "$dir/configure.in") {
+                                               do { system $_ and die "$_: $!"; } for ("cvs update -kk -r captive $dir");
+                                               }
+                                       }
                                1;
                                },
                );