Index: configure
===================================================================
--- configure	(revision ae628e1a462dc0616aa47dc33f168a660d2d1a3d)
+++ configure	(revision 3de91351a168833dc27bd92f5425bd6ad79e4dd9)
@@ -3235,5 +3235,5 @@
 		cfa_prefix=${prefix}
 	fi
-	cfa_prefix="$(readlink -f ${cfa_prefix})/"
+	cfa_prefix="$(readlink -m ${cfa_prefix})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3245,9 +3245,9 @@
 
 	if test "$includedir" = '${prefix}/include'; then
-		cfa_incdir="${cfa_prefix}/include/${cfa_name}"
+		cfa_incdir="${cfa_prefix}include/${cfa_name}"
 	else
 		cfa_incdir=${includedir}
 	fi
-	cfa_incdir="$(readlink -f ${cfa_incdir})/"
+	cfa_incdir="$(readlink -m ${cfa_incdir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3259,9 +3259,9 @@
 
 	if test "$bindir" = '${exec_prefix}/bin'; then
-		cfa_bindir="${cfa_prefix}/bin"
+		cfa_bindir="${cfa_prefix}bin"
 	else
 		cfa_bindir=${bindir}
 	fi
-	cfa_bindir="$(readlink -f ${cfa_bindir})/"
+	cfa_bindir="$(readlink -m ${cfa_bindir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3274,12 +3274,12 @@
 	if test "$libdir" = '${exec_prefix}/lib'; then
 		if test "${ARCHITECTURE}" != ""; then
-			cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
+			cfa_libdir="${cfa_prefix}lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/"
 		else
-			cfa_libdir="${cfa_prefix}/lib/${cfa_name}/"
+			cfa_libdir="${cfa_prefix}lib/${cfa_name}/"
 		fi
 	else
 		cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
 	fi
-	cfa_libdir="$(readlink -f ${cfa_libdir})/"
+	cfa_libdir="$(readlink -m ${cfa_libdir})/"
 
 cat >>confdefs.h <<_ACEOF
@@ -3294,6 +3294,6 @@
 # Create variables for commonly used targets
 
-TOP_SRCDIR="$(readlink -f $ac_confdir/)/"
-TOP_BUILDDIR="$(readlink -f $ac_pwd/)/"
+TOP_SRCDIR="$(readlink -m $ac_confdir/)/"
+TOP_BUILDDIR="$(readlink -m $ac_pwd/)/"