--- Yap-5.1.3.orig/configure.in	2008-05-24 10:29:52.000000000 +1200
+++ Yap-5.1.3/configure.in	2009-12-01 14:45:52.000000000 +1300
@@ -273,9 +273,9 @@
   AC_DEFINE(MinTrailSpace,( 32*SIZEOF_INT_P))
 fi
 
-eval "AC_DEFINE(DefHeapSpace,($yap_cv_heap_space))"
-eval "AC_DEFINE(DefStackSpace,($yap_cv_stack_space))"
-eval "AC_DEFINE(DefTrailSpace,($yap_cv_trail_space))"
+AC_DEFINE_UNQUOTED(DefHeapSpace,($yap_cv_heap_space))
+AC_DEFINE_UNQUOTED(DefStackSpace,($yap_cv_stack_space))
+AC_DEFINE_UNQUOTED(DefTrailSpace,($yap_cv_trail_space))
 
 AC_CANONICAL_SYSTEM
 
@@ -285,14 +285,14 @@
 then
   AC_DEFINE(MAX_WORKERS,1)
 else
-eval "AC_DEFINE(MAX_WORKERS,$yap_cv_max_workers)"
+  AC_DEFINE_UNQUOTED(MAX_WORKERS,$yap_cv_max_workers)
 fi
 
 if test "$threads" = no
 then
   AC_DEFINE(MAX_THREADS,1)
 else
-eval "AC_DEFINE(MAX_THREADS,$yap_cv_max_threads)"
+  AC_DEFINE_UNQUOTED(MAX_THREADS,$yap_cv_max_threads)
 fi