This commit belongs with the previous commit (revision 32230). Removing the older CMakeLists.txt variants, as we're temporarily returning to the unmodified xpdf-tools src code.