c++ gurus, I need help,

The problem:

  cdio-paranoia is removed from libcdio > 0.83. A new package 'libcdio-paranoia'
provides all old cdio-paranoia headers, BUT the header file location has moved from:

  ../cdio

to

  ../cdio/paranoia

  I successfully built kaffeine on Arch with libcdio & libcdio-paranoia by
softlinking the needed paranoia headers to ../cdio:

cdda.h -> paranoia/cdda.h
paranoia.h -> paranoia/paranoia.h

  How do we patch kaffeine to properly handle this change?
kaffeine/src/input/disc/paranoia.h already includes:

#include <cdio/cdda.h>
#include <cdio/paranoia.h>

  The only other files that need fixing are:

configure.in:303:KDE_CHECK_HEADER([cdio/cdda.h], [with_cdparanoia=yes],
[with_cdparanoia=no])
kaffeine/configure.in.in:223:KDE_CHECK_HEADER([cdio/cdda.h],
[with_cdparanoia=yes], [with_cdparanoia=no])

  But how to do this with preprocessor checks so that it will work with both
libcdio <= 0.83 and those systems with libcdio > 0.83 that will also need
libcdio-paranoia?



-- 
David C. Rankin, J.D.,P.E.