diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-07-13 16:02:56 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-07-13 16:02:56 +0000 |
| commit | e5df7068851024a938d3fa11676bde4b0ccf59af (patch) | |
| tree | c075101c42d73bca35f2324d464e7f2c459bc468 /driver | |
| parent | 6447a2203731076375293d37945caea89dece098 (diff) | |
Sync configure.ac and src/Makefile.am with recent X.Org templates
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/xf86-video-wildcatfb/configure.ac | 18 | ||||
| -rw-r--r-- | driver/xf86-video-wildcatfb/src/Makefile.am | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/driver/xf86-video-wildcatfb/configure.ac b/driver/xf86-video-wildcatfb/configure.ac index b213a09ad..b03c07fd7 100644 --- a/driver/xf86-video-wildcatfb/configure.ac +++ b/driver/xf86-video-wildcatfb/configure.ac @@ -28,13 +28,7 @@ AC_INIT([xf86-video-wildcatfb], [xf86-video-wildcatfb]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) - -# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.8) -XORG_DEFAULT_OPTIONS - +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(.) # Initialize Automake @@ -45,6 +39,12 @@ AM_MAINTAINER_MODE AC_DISABLE_STATIC AC_PROG_LIBTOOL +# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS + AH_TOP([#include "xorg-server.h"]) # Define a configure option for an alternate module directory @@ -64,10 +64,12 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES]) # Checks for libraries. -AC_SUBST([moduledir]) +# Checks for header files. +AC_HEADER_STDC DRIVER_NAME=wildcatfb AC_SUBST([DRIVER_NAME]) +AC_SUBST([moduledir]) AC_CONFIG_FILES([ Makefile diff --git a/driver/xf86-video-wildcatfb/src/Makefile.am b/driver/xf86-video-wildcatfb/src/Makefile.am index e34f652e8..92beed882 100644 --- a/driver/xf86-video-wildcatfb/src/Makefile.am +++ b/driver/xf86-video-wildcatfb/src/Makefile.am @@ -23,7 +23,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = @XORG_CFLAGS@ +AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) wildcatfb_drv_la_LTLIBRARIES = wildcatfb_drv.la wildcatfb_drv_la_LDFLAGS = -module -avoid-version wildcatfb_drv_ladir = @moduledir@/drivers |