From dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 12 Sep 2011 11:27:51 +0200 Subject: Synchronised line endinge with release branch --- libXdmcp/configure.ac | 154 +++++++++++++++++++++++------------------------ libXdmcp/doc/Makefile.am | 26 ++++---- 2 files changed, 90 insertions(+), 90 deletions(-) (limited to 'libXdmcp') diff --git a/libXdmcp/configure.ac b/libXdmcp/configure.ac index 44e8a5750..30e57bb65 100644 --- a/libXdmcp/configure.ac +++ b/libXdmcp/configure.ac @@ -1,77 +1,77 @@ -# -# 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.12 for DocBook external references -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.12) -XORG_DEFAULT_OPTIONS -XORG_ENABLE_DOCS -XORG_WITH_XMLTO(0.0.22) -XORG_WITH_FOP -XORG_WITH_XSLTPROC -XORG_CHECK_SGML_DOCTOOLS(1.8) - -# 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 +# +# 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.12 for DocBook external references +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.12) +XORG_DEFAULT_OPTIONS +XORG_ENABLE_DOCS +XORG_WITH_XMLTO(0.0.22) +XORG_WITH_FOP +XORG_WITH_XSLTPROC +XORG_CHECK_SGML_DOCTOOLS(1.8) + +# 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 diff --git a/libXdmcp/doc/Makefile.am b/libXdmcp/doc/Makefile.am index b722ddd55..882f3841a 100644 --- a/libXdmcp/doc/Makefile.am +++ b/libXdmcp/doc/Makefile.am @@ -1,13 +1,13 @@ - -if ENABLE_DOCS - -# Main DocBook/XML files (DOCTYPE book) -docbook = xdmcp.xml - -# The location where the DocBook/XML files and their generated formats are installed -shelfdir = $(docdir) - -# Generate DocBook/XML output formats with or without stylesheets -include $(top_srcdir)/docbook.am - -endif ENABLE_DOCS + +if ENABLE_DOCS + +# Main DocBook/XML files (DOCTYPE book) +docbook = xdmcp.xml + +# The location where the DocBook/XML files and their generated formats are installed +shelfdir = $(docdir) + +# Generate DocBook/XML output formats with or without stylesheets +include $(top_srcdir)/docbook.am + +endif ENABLE_DOCS -- cgit v1.2.3