Index: legacy/misc/ac_define_dir.m4
===================================================================
RCS file: /cvsroot/ac-archive/ac-archive/legacy/misc/ac_define_dir.m4,v
retrieving revision 1.6
diff -u -r1.6 ac_define_dir.m4
--- legacy/misc/ac_define_dir.m4	14 Jan 2005 15:28:54 -0000	1.6
+++ legacy/misc/ac_define_dir.m4	17 Jan 2005 16:02:57 -0000
@@ -15,13 +15,16 @@
 dnl    AC_DEFINE_DIR(PROG_PATH, bindir, [Location of installed binaries])
 dnl
 dnl @version $Id: ac_define_dir.m4,v 1.6 2005/01/14 15:28:54 simons Exp $
-dnl @author Stepan Kasal  <address@hidden>, Guido Draheim <address@hidden>, Alexandre Oliva
+dnl @author Stepan Kasal <address@hidden>, Andreas Schwab <address@hidden>, Guido Draheim <address@hidden>, Alexandre Oliva
 
 AC_DEFUN([AC_DEFINE_DIR], [
-  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
   eval ac_define_dir="\"[$]$2\""
-  eval ac_define_dir="\"[$]ac_define_dir\""
   AC_SUBST($1, "$ac_define_dir")
   AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
 ])