--- a/make/autoconf/basics.m4	Thu Oct 26 10:39:59 2017 +0200
+++ b/make/autoconf/basics.m4	Thu Oct 26 13:20:47 2017 +0200
@@ -561,19 +561,10 @@
   AC_MSG_RESULT([$TOPDIR])
   AC_SUBST(TOPDIR)
 
-  # Save the original version of TOPDIR for string comparisons
-  ORIGINAL_TOPDIR="$TOPDIR"
-  AC_SUBST(ORIGINAL_TOPDIR)
-
   # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
   BASIC_FIXUP_PATH(CURDIR)
   BASIC_FIXUP_PATH(TOPDIR)
 
-  # Calculate a canonical version of TOPDIR for string comparisons
-  CANONICAL_TOPDIR=$TOPDIR
-  BASIC_REMOVE_SYMBOLIC_LINKS([CANONICAL_TOPDIR])
-  AC_SUBST(CANONICAL_TOPDIR)
-
   # Locate the directory of this script.
   AUTOCONF_DIR=$TOPDIR/make/autoconf