xserver: Branch 'master'

[Alan Coopersmith]

 acinclude.m4 |   28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

New commits:
commit ab8c6a3c5acb2a3bf288f1d6339b09a125bbb930
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Apr 14 19:12:00 2008 -0700

    Update ac_define_dir macro in acinclude.m4 to 2008-04-12 version

diff --git a/acinclude.m4 b/acinclude.m4
index e61244f..833b557 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -142,7 +142,9 @@ AC_SUBST(LTCXXCOMPILE)
 
 
 
-##### http://autoconf-archive.cryp.to/ac_define_dir.html
+# ===========================================================================
+#             http://autoconf-archive.cryp.to/ac_define_dir.html
+# ===========================================================================
 #
 # SYNOPSIS
 #
@@ -150,11 +152,11 @@ AC_SUBST(LTCXXCOMPILE)
 #
 # DESCRIPTION
 #
-#   This macro sets VARNAME to the expansion of the DIR variable,
-#   taking care of fixing up ${prefix} and such.
+#   This macro sets VARNAME to the expansion of the DIR variable, taking
+#   care of fixing up ${prefix} and such.
 #
-#   VARNAME is then offered as both an output variable and a C
-#   preprocessor symbol.
+#   VARNAME is then offered as both an output variable and a C preprocessor
+#   symbol.
 #
 #   Example:
 #
@@ -162,18 +164,18 @@ AC_SUBST(LTCXXCOMPILE)
 #
 # LAST MODIFICATION
 #
-#   2006-10-13
+#   2008-04-12
 #
 # COPYLEFT
 #
-#   Copyright (c) 2006 Stepan Kasal <kasal at ucw.cz>
-#   Copyright (c) 2006 Andreas Schwab <schwab at suse.de>
-#   Copyright (c) 2006 Guido U. Draheim <guidod at gmx.de>
-#   Copyright (c) 2006 Alexandre Oliva
+#   Copyright (c) 2008 Stepan Kasal <kasal at ucw.cz>
+#   Copyright (c) 2008 Andreas Schwab <schwab at suse.de>
+#   Copyright (c) 2008 Guido U. Draheim <guidod at gmx.de>
+#   Copyright (c) 2008 Alexandre Oliva
 #
-#   Copying and distribution of this file, with or without
-#   modification, are permitted in any medium without royalty provided
-#   the copyright notice and this notice are preserved.
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.
 
 AC_DEFUN([AC_DEFINE_DIR], [
   prefix_NONE=