diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-27 08:08:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-27 08:08:37 +0000 |
| commit | 958dcdff6d845fcff20a414bd28be8ee2ced8c6c (patch) | |
| tree | 3bc998a5af389cd1357dd672d96828573025cd0a /libXext/configure.ac | |
| parent | 9b02c06e9c08d3d537d0a6fed3304b2146d49511 (diff) | |
| parent | bc4f49f9a9eccb73bc2c5610295febaf4b14559e (diff) | |
| download | vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.tar.gz vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.tar.bz2 vcxsrv-958dcdff6d845fcff20a414bd28be8ee2ced8c6c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libXext/configure.ac')
| -rw-r--r-- | libXext/configure.ac | 121 |
1 files changed, 60 insertions, 61 deletions
diff --git a/libXext/configure.ac b/libXext/configure.ac index 8c674a9dc..297313974 100644 --- a/libXext/configure.ac +++ b/libXext/configure.ac @@ -1,61 +1,60 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.57) -AC_INIT([libXext], - 1.1.1, - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - libXext) - -AC_CONFIG_SRCDIR([Makefile.am]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) - -AM_MAINTAINER_MODE - -# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) -AM_CONFIG_HEADER([config.h]) - -# Determine .so library version per platform -# based on SharedXextRev in monolith xc/config/cf/*Lib.tmpl -AC_CANONICAL_HOST -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) - -# Checks for programs. -AC_PROG_LIBTOOL -AC_PROG_CC -XORG_DEFAULT_OPTIONS - -# Checks for pkg-config packages -PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.99.2]) -XEXT_CFLAGS="$CWARNFLAGS $XEXT_CFLAGS" -AC_SUBST(XEXT_CFLAGS) -AC_SUBST(XEXT_LIBS) - -# Checks for libraries. - -# Checks for header files. -AC_HEADER_STDC - -XORG_CHECK_MALLOC_ZERO - -# Man page processing requirements -XORG_PROG_RAWCPP - -dnl Allow checking code with lint, sparse, etc. -XORG_WITH_LINT -XORG_LINT_LIBRARY([Xext]) -LINT_FLAGS="${LINT_FLAGS} ${XEXT_CFLAGS}" - -AC_OUTPUT([Makefile - man/Makefile - src/Makefile - xext.pc]) +# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.60])
+AC_INIT([libXext],
+ [1.1.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXext])
+
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+
+AM_MAINTAINER_MODE
+
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+AM_CONFIG_HEADER([config.h])
+
+# Determine .so library version per platform
+# based on SharedXextRev in monolith xc/config/cf/*Lib.tmpl
+AC_CANONICAL_HOST
+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)
+
+# Checks for programs.
+AC_PROG_LIBTOOL
+AC_PROG_CC
+
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.99.2])
+AC_SUBST(XEXT_CFLAGS)
+AC_SUBST(XEXT_LIBS)
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+
+XORG_CHECK_MALLOC_ZERO
+
+# Man page processing requirements
+XORG_PROG_RAWCPP
+
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+XORG_LINT_LIBRARY([Xext])
+
+AC_OUTPUT([Makefile
+ man/Makefile
+ src/Makefile
+ xext.pc])
|