summaryrefslogtreecommitdiff
path: root/lib/libFS/configure.ac
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-10-31 10:19:44 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-10-31 10:19:44 +0000
commitf79338edfa922322230f8bf0b4224903f2cadbf7 (patch)
tree68d9a9b1c181d8af96ed014999e09ea7bf2dfa0b /lib/libFS/configure.ac
parentd98551a209d64e1cc2e787573678b499c9a2d75b (diff)
Update to libFS 1.0.3. No functionnal change.
Diffstat (limited to 'lib/libFS/configure.ac')
-rw-r--r--lib/libFS/configure.ac24
1 files changed, 10 insertions, 14 deletions
diff --git a/lib/libFS/configure.ac b/lib/libFS/configure.ac
index bd84a70e2..276327fd0 100644
--- a/lib/libFS/configure.ac
+++ b/lib/libFS/configure.ac
@@ -21,32 +21,30 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
-AC_INIT(libFS, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libFS)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT([libFS], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libFS])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# 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)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
# Check for dependencies
PKG_CHECK_MODULES(FS, xproto fontsproto)
-AC_SUBST(FS_CFLAGS)
-AC_SUBST(FS_LIBS)
+
#
# Split out so we don't include xtrans C flags in fs.pc
#
PKG_CHECK_MODULES(XTRANS, xtrans)
-AC_SUBST(XTRANS_CFLAGS)
-AC_SUBST(XTRANS_LIBS)
XTRANS_CONNECTION_FLAGS
@@ -56,8 +54,6 @@ dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_LINT_LIBRARY([FS])
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile