svn merge ^/branches/released .

1 files changed, 63 insertions, 59 deletions

diff --git a/X11/xtrans/configure.ac b/X11/xtrans/configure.ac
index ce521bbb6..2ef18ab20 100644
--- a/X11/xtrans/configure.ac
+++ b/X11/xtrans/configure.ac
@@ -1,59 +1,63 @@
-dnl  Copyright © 2003 Keith Packard, Noah Levitt
-dnl 
-dnl  Permission to use, copy, modify, distribute, and sell this software and its
-dnl  documentation for any purpose is hereby granted without fee, provided that
-dnl  the above copyright notice appear in all copies and that both that
-dnl  copyright notice and this permission notice appear in supporting
-dnl  documentation, and that the name of Keith Packard not be used in
-dnl  advertising or publicity pertaining to distribution of the software without
-dnl  specific, written prior permission.  Keith Packard makes no
-dnl  representations about the suitability of this software for any purpose.  It
-dnl  is provided "as is" without express or implied warranty.
-dnl 
-dnl  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-dnl  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-dnl  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-dnl  PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
-
-AC_PREREQ([2.60])
-AC_INIT([xtrans], [1.2.6],
-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xtrans])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
-
-# Require xorg-macros minimum of 1.10 for DocBook XML documentation
-m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.10)
-XORG_DEFAULT_OPTIONS
-XORG_ENABLE_DOCS
-XORG_WITH_XMLTO(0.0.20)
-XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
-
-# Because xtrans is included into other modules rather than being linked
-# with, these defines have to be added to the cflags line
-
-# fchown()
-
-AC_CHECK_FUNC(fchown, [fchown_define="-DHAS_FCHOWN"], [fchown_define=""])
-
-AC_SUBST(fchown_define)
-
-# sticky bit
-# 
-# if any system exists without sticky dir bits this 
-# needs to be redone with a real autoconf test
-
-sticky_bit_define="-DHAS_STICKY_DIR_BIT"
-
-AC_SUBST(sticky_bit_define)
-
-AC_OUTPUT([Makefile
-           doc/Makefile
-           xtrans.pc])
+#  Copyright © 2003 Keith Packard, Noah Levitt

+#

+#  Permission to use, copy, modify, distribute, and sell this software and its

+#  documentation for any purpose is hereby granted without fee, provided that

+#  the above copyright notice appear in all copies and that both that

+#  copyright notice and this permission notice appear in supporting

+#  documentation, and that the name of Keith Packard not be used in

+#  advertising or publicity pertaining to distribution of the software without

+#  specific, written prior permission.  Keith Packard makes no

+#  representations about the suitability of this software for any purpose.  It

+#  is provided "as is" without express or implied warranty.

+#

+#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+#  PERFORMANCE OF THIS SOFTWARE.

+#

+

+# Initialize Autoconf

+AC_PREREQ([2.60])

+AC_INIT([xtrans], [1.2.6],

+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xtrans])

+AC_CONFIG_SRCDIR([Makefile.am])

+

+# Initialize Automake

+AM_INIT_AUTOMAKE([foreign dist-bzip2])

+AM_MAINTAINER_MODE

+

+# Require xorg-macros minimum of 1.10 for DocBook XML documentation

+m4_ifndef([XORG_MACROS_VERSION],

+          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])

+XORG_MACROS_VERSION(1.10)

+XORG_DEFAULT_OPTIONS

+XORG_ENABLE_DOCS

+XORG_WITH_XMLTO(0.0.20)

+XORG_WITH_FOP

+XORG_CHECK_SGML_DOCTOOLS(1.5)

+

+# Because xtrans is included into other modules rather than being linked

+# with, these defines have to be added to the cflags line

+

+# fchown()

+

+AC_CHECK_FUNC(fchown, [fchown_define="-DHAS_FCHOWN"], [fchown_define=""])

+

+AC_SUBST(fchown_define)

+

+# sticky bit

+#

+# if any system exists without sticky dir bits this 

+# needs to be redone with a real autoconf test

+

+sticky_bit_define="-DHAS_STICKY_DIR_BIT"

+

+AC_SUBST(sticky_bit_define)

+

+AC_CONFIG_FILES([Makefile

+		doc/Makefile

+		xtrans.pc])

+AC_OUTPUT