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 --- libXext/configure.ac | 102 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'libXext/configure.ac') diff --git a/libXext/configure.ac b/libXext/configure.ac index 60b198e80..6e6cc8b13 100644 --- a/libXext/configure.ac +++ b/libXext/configure.ac @@ -1,51 +1,51 @@ - -# Initialize Autoconf -AC_PREREQ([2.60]) -AC_INIT([libXext], [1.3.0], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXext]) -AC_CONFIG_SRCDIR([Makefile.am]) -AC_CONFIG_HEADERS([config.h]) - -# Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE - -# Initialize libtool -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_SPECS -XORG_WITH_XMLTO(0.0.22) -XORG_WITH_FOP -XORG_WITH_XSLTPROC -XORG_CHECK_SGML_DOCTOOLS(1.8) -XORG_CHECK_MALLOC_ZERO - -# Determine .so library version per platform -# based on SharedXextRev in monolith xc/config/cf/*Lib.tmpl -if test "x$XEXT_SOREV" = "x" ; then - case $host_os in - openbsd*) XEXT_SOREV=8:0 ;; - solaris*) XEXT_SOREV=0 ;; - *) XEXT_SOREV=6:4:0 ;; - esac -fi -AC_SUBST(XEXT_SOREV) - -# Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.1.99]) - -# Allow checking code with lint, sparse, etc. -XORG_WITH_LINT -XORG_LINT_LIBRARY([Xext]) - -AC_CONFIG_FILES([Makefile - man/Makefile - src/Makefile - specs/Makefile - xext.pc]) -AC_OUTPUT + +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([libXext], [1.3.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXext]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE + +# Initialize libtool +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_SPECS +XORG_WITH_XMLTO(0.0.22) +XORG_WITH_FOP +XORG_WITH_XSLTPROC +XORG_CHECK_SGML_DOCTOOLS(1.8) +XORG_CHECK_MALLOC_ZERO + +# Determine .so library version per platform +# based on SharedXextRev in monolith xc/config/cf/*Lib.tmpl +if test "x$XEXT_SOREV" = "x" ; then + case $host_os in + openbsd*) XEXT_SOREV=8:0 ;; + solaris*) XEXT_SOREV=0 ;; + *) XEXT_SOREV=6:4:0 ;; + esac +fi +AC_SUBST(XEXT_SOREV) + +# Obtain compiler/linker options for depedencies +PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.1.99]) + +# Allow checking code with lint, sparse, etc. +XORG_WITH_LINT +XORG_LINT_LIBRARY([Xext]) + +AC_CONFIG_FILES([Makefile + man/Makefile + src/Makefile + specs/Makefile + xext.pc]) +AC_OUTPUT -- cgit v1.2.3