diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2009-11-01 16:31:35 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2009-11-01 16:31:35 +0100 |
| commit | 5c37d4730e9f5274a0c1fcb8ef944063d9ee3724 (patch) | |
| tree | a39593ef5dd338c97e978ec704310c7526b23e93 /configure.ac | |
| parent | 01bd73deeae89fc5ecdc2c6fbb73ff9d7c58c99f (diff) | |
| parent | a5041bd0be9d1b54f4e6683c141745f5ed0d6294 (diff) | |
Merge remote branch 'origin/master' into obsd
Conflicts:
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index f88376c..aecfb94 100644 --- a/configure.ac +++ b/configure.ac @@ -21,13 +21,14 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xdriinfo, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xdriinfo) +AC_INIT(xdriinfo, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xdriinfo) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -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 1.3 or later: 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) AM_CONFIG_HEADER(config.h) @@ -36,11 +37,10 @@ AC_PROG_INSTALL AC_TYPE_SIGNAL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XDRIINFO, xext x11 glproto) -XDRIINFO_CFLAGS="$CWARNFLAGS $XDRIINFO_CFLAGS" AC_SUBST(XDRIINFO_CFLAGS) AC_SUBST(XDRIINFO_LIBS) @@ -52,8 +52,4 @@ AC_SEARCH_LIBS([glXGetProcAddressARB], [GL], [], AC_MSG_FAILURE([cannot find GL library - make sure Mesa or other OpenGL package is installed]), [$XDRIINFO_LIBS]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile]) |