trouble replacing internal osc with xtal in 18F2620

[leporid]

I have a board using a PIC18F2620 that has pads for an SMD
crystal. Previously, this board was used without the
crystal and with the internal oscillator. There are no
capacitors with the crystal; I was told that they were
unnecessary if the traces were under half an inch (true?).

I have been unable to make the 18F2620 run at anything
other than 8 mHz, as determined by the the delay_ms test. I
assume that the internal oscillator is taking over due to
some problem with the crystal.

I have tried this with a 16 mHz crystal (with and without
12 pF caps), it produces a 2 ms pulse when delay_ms is 1 ms
and clock=16000000. With a 20 mHz SMD crystal and no caps
the pulse is 2.5 ms instead of 1 ms with clock=20000000.

I have tried many combinations of the fuses listed under
"// CLOCK-related" below, the other lines were kept the
same.

I would like to run the 18F2620 at 20 mHZ with a 20 mHz
crystal. Questions are: 1) are caps required on the crystal
if the leads are very short (~1/4" in this case) 2) What is
the correct #FUSE configuration to run it at 20 mHz with a
20 mHz crystal?

Any help would be much appreciated.

Using CCS C 4.106. Here's my (latest variation of) MAIN.H:

[PCM programmer]

[leporid]

Wow, that was a quick reply! Thank you.