svn merge ^/branches/released .

1 files changed, 76 insertions, 68 deletions

diff --git a/libXdmcp/configure.ac b/libXdmcp/configure.ac
index b9ed587b8..97d31a1cd 100644
--- a/libXdmcp/configure.ac
+++ b/libXdmcp/configure.ac
@@ -1,68 +1,76 @@
-dnl 

-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([libXdmcp], [1.1.0],

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

-AM_INIT_AUTOMAKE([foreign dist-bzip2])

-AM_MAINTAINER_MODE

-

-AC_CONFIG_HEADERS(config.h)

-

-# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS

-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)

-

-AC_PROG_LN_S

-AC_LIBTOOL_WIN32_DLL

-AM_PROG_LIBTOOL

-AC_PROG_MAKE_SET

-

-AC_CHECK_FUNCS([srand48 lrand48])

-

-AC_SEARCH_LIBS([recvfrom],[socket])

-

-PKG_CHECK_MODULES(XDMCP, xproto)

-

-if test -f ${srcdir}/Wraphelp.c; then

-	AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols])

-	HASXDMAUTH=yes

-else

-	HASXDMAUTH=no

-fi

-

-AM_CONDITIONAL(HASXDMAUTH,test x$HASXDMAUTH = xyes)

-

-dnl Allow checking code with lint, sparse, etc.

-XORG_WITH_LINT

-XORG_LINT_LIBRARY([Xdmcp])

-

-AC_OUTPUT([Makefile

-	   doc/Makefile

-           xdmcp.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([libXdmcp], [1.1.0],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXdmcp])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Initialize libtool
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS
+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)
+
+# Checks for programs.
+AC_PROG_LN_S
+
+# Checks for libraries.
+AC_SEARCH_LIBS([recvfrom],[socket])
+
+# Checks for library functions.
+AC_CHECK_FUNCS([srand48 lrand48])
+
+# Obtain compiler/linker options for depedencies
+PKG_CHECK_MODULES(XDMCP, xproto)
+
+if test -f ${srcdir}/Wraphelp.c; then
+	AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols])
+	HASXDMAUTH=yes
+else
+	HASXDMAUTH=no
+fi
+
+AM_CONDITIONAL(HASXDMAUTH,test x$HASXDMAUTH = xyes)
+
+# Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+XORG_LINT_LIBRARY([Xdmcp])
+
+AC_CONFIG_FILES([Makefile
+		doc/Makefile
+		xdmcp.pc])
+AC_OUTPUT