--- medusa-1.5/configure.in	2009-02-09 18:02:09.000000000 +0100
+++ medusa-1.5/configure.in	2009-03-16 10:50:24.999005882 +0100
@@ -43,7 +43,7 @@
 
 CFLAGS="$CFLAGS -fPIC"
 CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/ssl/include -I${subversion_prefix}/include/subversion-1 \
-$(apr-config --includes --cppflags) -I${postgresql_prefix}/include/postgresql -I${afpfsng_prefix}/include/afpfs-ng"
+-I/usr/include/apr-1 -I/usr/include/apr-0 -I${postgresql_prefix}/include/postgresql -I${afpfsng_prefix}/include/afpfs-ng"
 
 AC_CHECKING([for pthread support])
 AC_CHECK_LIB(pthread, main, [], [AC_MSG_ERROR([ *** Application requires pthread support *** ])])
@@ -81,7 +81,7 @@
 AC_CHECKING([for AFPFS-NG Library and Header files])
 AC_CHECK_HEADER([afpfs-ng/afp_protocol.h], 
   [AC_CHECK_LIB(afpclient, main,
-    [AC_DEFINE(HAVE_LIBAFPFS, 1, [Found AFPFS-NG Library]) MODULE_LDFLAGS="$MODULE_LDFLAGS /usr/lib/libafpclient.so.0" check_module_afp="true"],
+    [AC_DEFINE(HAVE_LIBAFPFS, 1, [Found AFPFS-NG Library]) MODULE_LDFLAGS="$MODULE_LDFLAGS -lafpclient" check_module_afp="true"],
     [AC_MSG_WARN([ *** AFPFS-NG library required for AFP module. ***
       
       The AFPFS-NG package must be installed for AFP module to function. This includes
@@ -520,7 +520,7 @@
     [AC_DEFINE(HAVE_LIBSVN_CLIENT_1, 1, [Found SVN Library]) MODULE_LDFLAGS="$MODULE_LDFLAGS -lsvn_client-1" check_module_svn="true"],
     [AC_MSG_WARN([ *** LIBSVN library required for SVN module. *** ])]
   )],
-  [AC_CHECK_HEADER([apr-1.0/apr_tables.h],
+  [AC_CHECK_HEADER([apr-1/apr_tables.h],
     [AC_CHECK_LIB(svn_client-1, main,
       [AC_DEFINE(HAVE_LIBSVN_CLIENT_1, 1, [Found SVN Library]) MODULE_LDFLAGS="$MODULE_LDFLAGS -lsvn_client-1" check_module_svn="true"],
       [AC_MSG_WARN([ *** LIBSVN library required for SVN module. *** ])]