diff -ur cpl-5.2.0/configure cpl-5.2.0.new/configure
--- cpl-5.2.0/configure	2010-05-19 09:07:01.000000000 +0200
+++ cpl-5.2.0.new/configure	2010-05-21 23:16:27.657059205 +0200
@@ -13178,7 +13178,7 @@
 
     cpl_cfitsio_check_header="fitsio.h"
     # FIXME: Check first for the dynamic library...
-    cpl_cfitsio_check_lib="libcfitsio.a"
+    cpl_cfitsio_check_lib="libcfitsio.so"
 
     cpl_cfitsio_dir=""
     cpl_cfitsio_incdirs=""
@@ -13203,7 +13203,7 @@
 
     # Check for the cfitsio includes, either in include/, include/cfitsio/
     # or include/libcfitsio0/
-    cpl_cfitsio_incdirs="$cpl_cfitsio_dir/include"
+    cpl_cfitsio_incdirs="$includedir/cfitsio"
 
     cpl_cfitsio_includes=no
 
@@ -13262,7 +13262,7 @@
     fi
 
     # Check for the cfitsio library, either in lib64/, lib32/ or lib/
-    cpl_cfitsio_libdirs="$cpl_cfitsio_dir/lib64"
+    cpl_cfitsio_libdirs="$libdir"
 
     cpl_cfitsio_libraries=no