This commit was manufactured by cvs2svn to create branch 'nickrob-nickrob-async-20060513-branchpoint

async-20060513-branch'.

Sprout from readline_5_1-import-branch 2006-04-20 20:13:22 UTC nobody 'This commit was manufactured by cvs2svn to create branch 'readline_5_1'
Cherrypick from master 2006-05-12 01:45:10 UTC Ben Elliston <bje@au.ibm.com> '        * config.sub, config.guess: Update from upstream sources.':
    ChangeLog
    bfd/ChangeLog
    bfd/aout-ns32k.c
    bfd/aoutf1.h
    bfd/aoutx.h
    bfd/archive.c
    bfd/bfd-in.h
    bfd/bfd-in2.h
    bfd/coff-arm.c
    bfd/coff-or32.c
    bfd/coff-rs6000.c
    bfd/coff-w65.c
    bfd/coffcode.h
    bfd/cofflink.c
    bfd/cpu-arm.c
    bfd/doc/ChangeLog
    bfd/doc/bfd.texinfo
    bfd/dwarf2.c
    bfd/ecoff.c
    bfd/ecofflink.c
    bfd/elf-eh-frame.c
    bfd/elf.c
    bfd/elf32-arm.c
    bfd/elf32-avr.c
    bfd/elf32-dlx.c
    bfd/elf32-i370.c
    bfd/elf32-m32c.c
    bfd/elf32-ppc.c
    bfd/elf32-s390.c
    bfd/elf32-sh-symbian.c
    bfd/elf32-sh64.c
    bfd/elf32-v850.c
    bfd/elf32-xtensa.c
    bfd/elf64-mmix.c
    bfd/elf64-ppc.c
    bfd/elf64-s390.c
    bfd/elfcode.h
    bfd/elflink.c
    bfd/elfxx-mips.c
    bfd/elfxx-sparc.c
    bfd/elfxx-target.h
    bfd/hash.c
    bfd/ieee.c
    bfd/ihex.c
    bfd/libbfd-in.h
    bfd/libbfd.h
    bfd/mmo.c
    bfd/nlm32-sparc.c
    bfd/oasys.c
    bfd/opncls.c
    bfd/pdp11.c
    bfd/reloc.c
    bfd/section.c
    bfd/som.c
    bfd/tekhex.c
    bfd/version.h
    bfd/vms.c
    config.guess
    config.sub
    configure
    configure.in
    etc/ChangeLog
    etc/texi2pod.pl
    gdb/ChangeLog
    gdb/MAINTAINERS
    gdb/Makefile.in
    gdb/NEWS
    gdb/breakpoint.c
    gdb/config/m32c/m32c.mt
    gdb/configure.tgt
    gdb/doc/ChangeLog
    gdb/doc/Makefile.in
    gdb/doc/agentexpr.texi
    gdb/doc/gdb.texinfo
    gdb/doc/gdbint.texinfo
    gdb/doc/observer.texi
    gdb/dwarf2-frame.c
    gdb/dwarf2-frame.h
    gdb/dwarf2read.c
    gdb/gdbserver/ChangeLog
    gdb/gdbserver/configure.srv
    gdb/gdbserver/linux-low.c
    gdb/gdbserver/server.c
    gdb/gdbserver/target.h
    gdb/gnu-nat.c
    gdb/hppa-hpux-tdep.c
    gdb/linux-fork.c
    gdb/linux-nat.c
    gdb/linux-thread-db.c
    gdb/m32c-tdep.c
    gdb/mi/mi-main.c
    gdb/mingw-hdep.c
    gdb/mips-mdebug-tdep.c
    gdb/mips-tdep.c
    gdb/ppc-linux-nat.c
    gdb/ppcnbsd-tdep.c
    gdb/remote.c
    gdb/rs6000-tdep.c
    gdb/s390-tdep.c
    gdb/ser-mingw.c
    gdb/serial.c
    gdb/serial.h
    gdb/symtab.c
    gdb/target.c
    gdb/target.h
    gdb/testsuite/ChangeLog
    gdb/testsuite/gdb.asm/asm-source.exp
    gdb/testsuite/gdb.asm/m32c.inc
    gdb/testsuite/gdb.base/bang.exp
    gdb/testsuite/gdb.base/break.exp
    gdb/testsuite/gdb.base/del.c
    gdb/testsuite/gdb.base/del.exp
    gdb/testsuite/gdb.base/help.exp
    gdb/testsuite/gdb.base/multi-forks.exp
    gdb/testsuite/gdb.base/savedregs.exp
    gdb/testsuite/gdb.base/sigbpt.exp
    gdb/testsuite/gdb.base/siginfo.exp
    gdb/testsuite/gdb.base/sigstep.exp
    gdb/testsuite/gdb.cp/m-static.cc
    gdb/testsuite/gdb.cp/m-static.h
    gdb/testsuite/gdb.mi/mi-basics.exp
    gdb/testsuite/gdb.mi/mi-regs.exp
    gdb/testsuite/gdb.mi/mi2-basics.exp
    gdb/testsuite/gdb.mi/mi2-regs.exp
    gdb/testsuite/gdb.mi/var-cmd.c
    gdb/varobj.c
    gdb/version.in
    include/ChangeLog
    include/opcode/ChangeLog
    include/opcode/arm.h
    include/opcode/mips.h
    libiberty/ChangeLog
    libiberty/floatformat.c
    opcodes/ChangeLog
    opcodes/arm-dis.c
    opcodes/i386-dis.c
    opcodes/m68k-dis.c
    opcodes/mips-dis.c
    opcodes/mips-opc.c
    opcodes/mips16-opc.c
    readline/CHANGELOG
    readline/CHANGES
    readline/ChangeLog.gdb
    readline/INSTALL
    readline/MANIFEST
    readline/Makefile.in
    readline/README
    readline/aclocal.m4
    readline/bind.c
    readline/callback.c
    readline/chardefs.h
    readline/complete.c
    readline/config.h.in
    readline/configure
    readline/configure.in
    readline/display.c
    readline/doc/ChangeLog.gdb
    readline/doc/Makefile.in
    readline/doc/history.3
    readline/doc/inc-hist.texinfo
    readline/doc/readline.3
    readline/doc/texi2dvi
    readline/emacs_keymap.c
    readline/examples/ChangeLog.gdb
    readline/examples/Makefile.in
    readline/examples/histexamp.c
    readline/examples/rl.c
    readline/examples/rlcat.c
    readline/examples/rltest.c
    readline/examples/rlversion.c
    readline/funmap.c
    readline/histexpand.c
    readline/histfile.c
    readline/history.c
    readline/history.h
    readline/histsearch.c
    readline/input.c
    readline/isearch.c
    readline/keymaps.c
    readline/kill.c
    readline/macro.c
    readline/mbutil.c
    readline/misc.c
    readline/nls.c
    readline/parens.c
    readline/posixdir.h
    readline/readline.c
    readline/readline.h
    readline/rldefs.h
    readline/rlmbutil.h
    readline/rlprivate.h
    readline/rlstdc.h
    readline/rltty.c
    readline/rltty.h
    readline/rltypedefs.h
    readline/savestring.c
    readline/search.c
    readline/shell.c
    readline/shlib/Makefile.in
    readline/signals.c
    readline/support/shlib-install
    readline/support/shobj-conf
    readline/terminal.c
    readline/text.c
    readline/tilde.c
    readline/tilde.h
    readline/undo.c
    readline/util.c
    readline/vi_keymap.c
    readline/vi_mode.c
    sim/ChangeLog
    sim/MAINTAINERS
    sim/Makefile.in
    sim/configure
    sim/configure.ac
    sim/ppc/ChangeLog
    sim/ppc/Makefile.in
    sim/ppc/configure
    sim/ppc/configure.ac
Delete:
    readline/acconfig.h
    readline/config.h.bot
    readline/doc/hist.texinfo
    readline/doc/history.pdf
    readline/doc/hstech.texinfo
    readline/doc/hsuser.texinfo
    readline/doc/manvers.texinfo
    readline/doc/readline.pdf
    readline/doc/rlman.texinfo
    readline/doc/rltech.texinfo
    readline/doc/rluser.texinfo
    readline/doc/rluserman.pdf
    readline/doc/rluserman.texinfo
    readline/examples/rlfe.c

2 files changed, 18 insertions, 4 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 0d2b80c..09d002f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* texi2pod.pl: Handle -I.
+
 2006-04-06  Carlos O'Donell  <carlos@codesourcery.com>
 
 	* Makefile.in: Add install-html target. Add htmldir,
diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
index 9696a12..57d1d5b 100644
--- a/etc/texi2pod.pl
+++ b/etc/texi2pod.pl
@@ -36,6 +36,7 @@ $shift = "";
 $fnno = 1;
 $inf = "";
 $ibase = "";
+@ipath = ();
 
 while ($_ = shift) {
     if (/^-D(.*)$/) {
@@ -51,6 +52,13 @@ while ($_ = shift) {
 	die "flags may only contain letters, digits, hyphens, dashes and underscores\n"
 	    unless $flag =~ /^[a-zA-Z0-9_-]+$/;
 	$defs{$flag} = $value;
+    } elsif (/^-I(.*)$/) {
+	if ($1 ne "") {
+	    $flag = $1;
+	} else {
+	    $flag = shift;
+	}
+        push (@ipath, $flag);
     } elsif (/^-/) {
 	usage();
     } else {
@@ -229,10 +237,12 @@ while(<$inf>) {
 	$inf = gensym();
 	$file = postprocess($1);
 
-	# Try cwd and $ibase.
-	open($inf, "<" . $file) 
-	    or open($inf, "<" . $ibase . "/" . $file)
-		or die "cannot open $file or $ibase/$file: $!\n";
+	# Try cwd and $ibase, then explicit -I paths.
+	$done = 0;
+	foreach $path (".", $ibase, @ipath) {
+	    open($inf, "<" . $path . "/" . $file) and ($done = 1, last);
+	}
+	die "cannot find $file" if !$done;
 	next;
     };